diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
index 705d26e0ab..4d5ed0f25f 100644
--- a/.devcontainer/compose.yaml
+++ b/.devcontainer/compose.yaml
@@ -10,6 +10,7 @@ services:
       RAILS_ENV: development
       NODE_ENV: development
       BIND: 0.0.0.0
+      BOOTSNAP_CACHE_DIR: /tmp
       REDIS_HOST: redis
       REDIS_PORT: '6379'
       DB_HOST: db
diff --git a/.github/workflows/build-container-image.yml b/.github/workflows/build-container-image.yml
index 6204319a63..260730004c 100644
--- a/.github/workflows/build-container-image.yml
+++ b/.github/workflows/build-container-image.yml
@@ -1,14 +1,9 @@
 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:
@@ -24,42 +19,36 @@ on:
       file_to_build:
         type: string
 
+# This builds multiple images with one runner each, allowing us to build for multiple architectures
+# using Github's runners.
+# The two-step process is adapted form:
+# https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
 jobs:
+  # Build each (amd64 and arm64) image separately
   build-image:
-    runs-on: ubuntu-latest
+    runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
 
     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')
+      - name: Prepare
+        env:
+          PUSH_TO_IMAGES: ${{ inputs.push_to_images }}
         run: |
-          docker run --rm -d --name buildkitd -p 1234:1234 --privileged moby/buildkit:latest --addr tcp://0.0.0.0:1234
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          # Transform multi-line variable into comma-separated variable
+          image_names=${PUSH_TO_IMAGES//$'\n'/,}
+          echo "IMAGE_NAMES=${image_names%,}" >> $GITHUB_ENV
 
       - 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 }}
+        id: buildx
 
       - name: Log in to Docker Hub
         if: contains(inputs.push_to_images, 'tootsuite')
@@ -76,16 +65,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/metadata-action@v5
+      - name: Docker meta
         id: meta
+        uses: docker/metadata-action@v5
         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@v6
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ inputs.file_to_build }}
@@ -93,11 +84,87 @@ jobs:
             MASTODON_VERSION_PRERELEASE=${{ inputs.version_prerelease }}
             MASTODON_VERSION_METADATA=${{ inputs.version_metadata }}
             SOURCE_COMMIT=${{ github.sha }}
-          platforms: ${{ inputs.platforms }}
+          platforms: ${{ matrix.platform }}
           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' || '' }}
+          outputs: type=image,"name=${{ env.IMAGE_NAMES }}",push-by-digest=true,name-canonical=true,push=${{ inputs.push_to_images != '' }}
+
+      - name: Export digest
+        if: ${{ inputs.push_to_images != '' }}
+        run: |
+          mkdir -p "${{ runner.temp }}/digests"
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        if: ${{ inputs.push_to_images != '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          # `hashFiles` is used to disambiguate between streaming and non-streaming images
+          name: digests-${{ hashFiles(inputs.file_to_build) }}-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  # Then merge the docker images into a single one
+  merge-images:
+    if: ${{ inputs.push_to_images != '' }}
+    runs-on: ubuntu-24.04
+    needs:
+      - build-image
+
+    env:
+      PUSH_TO_IMAGES: ${{ inputs.push_to_images }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          # `hashFiles` is used to disambiguate between streaming and non-streaming images
+          pattern: digests-${{ hashFiles(inputs.file_to_build) }}-*
+          merge-multiple: true
+
+      - 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 }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        if: ${{ inputs.push_to_images != '' }}
+        with:
+          images: ${{ inputs.push_to_images }}
+          flavor: ${{ inputs.flavor }}
+          tags: ${{ inputs.tags }}
+          labels: ${{ inputs.labels }}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          echo "$PUSH_TO_IMAGES" | xargs -I{} \
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+              $(printf '{}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          echo "$PUSH_TO_IMAGES" | xargs -i{} \
+            docker buildx imagetools inspect {}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index 7c6f74b457..4a56f720e1 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -26,8 +26,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon
@@ -48,8 +46,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon-streaming
diff --git a/.github/workflows/build-push-pr.yml b/.github/workflows/build-push-pr.yml
index d3bc8e5df8..418993475f 100644
--- a/.github/workflows/build-push-pr.yml
+++ b/.github/workflows/build-push-pr.yml
@@ -32,8 +32,6 @@ jobs:
     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 }}
@@ -49,8 +47,6 @@ jobs:
     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 }}
diff --git a/.github/workflows/build-releases.yml b/.github/workflows/build-releases.yml
index da9a458282..473718bd10 100644
--- a/.github/workflows/build-releases.yml
+++ b/.github/workflows/build-releases.yml
@@ -13,8 +13,6 @@ jobs:
     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
@@ -34,8 +32,6 @@ jobs:
     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
diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml
index 1e2455d3d9..d3cb4e5e0a 100644
--- a/.github/workflows/build-security.yml
+++ b/.github/workflows/build-security.yml
@@ -24,8 +24,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon
@@ -46,8 +44,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon-streaming
diff --git a/.github/workflows/test-image-build.yml b/.github/workflows/test-image-build.yml
index 980e071897..bde40addd6 100644
--- a/.github/workflows/test-image-build.yml
+++ b/.github/workflows/test-image-build.yml
@@ -20,7 +20,6 @@ jobs:
     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:
@@ -31,5 +30,4 @@ jobs:
     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-migrations.yml b/.github/workflows/test-migrations.yml
index 306191fb8e..733664b753 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -64,7 +64,6 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
       RAILS_ENV: test
       BUNDLE_CLEAN: true
       BUNDLE_FROZEN: true
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 4deb08d328..1f7f8f93a8 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -107,7 +107,7 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
+      COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }}
       RAILS_ENV: test
       ALLOW_NOPAM: true
       PAM_ENABLED: true
@@ -208,7 +208,7 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
+      COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }}
       RAILS_ENV: test
       ALLOW_NOPAM: true
       PAM_ENABLED: true
@@ -295,7 +295,6 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
       RAILS_ENV: test
       BUNDLE_WITH: test
       LOCAL_DOMAIN: localhost:3000
@@ -411,7 +410,6 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
       RAILS_ENV: test
       BUNDLE_WITH: test
       ES_ENABLED: true
diff --git a/Dockerfile b/Dockerfile
index deeac8b466..4e1bb24ff8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.12
 
 # This file is designed for production server deployment, not local development work
-# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
@@ -9,6 +9,7 @@
 # See: https://docs.docker.com/build/building/multi-platform/
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
+ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
 # renovate: datasource=docker depName=docker.io/ruby
@@ -19,9 +20,9 @@ ARG NODE_MAJOR_VERSION="22"
 # 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
+FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node
 # Ruby image to use for base image based on combined variables (ex: 3.4.x-slim-bookworm)
-FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
+FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.3.0-nightly.2023.11.09+pr-123456
diff --git a/Gemfile b/Gemfile
index 5becc118d3..4b702260d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,6 +100,8 @@ gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
 gem 'rdf-normalize', '~> 0.5'
 
+gem 'prometheus_exporter', '~> 2.2', require: false
+
 gem 'opentelemetry-api', '~> 1.4.0'
 
 group :opentelemetry do
@@ -114,7 +116,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-net_http', '~> 0.23.0', require: false
   gem 'opentelemetry-instrumentation-pg', '~> 0.30.0', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.26.0', require: false
-  gem 'opentelemetry-instrumentation-rails', '~> 0.35.0', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.36.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.26.0', require: false
   gem 'opentelemetry-instrumentation-sidekiq', '~> 0.26.0', require: false
   gem 'opentelemetry-sdk', '~> 1.4', require: false
@@ -154,7 +156,7 @@ group :test do
 
   gem 'shoulda-matchers'
 
-  # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false
+  # Coverage formatter for RSpec
   gem 'simplecov', '~> 0.22', require: false
   gem 'simplecov-lcov', '~> 0.8', require: false
 
@@ -172,7 +174,7 @@ group :development do
   gem 'rubocop-rspec_rails', require: false
 
   # Annotates modules with schema
-  gem 'annotaterb', '~> 4.13'
+  gem 'annotaterb', '~> 4.13', require: false
 
   # Enhanced error message pages for development
   gem 'better_errors', '~> 2.9'
@@ -195,7 +197,7 @@ end
 
 group :development, :test do
   # Interactive Debugging tools
-  gem 'debug', '~> 1.8'
+  gem 'debug', '~> 1.8', require: false
 
   # Generate fake data values
   gem 'faker', '~> 3.2'
@@ -207,7 +209,7 @@ group :development, :test do
   gem 'memory_profiler', require: false
   gem 'ruby-prof', require: false
   gem 'stackprof', require: false
-  gem 'test-prof'
+  gem 'test-prof', require: false
 
   # RSpec runner for rails
   gem 'rspec-rails', '~> 7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 54e43482e3..9d0928354b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,7 +220,7 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    excon (0.112.0)
+    excon (1.2.3)
     fabrication (2.31.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
@@ -244,15 +244,15 @@ GEM
     flatware-rspec (2.3.4)
       flatware (= 2.3.4)
       rspec (>= 3.6)
-    fog-core (2.5.0)
+    fog-core (2.6.0)
       builder
-      excon (~> 0.71)
+      excon (~> 1.0)
       formatador (>= 0.2, < 2.0)
       mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (1.1.3)
+    fog-openstack (1.1.4)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
@@ -273,7 +273,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.59.0)
+    haml_lint (0.60.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -283,7 +283,7 @@ GEM
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
-    highline (3.1.1)
+    highline (3.1.2)
       reline
     hiredis (0.6.3)
     hkdf (0.3.0)
@@ -302,7 +302,7 @@ GEM
     httplog (1.7.0)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -319,7 +319,8 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jd-paperclip-azure (3.0.0)
@@ -349,7 +350,7 @@ GEM
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -369,7 +370,7 @@ GEM
       marcel (~> 1.0.1)
       mime-types
       terrapin (>= 0.6.0, < 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -384,7 +385,7 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logger (1.6.4)
+    logger (1.6.5)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -406,7 +407,7 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1203)
+    mime-types-data (3.2025.0204)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
@@ -415,7 +416,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.4)
+    net-imap (0.5.5)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -426,7 +427,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.9)
@@ -460,7 +461,7 @@ GEM
       validate_email
       validate_url
       webfinger (~> 1.2)
-    openssl (3.2.1)
+    openssl (3.3.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     opentelemetry-api (1.4.0)
@@ -479,7 +480,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.7)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-action_pack (0.11.0)
+    opentelemetry-instrumentation-action_pack (0.12.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
       opentelemetry-instrumentation-rack (~> 0.21)
@@ -497,6 +498,10 @@ GEM
     opentelemetry-instrumentation-active_record (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
+    opentelemetry-instrumentation-active_storage (0.1.0)
+      opentelemetry-api (~> 1.4.0)
+      opentelemetry-instrumentation-active_support (~> 0.7)
+      opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-active_support (0.8.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
@@ -529,17 +534,18 @@ GEM
     opentelemetry-instrumentation-rack (0.26.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-rails (0.35.0)
+    opentelemetry-instrumentation-rails (0.36.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-action_mailer (~> 0.4.0)
-      opentelemetry-instrumentation-action_pack (~> 0.11.0)
+      opentelemetry-instrumentation-action_pack (~> 0.12.0)
       opentelemetry-instrumentation-action_view (~> 0.9.0)
       opentelemetry-instrumentation-active_job (~> 0.8.0)
       opentelemetry-instrumentation-active_record (~> 0.9.0)
+      opentelemetry-instrumentation-active_storage (~> 0.1.0)
       opentelemetry-instrumentation-active_support (~> 0.8.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
       opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0)
-    opentelemetry-instrumentation-redis (0.26.0)
+    opentelemetry-instrumentation-redis (0.26.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-sidekiq (0.26.0)
@@ -547,7 +553,7 @@ GEM
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.6.0)
+    opentelemetry-sdk (1.7.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
@@ -556,10 +562,10 @@ GEM
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.1)
-    ox (2.14.20)
+    ox (2.14.21)
       bigdecimal (>= 3.0)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -568,6 +574,8 @@ GEM
     pg (1.5.9)
     pghero (3.6.1)
       activerecord (>= 6.1)
+    pp (0.6.2)
+      prettyprint
     premailer (1.27.0)
       addressable
       css_parser (>= 1.19.0)
@@ -576,16 +584,19 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
+    prettyprint (0.2.0)
+    prometheus_exporter (2.2.0)
+      webrick
     propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.2.2)
+    psych (5.2.3)
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -658,7 +669,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.10.0)
+    rdoc (6.11.0)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -686,7 +697,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -696,7 +707,7 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.0)
+    rspec-rails (7.1.1)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -710,29 +721,29 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.28.0)
+    rubocop-rails (2.29.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.3.0)
+    rubocop-rspec (3.4.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -742,7 +753,7 @@ GEM
     ruby-saml (1.17.0)
       nokogiri (>= 1.13.10)
       rexml
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
@@ -798,8 +809,8 @@ GEM
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.2)
-    strong_migrations (2.1.0)
-      activerecord (>= 6.1)
+    strong_migrations (2.2.0)
+      activerecord (>= 7)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -812,9 +823,9 @@ GEM
       climate_control
     test-prof (1.4.4)
     thor (1.3.2)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
-    tpm-key_attestation (0.12.1)
+    tpm-key_attestation (0.14.0)
       bindata (~> 2.4)
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
@@ -849,18 +860,18 @@ GEM
       public_suffix
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.2.2)
+    webauthn (3.3.0)
       android_key_attestation (~> 0.3.0)
       bindata (~> 2.4)
       cbor (~> 0.5.9)
       cose (~> 1.1)
       openssl (>= 2.2)
       safety_net_attestation (~> 0.4.0)
-      tpm-key_attestation (~> 0.12.0)
+      tpm-key_attestation (~> 0.14.0)
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -871,7 +882,8 @@ GEM
       semantic_range (>= 2.3.0)
     webrick (1.9.1)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
@@ -970,7 +982,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-net_http (~> 0.23.0)
   opentelemetry-instrumentation-pg (~> 0.30.0)
   opentelemetry-instrumentation-rack (~> 0.26.0)
-  opentelemetry-instrumentation-rails (~> 0.35.0)
+  opentelemetry-instrumentation-rails (~> 0.36.0)
   opentelemetry-instrumentation-redis (~> 0.26.0)
   opentelemetry-instrumentation-sidekiq (~> 0.26.0)
   opentelemetry-sdk (~> 1.4)
@@ -979,6 +991,7 @@ DEPENDENCIES
   pg (~> 1.5)
   pghero
   premailer-rails
+  prometheus_exporter (~> 2.2)
   propshaft
   public_suffix (~> 6.0)
   puma (~> 6.3)
@@ -1038,4 +1051,4 @@ RUBY VERSION
    ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.2
+   2.6.3
diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb
index e674bf55a0..91849811e3 100644
--- a/app/controllers/admin/account_actions_controller.rb
+++ b/app/controllers/admin/account_actions_controller.rb
@@ -34,7 +34,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:admin_account_action).permit(:type, :report_id, :warning_preset_id, :text, :send_email_notification, :include_statuses)
+      params
+        .expect(admin_account_action: [:type, :report_id, :warning_preset_id, :text, :send_email_notification, :include_statuses])
     end
   end
 end
diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb
index a3c4adf59a..7f65ced517 100644
--- a/app/controllers/admin/account_moderation_notes_controller.rb
+++ b/app/controllers/admin/account_moderation_notes_controller.rb
@@ -29,10 +29,8 @@ module Admin
     private
 
     def resource_params
-      params.require(:account_moderation_note).permit(
-        :content,
-        :target_account_id
-      )
+      params
+        .expect(account_moderation_note: [:content, :target_account_id])
     end
 
     def set_account_moderation_note
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 7b169ba26a..10391aa3e2 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -158,7 +158,8 @@ module Admin
     end
 
     def form_account_batch_params
-      params.require(:form_account_batch).permit(:action, account_ids: [])
+      params
+        .expect(form_account_batch: [:action, account_ids: []])
     end
 
     def action_from_button
diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 12230a6506..eaf84aab25 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -84,6 +84,7 @@ class Admin::AnnouncementsController < Admin::BaseController
   end
 
   def resource_params
-    params.require(:announcement).permit(:text, :scheduled_at, :starts_at, :ends_at, :all_day)
+    params
+      .expect(announcement: [:text, :scheduled_at, :starts_at, :ends_at, :all_day])
   end
 end
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 3dca3a9614..14338dd293 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -7,17 +7,12 @@ module Admin
 
     layout 'admin'
 
-    before_action :set_cache_headers
     before_action :set_referrer_policy_header
 
     after_action :verify_authorized
 
     private
 
-    def set_cache_headers
-      response.cache_control.replace(private: true, no_store: true)
-    end
-
     def set_referrer_policy_header
       response.headers['Referrer-Policy'] = 'same-origin'
     end
diff --git a/app/controllers/admin/change_emails_controller.rb b/app/controllers/admin/change_emails_controller.rb
index a689d3a530..c923b94b1a 100644
--- a/app/controllers/admin/change_emails_controller.rb
+++ b/app/controllers/admin/change_emails_controller.rb
@@ -41,9 +41,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:user).permit(
-        :unconfirmed_email
-      )
+      params
+        .expect(user: [:unconfirmed_email])
     end
   end
 end
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 00d069cdfb..e3da834fcd 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -44,7 +44,8 @@ module Admin
     private
 
     def resource_params
-      params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
+      params
+        .expect(custom_emoji: [:shortcode, :image, :visible_in_picker])
     end
 
     def filtered_custom_emojis
@@ -74,7 +75,8 @@ module Admin
     end
 
     def form_custom_emoji_batch_params
-      params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, custom_emoji_ids: [])
+      params
+        .expect(form_custom_emoji_batch: [:action, :category_id, :category_name, custom_emoji_ids: []])
     end
   end
 end
diff --git a/app/controllers/admin/domain_allows_controller.rb b/app/controllers/admin/domain_allows_controller.rb
index b0f139e3a8..913c1a8246 100644
--- a/app/controllers/admin/domain_allows_controller.rb
+++ b/app/controllers/admin/domain_allows_controller.rb
@@ -37,6 +37,7 @@ class Admin::DomainAllowsController < Admin::BaseController
   end
 
   def resource_params
-    params.require(:domain_allow).permit(:domain)
+    params
+      .expect(domain_allow: [:domain])
   end
 end
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 16a8cb9eea..c3443b7077 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -25,7 +25,9 @@ module Admin
     rescue Mastodon::NotPermittedError
       flash[:alert] = I18n.t('admin.domain_blocks.not_permitted')
     else
-      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
+      flash[:notice] = I18n.t('admin.domain_blocks.created_msg')
+    ensure
+      redirect_to admin_instances_path(limited: '1')
     end
 
     def new
@@ -114,7 +116,12 @@ module Admin
     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
+        .expect(
+          form_domain_block_batch: [
+            domain_blocks_attributes: [[:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate]],
+          ]
+        )
     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 9501ebd63a..12f221164f 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -62,11 +62,13 @@ module Admin
     end
 
     def resource_params
-      params.require(:email_domain_block).permit(:domain, :allow_with_approval, other_domains: [])
+      params
+        .expect(email_domain_block: [:domain, :allow_with_approval, other_domains: []])
     end
 
     def form_email_domain_block_batch_params
-      params.require(:form_email_domain_block_batch).permit(email_domain_block_ids: [])
+      params
+        .expect(form_email_domain_block_batch: [email_domain_block_ids: []])
     end
 
     def action_from_button
diff --git a/app/controllers/admin/follow_recommendations_controller.rb b/app/controllers/admin/follow_recommendations_controller.rb
index a54e41bd8c..b060cfbe94 100644
--- a/app/controllers/admin/follow_recommendations_controller.rb
+++ b/app/controllers/admin/follow_recommendations_controller.rb
@@ -37,7 +37,8 @@ module Admin
     end
 
     def form_account_batch_params
-      params.require(:form_account_batch).permit(:action, account_ids: [])
+      params
+        .expect(form_account_batch: [:action, account_ids: []])
     end
 
     def filter_params
diff --git a/app/controllers/admin/invites_controller.rb b/app/controllers/admin/invites_controller.rb
index 614e2a32d0..ac4ee35271 100644
--- a/app/controllers/admin/invites_controller.rb
+++ b/app/controllers/admin/invites_controller.rb
@@ -39,7 +39,8 @@ module Admin
     private
 
     def resource_params
-      params.require(:invite).permit(:max_uses, :expires_in)
+      params
+        .expect(invite: [:max_uses, :expires_in])
     end
 
     def filtered_invites
diff --git a/app/controllers/admin/ip_blocks_controller.rb b/app/controllers/admin/ip_blocks_controller.rb
index 1bd7ec8059..afabda1b88 100644
--- a/app/controllers/admin/ip_blocks_controller.rb
+++ b/app/controllers/admin/ip_blocks_controller.rb
@@ -44,7 +44,8 @@ module Admin
     private
 
     def resource_params
-      params.require(:ip_block).permit(:ip, :severity, :comment, :expires_in)
+      params
+        .expect(ip_block: [:ip, :severity, :comment, :expires_in])
     end
 
     def action_from_button
@@ -52,7 +53,8 @@ module Admin
     end
 
     def form_ip_block_batch_params
-      params.require(:form_ip_block_batch).permit(ip_block_ids: [])
+      params
+        .expect(form_ip_block_batch: [ip_block_ids: []])
     end
   end
 end
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb
index f05255adb6..9a796949de 100644
--- a/app/controllers/admin/relays_controller.rb
+++ b/app/controllers/admin/relays_controller.rb
@@ -57,7 +57,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:relay).permit(:inbox_url)
+      params
+        .expect(relay: [:inbox_url])
     end
 
     def warn_signatures_not_enabled!
diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb
index 6b16c29fc7..10dbe846e4 100644
--- a/app/controllers/admin/report_notes_controller.rb
+++ b/app/controllers/admin/report_notes_controller.rb
@@ -47,10 +47,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:report_note).permit(
-        :content,
-        :report_id
-      )
+      params
+        .expect(report_note: [:content, :report_id])
     end
 
     def set_report_note
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index bcfc11159c..2f9af8a6fc 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -61,7 +61,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:user_role).permit(:name, :color, :highlighted, :position, permissions_as_keys: [])
+      params
+        .expect(user_role: [:name, :color, :highlighted, :position, permissions_as_keys: []])
     end
   end
 end
diff --git a/app/controllers/admin/rules_controller.rb b/app/controllers/admin/rules_controller.rb
index b8def22ba3..289b6a98c3 100644
--- a/app/controllers/admin/rules_controller.rb
+++ b/app/controllers/admin/rules_controller.rb
@@ -53,7 +53,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:rule).permit(:text, :hint, :priority)
+      params
+        .expect(rule: [:text, :hint, :priority])
     end
   end
 end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 338a3638c4..2ae5ec8255 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -28,7 +28,8 @@ module Admin
     end
 
     def settings_params
-      params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
+      params
+        .expect(form_admin_settings: [*Form::AdminSettings::KEYS])
     end
   end
 end
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 40d1a481b2..aeadb35e7a 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -39,7 +39,8 @@ module Admin
     helper_method :batched_ordered_status_edits
 
     def admin_status_batch_action_params
-      params.require(:admin_status_batch_action).permit(status_ids: [])
+      params
+        .expect(admin_status_batch_action: [status_ids: []])
     end
 
     def after_create_redirect_path
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 4759d15bc4..a7bfd64794 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -37,7 +37,8 @@ module Admin
     end
 
     def tag_params
-      params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable)
+      params
+        .expect(tag: [:name, :display_name, :trendable, :usable, :listable])
     end
 
     def filtered_tags
diff --git a/app/controllers/admin/terms_of_service/drafts_controller.rb b/app/controllers/admin/terms_of_service/drafts_controller.rb
index 5d32c0bd83..02cb05946f 100644
--- a/app/controllers/admin/terms_of_service/drafts_controller.rb
+++ b/app/controllers/admin/terms_of_service/drafts_controller.rb
@@ -31,6 +31,7 @@ class Admin::TermsOfService::DraftsController < Admin::BaseController
   end
 
   def resource_params
-    params.require(:terms_of_service).permit(:text, :changelog)
+    params
+      .expect(terms_of_service: [:text, :changelog])
   end
 end
diff --git a/app/controllers/admin/terms_of_service/generates_controller.rb b/app/controllers/admin/terms_of_service/generates_controller.rb
index 28037674a3..0edc87893e 100644
--- a/app/controllers/admin/terms_of_service/generates_controller.rb
+++ b/app/controllers/admin/terms_of_service/generates_controller.rb
@@ -32,6 +32,7 @@ class Admin::TermsOfService::GeneratesController < Admin::BaseController
   end
 
   def resource_params
-    params.require(:terms_of_service_generator).permit(*TermsOfService::Generator::VARIABLES)
+    params
+      .expect(terms_of_service_generator: [*TermsOfService::Generator::VARIABLES])
   end
 end
diff --git a/app/controllers/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/admin/trends/links/preview_card_providers_controller.rb
index 5e4b4084f8..5a650d5d8c 100644
--- a/app/controllers/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/admin/trends/links/preview_card_providers_controller.rb
@@ -31,7 +31,8 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll
   end
 
   def trends_preview_card_provider_batch_params
-    params.require(:trends_preview_card_provider_batch).permit(:action, preview_card_provider_ids: [])
+    params
+      .expect(trends_preview_card_provider_batch: [:action, preview_card_provider_ids: []])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/trends/links_controller.rb b/app/controllers/admin/trends/links_controller.rb
index 65eca11c7f..68aa73c992 100644
--- a/app/controllers/admin/trends/links_controller.rb
+++ b/app/controllers/admin/trends/links_controller.rb
@@ -31,7 +31,8 @@ class Admin::Trends::LinksController < Admin::BaseController
   end
 
   def trends_preview_card_batch_params
-    params.require(:trends_preview_card_batch).permit(:action, preview_card_ids: [])
+    params
+      .expect(trends_preview_card_batch: [:action, preview_card_ids: []])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/trends/statuses_controller.rb b/app/controllers/admin/trends/statuses_controller.rb
index 682fe70bb5..873d777fe3 100644
--- a/app/controllers/admin/trends/statuses_controller.rb
+++ b/app/controllers/admin/trends/statuses_controller.rb
@@ -31,7 +31,8 @@ class Admin::Trends::StatusesController < Admin::BaseController
   end
 
   def trends_status_batch_params
-    params.require(:trends_status_batch).permit(:action, status_ids: [])
+    params
+      .expect(trends_status_batch: [:action, status_ids: []])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/trends/tags_controller.rb b/app/controllers/admin/trends/tags_controller.rb
index fcd23fbf66..1ccd740686 100644
--- a/app/controllers/admin/trends/tags_controller.rb
+++ b/app/controllers/admin/trends/tags_controller.rb
@@ -31,7 +31,8 @@ class Admin::Trends::TagsController < Admin::BaseController
   end
 
   def trends_tag_batch_params
-    params.require(:trends_tag_batch).permit(:action, tag_ids: [])
+    params
+      .expect(trends_tag_batch: [:action, tag_ids: []])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/users/roles_controller.rb b/app/controllers/admin/users/roles_controller.rb
index f5dfc643d4..e8b58de504 100644
--- a/app/controllers/admin/users/roles_controller.rb
+++ b/app/controllers/admin/users/roles_controller.rb
@@ -28,7 +28,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:user).permit(:role_id)
+      params
+        .expect(user: [:role_id])
     end
   end
 end
diff --git a/app/controllers/admin/warning_presets_controller.rb b/app/controllers/admin/warning_presets_controller.rb
index efbf65b119..dcf88294ee 100644
--- a/app/controllers/admin/warning_presets_controller.rb
+++ b/app/controllers/admin/warning_presets_controller.rb
@@ -52,7 +52,8 @@ module Admin
     end
 
     def warning_preset_params
-      params.require(:account_warning_preset).permit(:title, :text)
+      params
+        .expect(account_warning_preset: [:title, :text])
     end
   end
 end
diff --git a/app/controllers/admin/webhooks_controller.rb b/app/controllers/admin/webhooks_controller.rb
index f1aad7c4b5..31db369637 100644
--- a/app/controllers/admin/webhooks_controller.rb
+++ b/app/controllers/admin/webhooks_controller.rb
@@ -74,7 +74,8 @@ module Admin
     end
 
     def resource_params
-      params.require(:webhook).permit(:url, :template, events: [])
+      params
+        .expect(webhook: [:url, :template, events: []])
     end
   end
 end
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index d74b5d958f..f2c52f2846 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -56,12 +56,12 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   end
 
   def subscription_params
-    params.require(:subscription).permit(:endpoint, :standard, keys: [:auth, :p256dh])
+    params.expect(subscription: [:endpoint, :standard, keys: [:auth, :p256dh]])
   end
 
   def data_params
     return {} if params[:data].blank?
 
-    params.require(:data).permit(:policy, alerts: Notification::TYPES)
+    params.expect(data: [:policy, alerts: Notification::TYPES])
   end
 end
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index 7eb51c6846..2711071b4a 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -66,7 +66,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
   end
 
   def subscription_params
-    @subscription_params ||= params.require(:subscription).permit(:standard, :endpoint, keys: [:auth, :p256dh])
+    @subscription_params ||= params.expect(subscription: [:standard, :endpoint, keys: [:auth, :p256dh]])
   end
 
   def web_push_subscription_params
@@ -82,6 +82,6 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
   end
 
   def data_params
-    @data_params ||= params.require(:data).permit(:policy, alerts: Notification::TYPES)
+    @data_params ||= params.expect(data: [:policy, alerts: Notification::TYPES])
   end
 end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 34c7599553..6e34b6b627 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -12,7 +12,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :set_sessions, only: [:edit, :update]
   before_action :set_strikes, only: [:edit, :update]
   before_action :require_not_suspended!, only: [:update]
-  before_action :set_cache_headers, only: [:edit, :update]
   before_action :set_rules, only: :new
   before_action :require_rules_acceptance!, only: :new
   before_action :set_registration_form_time, only: :new
@@ -139,10 +138,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     set_locale { render :rules }
   end
 
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
-
   def is_flashing_format? # rubocop:disable Naming/PredicateName
     if params[:action] == 'create'
       false # Disable flash messages for sign-up
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index ecac4c5ba8..250573fc7d 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -73,7 +73,7 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def user_params
-    params.require(:user).permit(:email, :password, :otp_attempt, credential: {})
+    params.expect(user: [:email, :password, :otp_attempt, credential: {}])
   end
 
   def after_sign_in_path_for(resource)
diff --git a/app/controllers/auth/setup_controller.rb b/app/controllers/auth/setup_controller.rb
index 376a30c16f..5e7b14646a 100644
--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@@ -35,6 +35,6 @@ class Auth::SetupController < ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:email)
+    params.expect(user: [:email])
   end
 end
diff --git a/app/controllers/concerns/admin/export_controller_concern.rb b/app/controllers/concerns/admin/export_controller_concern.rb
index 6228ae67fe..ce03b2a24a 100644
--- a/app/controllers/concerns/admin/export_controller_concern.rb
+++ b/app/controllers/concerns/admin/export_controller_concern.rb
@@ -24,6 +24,6 @@ module Admin::ExportControllerConcern
   end
 
   def import_params
-    params.require(:admin_import).permit(:data)
+    params.expect(admin_import: [:data])
   end
 end
diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb
index c8d1a0bef7..7fbc469bdf 100644
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@@ -58,6 +58,6 @@ module ChallengableConcern
   end
 
   def challenge_params
-    params.require(:form_challenge).permit(:current_password, :return_to)
+    params.expect(form_challenge: [:current_password, :return_to])
   end
 end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 4ae63632c0..5f7ef8dd63 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -117,7 +117,7 @@ module SignatureVerification
 
   def verify_signature_strength!
     raise SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)')
-    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(Request::REQUEST_TARGET) || signed_headers.include?('digest')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(HttpSignatureDraft::REQUEST_TARGET) || signed_headers.include?('digest')
     raise SignatureVerificationError, 'Mastodon requires the Host header to be signed when doing a GET request' if request.get? && !signed_headers.include?('host')
     raise SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest')
   end
@@ -155,14 +155,14 @@ module SignatureVerification
   def build_signed_string(include_query_string: true)
     signed_headers.map do |signed_header|
       case signed_header
-      when Request::REQUEST_TARGET
+      when HttpSignatureDraft::REQUEST_TARGET
         if include_query_string
-          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}"
+          "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}"
         else
           # Current versions of Mastodon incorrectly omit the query string from the (request-target) pseudo-header.
           # Therefore, temporarily support such incorrect signatures for compatibility.
           # TODO: remove eventually some time after release of the fixed version
-          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+          "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
         end
       when '(created)'
         raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'
diff --git a/app/controllers/disputes/appeals_controller.rb b/app/controllers/disputes/appeals_controller.rb
index 98b58d2117..797f31cf78 100644
--- a/app/controllers/disputes/appeals_controller.rb
+++ b/app/controllers/disputes/appeals_controller.rb
@@ -21,6 +21,6 @@ class Disputes::AppealsController < Disputes::BaseController
   end
 
   def appeal_params
-    params.require(:appeal).permit(:text)
+    params.expect(appeal: [:text])
   end
 end
diff --git a/app/controllers/disputes/base_controller.rb b/app/controllers/disputes/base_controller.rb
index dd24a1b740..07677fd3f3 100644
--- a/app/controllers/disputes/base_controller.rb
+++ b/app/controllers/disputes/base_controller.rb
@@ -8,11 +8,4 @@ class Disputes::BaseController < ApplicationController
   skip_before_action :require_functional!
 
   before_action :authenticate_user!
-  before_action :set_cache_headers
-
-  private
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
 end
diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb
index 7ada13f680..d85b017aaa 100644
--- a/app/controllers/filters/statuses_controller.rb
+++ b/app/controllers/filters/statuses_controller.rb
@@ -6,7 +6,6 @@ class Filters::StatusesController < ApplicationController
   before_action :authenticate_user!
   before_action :set_filter
   before_action :set_status_filters
-  before_action :set_cache_headers
 
   PER_PAGE = 20
 
@@ -34,14 +33,10 @@ class Filters::StatusesController < ApplicationController
   end
 
   def status_filter_batch_action_params
-    params.require(:form_status_filter_batch_action).permit(status_filter_ids: [])
+    params.expect(form_status_filter_batch_action: [status_filter_ids: []])
   end
 
   def action_from_button
     'remove' if params[:remove]
   end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
 end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 8c4e867e93..769aea2afe 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -5,7 +5,6 @@ class FiltersController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_filter, only: [:edit, :update, :destroy]
-  before_action :set_cache_headers
 
   def index
     @filters = current_account.custom_filters.includes(:keywords, :statuses).order(:phrase)
@@ -48,10 +47,6 @@ 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])
-  end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
+    params.expect(custom_filter: [:title, :expires_in, :filter_action, context: [], keywords_attributes: [[:id, :keyword, :whole_word, :_destroy]]])
   end
 end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 070852695e..fc65333ac4 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,7 +6,6 @@ class InvitesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_cache_headers
 
   def index
     authorize :invite, :create?
@@ -43,10 +42,6 @@ class InvitesController < ApplicationController
   end
 
   def resource_params
-    params.require(:invite).permit(:max_uses, :expires_in, :autofollow, :comment)
-  end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
+    params.expect(invite: [:max_uses, :expires_in, :autofollow, :comment])
   end
 end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 66e774425d..deafedeaef 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -5,7 +5,6 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
-  before_action :set_cache_headers
 
   content_security_policy do |p|
     p.form_action(false)
@@ -32,8 +31,4 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   def truthy_param?(key)
     ActiveModel::Type::Boolean.new.cast(params[key])
   end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
 end
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 9e541e5e3c..8b11a519ea 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -6,7 +6,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
   before_action :store_current_location
   before_action :authenticate_resource_owner!
   before_action :require_not_suspended!, only: :destroy
-  before_action :set_cache_headers
 
   before_action :set_last_used_at_by_app, only: :index, unless: -> { request.format == :json }
 
@@ -30,10 +29,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
     forbidden if current_account.unavailable?
   end
 
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
-
   def set_last_used_at_by_app
     @last_used_at_by_app = current_resource_owner.applications_last_used
   end
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index d351afcfb7..7e793fc734 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -6,7 +6,6 @@ class RelationshipsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_accounts, only: :show
   before_action :set_relationships, only: :show
-  before_action :set_cache_headers
 
   helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
 
@@ -36,7 +35,7 @@ class RelationshipsController < ApplicationController
   end
 
   def form_account_batch_params
-    params.require(:form_account_batch).permit(:action, account_ids: [])
+    params.expect(form_account_batch: [:action, account_ids: []])
   end
 
   def following_relationship?
@@ -66,8 +65,4 @@ class RelationshipsController < ApplicationController
       'remove_domains_from_followers'
     end
   end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
 end
diff --git a/app/controllers/settings/aliases_controller.rb b/app/controllers/settings/aliases_controller.rb
index a421b8ede3..c21d43eeb3 100644
--- a/app/controllers/settings/aliases_controller.rb
+++ b/app/controllers/settings/aliases_controller.rb
@@ -30,7 +30,7 @@ class Settings::AliasesController < Settings::BaseController
   private
 
   def resource_params
-    params.require(:account_alias).permit(:acct)
+    params.expect(account_alias: [:acct])
   end
 
   def set_alias
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index d6573f9b49..8e39741f89 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -2,7 +2,6 @@
 
 class Settings::ApplicationsController < Settings::BaseController
   before_action :set_application, only: [:show, :update, :destroy, :regenerate]
-  before_action :prepare_scopes, only: [:create, :update]
 
   def index
     @applications = current_user.applications.order(id: :desc).page(params[:page])
@@ -60,16 +59,6 @@ class Settings::ApplicationsController < Settings::BaseController
   end
 
   def application_params
-    params.require(:doorkeeper_application).permit(
-      :name,
-      :redirect_uri,
-      :scopes,
-      :website
-    )
-  end
-
-  def prepare_scopes
-    scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil)
-    params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array
+    params.expect(doorkeeper_application: [:name, :redirect_uri, :website, scopes: []])
   end
 end
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index 188334ac23..7f2279aa8f 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -4,14 +4,9 @@ class Settings::BaseController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_cache_headers
 
   private
 
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
-  end
-
   def require_not_suspended!
     forbidden if current_account.unavailable?
   end
diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index 16c201b6b3..815d95ad83 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -21,7 +21,7 @@ class Settings::DeletesController < Settings::BaseController
   private
 
   def resource_params
-    params.require(:form_delete_confirmation).permit(:password, :username)
+    params.expect(form_delete_confirmation: [:password, :username])
   end
 
   def require_not_suspended!
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 7e29dd1d29..0f352e1913 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -44,6 +44,6 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def featured_tag_params
-    params.require(:featured_tag).permit(:name)
+    params.expect(featured_tag: [:name])
   end
 end
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 5346a448a3..be1699315f 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -90,7 +90,7 @@ class Settings::ImportsController < Settings::BaseController
   private
 
   def import_params
-    params.require(:form_import).permit(:data, :type, :mode)
+    params.expect(form_import: [:data, :type, :mode])
   end
 
   def set_bulk_import
diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb
index 6d469f3842..d850e05e94 100644
--- a/app/controllers/settings/migration/redirects_controller.rb
+++ b/app/controllers/settings/migration/redirects_controller.rb
@@ -33,6 +33,6 @@ class Settings::Migration::RedirectsController < Settings::BaseController
   private
 
   def resource_params
-    params.require(:form_redirect).permit(:acct, :current_password, :current_username)
+    params.expect(form_redirect: [:acct, :current_password, :current_username])
   end
 end
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index 62603aba81..92e3611fd9 100644
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -27,7 +27,7 @@ class Settings::MigrationsController < Settings::BaseController
   private
 
   def resource_params
-    params.require(:account_migration).permit(:acct, :current_password, :current_username)
+    params.expect(account_migration: [:acct, :current_password, :current_username])
   end
 
   def set_migrations
diff --git a/app/controllers/settings/preferences/base_controller.rb b/app/controllers/settings/preferences/base_controller.rb
index c1f8b49898..d6d42b0340 100644
--- a/app/controllers/settings/preferences/base_controller.rb
+++ b/app/controllers/settings/preferences/base_controller.rb
@@ -19,6 +19,6 @@ class Settings::Preferences::BaseController < Settings::BaseController
   end
 
   def user_params
-    params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
+    params.expect(user: [:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys])
   end
 end
diff --git a/app/controllers/settings/privacy_controller.rb b/app/controllers/settings/privacy_controller.rb
index 1102c89fad..a5bb3b884f 100644
--- a/app/controllers/settings/privacy_controller.rb
+++ b/app/controllers/settings/privacy_controller.rb
@@ -18,7 +18,7 @@ class Settings::PrivacyController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys)
+    params.expect(account: [:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys])
   end
 
   def set_account
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 8ae69b7fe0..458f4148cc 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value])
+    params.expect(account: [:display_name, :note, :avatar, :header, :bot, fields_attributes: [[:name, :value]]])
   end
 
   def set_account
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index 1a0afe58b0..eae990e79b 100644
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -38,7 +38,7 @@ module Settings
       private
 
       def confirmation_params
-        params.require(:form_two_factor_confirmation).permit(:otp_attempt)
+        params.expect(form_two_factor_confirmation: [:otp_attempt])
       end
 
       def prepare_two_factor_form
diff --git a/app/controllers/settings/verifications_controller.rb b/app/controllers/settings/verifications_controller.rb
index 9cc60ba2e8..bed29dbeec 100644
--- a/app/controllers/settings/verifications_controller.rb
+++ b/app/controllers/settings/verifications_controller.rb
@@ -18,7 +18,7 @@ class Settings::VerificationsController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:attribution_domains).tap do |params|
+    params.expect(account: [:attribution_domains]).tap do |params|
       params[:attribution_domains] = params[:attribution_domains].split if params[:attribution_domains]
     end
   end
diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb
index 965753a26f..817abebf62 100644
--- a/app/controllers/severed_relationships_controller.rb
+++ b/app/controllers/severed_relationships_controller.rb
@@ -4,7 +4,6 @@ class SeveredRelationshipsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_cache_headers
 
   before_action :set_event, only: [:following, :followers]
 
@@ -49,8 +48,4 @@ class SeveredRelationshipsController < ApplicationController
   def acct(account)
     account.local? ? account.local_username_and_domain : account.acct
   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 e517bf3ae8..f4f49031a0 100644
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@@ -5,7 +5,6 @@ class StatusesCleanupController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_policy
-  before_action :set_cache_headers
 
   def show; end
 
@@ -15,8 +14,6 @@ class StatusesCleanupController < ApplicationController
     else
       render :show
     end
-  rescue ActionController::ParameterMissing
-    # Do nothing
   end
 
   def require_functional!
@@ -30,10 +27,6 @@ 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)
-  end
-
-  def set_cache_headers
-    response.cache_control.replace(private: true, no_store: true)
+    params.expect(account_statuses_cleanup_policy: [:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :min_favs, :min_reblogs])
   end
 end
diff --git a/app/javascript/hooks/useSelectableClick.ts b/app/javascript/hooks/useSelectableClick.ts
new file mode 100644
index 0000000000..c8f16f0b0f
--- /dev/null
+++ b/app/javascript/hooks/useSelectableClick.ts
@@ -0,0 +1,55 @@
+import { useRef, useCallback } from 'react';
+
+type Position = [number, number];
+
+export const useSelectableClick = (
+  onClick: React.MouseEventHandler,
+  maxDelta = 5,
+) => {
+  const clickPositionRef = useRef<Position | null>(null);
+
+  const handleMouseDown = useCallback((e: React.MouseEvent) => {
+    clickPositionRef.current = [e.clientX, e.clientY];
+  }, []);
+
+  const handleMouseUp = useCallback(
+    (e: React.MouseEvent) => {
+      if (!clickPositionRef.current) {
+        return;
+      }
+
+      const [startX, startY] = clickPositionRef.current;
+      const [deltaX, deltaY] = [
+        Math.abs(e.clientX - startX),
+        Math.abs(e.clientY - startY),
+      ];
+
+      let element: EventTarget | null = e.target;
+
+      while (element && element instanceof HTMLElement) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode;
+      }
+
+      if (
+        deltaX + deltaY < maxDelta &&
+        (e.button === 0 || e.button === 1) &&
+        e.detail >= 1
+      ) {
+        onClick(e);
+      }
+
+      clickPositionRef.current = null;
+    },
+    [maxDelta, onClick],
+  );
+
+  return [handleMouseDown, handleMouseUp] as const;
+};
diff --git a/app/javascript/images/reticle.png b/app/javascript/images/reticle.png
deleted file mode 100644
index a724ac0bcd..0000000000
Binary files a/app/javascript/images/reticle.png and /dev/null differ
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index aa1c6de20e..d70834cec6 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -414,7 +414,7 @@ export function initMediaEditModal(id) {
 
     dispatch(openModal({
       modalType: 'FOCAL_POINT',
-      modalProps: { id },
+      modalProps: { mediaId: id },
     }));
   };
 }
diff --git a/app/javascript/mastodon/actions/compose_typed.ts b/app/javascript/mastodon/actions/compose_typed.ts
new file mode 100644
index 0000000000..97f0d68c51
--- /dev/null
+++ b/app/javascript/mastodon/actions/compose_typed.ts
@@ -0,0 +1,70 @@
+import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
+
+import { apiUpdateMedia } from 'mastodon/api/compose';
+import type { ApiMediaAttachmentJSON } from 'mastodon/api_types/media_attachments';
+import type { MediaAttachment } from 'mastodon/models/media_attachment';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+type SimulatedMediaAttachmentJSON = ApiMediaAttachmentJSON & {
+  unattached?: boolean;
+};
+
+const simulateModifiedApiResponse = (
+  media: MediaAttachment,
+  params: { description?: string; focus?: string },
+): SimulatedMediaAttachmentJSON => {
+  const [x, y] = (params.focus ?? '').split(',');
+
+  const data = {
+    ...media.toJS(),
+    ...params,
+    meta: {
+      focus: {
+        x: parseFloat(x ?? '0'),
+        y: parseFloat(y ?? '0'),
+      },
+    },
+  } as unknown as SimulatedMediaAttachmentJSON;
+
+  return data;
+};
+
+export const changeUploadCompose = createDataLoadingThunk(
+  'compose/changeUpload',
+  async (
+    {
+      id,
+      ...params
+    }: {
+      id: string;
+      description: string;
+      focus: string;
+    },
+    { getState },
+  ) => {
+    const media = (
+      (getState().compose as ImmutableMap<string, unknown>).get(
+        'media_attachments',
+      ) as ImmutableList<MediaAttachment>
+    ).find((item) => item.get('id') === id);
+
+    // Editing already-attached media is deferred to editing the post itself.
+    // For simplicity's sake, fake an API reply.
+    if (media && !media.get('unattached')) {
+      return new Promise<SimulatedMediaAttachmentJSON>((resolve) => {
+        resolve(simulateModifiedApiResponse(media, params));
+      });
+    }
+
+    return apiUpdateMedia(id, params);
+  },
+  (media: SimulatedMediaAttachmentJSON) => {
+    return {
+      media,
+      attached: typeof media.unattached !== 'undefined' && !media.unattached,
+    };
+  },
+  {
+    useLoadingBar: false,
+  },
+);
diff --git a/app/javascript/mastodon/actions/modal.ts b/app/javascript/mastodon/actions/modal.ts
index ab03e46765..49af176a11 100644
--- a/app/javascript/mastodon/actions/modal.ts
+++ b/app/javascript/mastodon/actions/modal.ts
@@ -9,6 +9,7 @@ export type ModalType = keyof typeof MODAL_COMPONENTS;
 interface OpenModalPayload {
   modalType: ModalType;
   modalProps: ModalProps;
+  previousModalProps?: ModalProps;
 }
 export const openModal = createAction<OpenModalPayload>('MODAL_OPEN');
 
diff --git a/app/javascript/mastodon/api/compose.ts b/app/javascript/mastodon/api/compose.ts
new file mode 100644
index 0000000000..757e9961c9
--- /dev/null
+++ b/app/javascript/mastodon/api/compose.ts
@@ -0,0 +1,7 @@
+import { apiRequestPut } from 'mastodon/api';
+import type { ApiMediaAttachmentJSON } from 'mastodon/api_types/media_attachments';
+
+export const apiUpdateMedia = (
+  id: string,
+  params?: { description?: string; focus?: string },
+) => apiRequestPut<ApiMediaAttachmentJSON>(`v1/media/${id}`, params);
diff --git a/app/javascript/mastodon/components/alt_text_badge.tsx b/app/javascript/mastodon/components/alt_text_badge.tsx
index 99bec1ee51..466c5cf1bc 100644
--- a/app/javascript/mastodon/components/alt_text_badge.tsx
+++ b/app/javascript/mastodon/components/alt_text_badge.tsx
@@ -1,4 +1,4 @@
-import { useState, useCallback, useRef } from 'react';
+import { useState, useCallback, useRef, useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -8,12 +8,15 @@ import type {
   UsePopperOptions,
 } from 'react-overlays/esm/usePopper';
 
+import { useSelectableClick } from '@/hooks/useSelectableClick';
+
 const offset = [0, 4] as OffsetValue;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
 export const AltTextBadge: React.FC<{
   description: string;
 }> = ({ description }) => {
+  const accessibilityId = useId();
   const anchorRef = useRef<HTMLButtonElement>(null);
   const [open, setOpen] = useState(false);
 
@@ -25,12 +28,16 @@ export const AltTextBadge: React.FC<{
     setOpen(false);
   }, [setOpen]);
 
+  const [handleMouseDown, handleMouseUp] = useSelectableClick(handleClose);
+
   return (
     <>
       <button
         ref={anchorRef}
         className='media-gallery__alt__label'
         onClick={handleClick}
+        aria-expanded={open}
+        aria-controls={accessibilityId}
       >
         ALT
       </button>
@@ -47,9 +54,12 @@ export const AltTextBadge: React.FC<{
       >
         {({ props }) => (
           <div {...props} className='hover-card-controller'>
-            <div
+            <div // eslint-disable-line jsx-a11y/no-noninteractive-element-interactions
               className='media-gallery__alt__popover dropdown-animation'
-              role='tooltip'
+              role='region'
+              id={accessibilityId}
+              onMouseDown={handleMouseDown}
+              onMouseUp={handleMouseUp}
             >
               <h4>
                 <FormattedMessage
diff --git a/app/javascript/mastodon/components/button.tsx b/app/javascript/mastodon/components/button.tsx
index b349a83f2b..a527468f65 100644
--- a/app/javascript/mastodon/components/button.tsx
+++ b/app/javascript/mastodon/components/button.tsx
@@ -7,6 +7,7 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
+  compact?: boolean;
   dangerous?: boolean;
 }
 
@@ -27,6 +28,7 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
+  compact,
   dangerous,
   className,
   title,
@@ -47,6 +49,7 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
+        'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,
       })}
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index c62e76d4b5..a21317e524 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -2,6 +2,8 @@ import { useCallback, useEffect } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
+import classNames from 'classnames';
+
 import { useIdentity } from '@/mastodon/identity_context';
 import { fetchRelationships, followAccount } from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
@@ -20,7 +22,8 @@ const messages = defineMessages({
 
 export const FollowButton: React.FC<{
   accountId?: string;
-}> = ({ accountId }) => {
+  compact?: boolean;
+}> = ({ accountId, compact }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const { signedIn } = useIdentity();
@@ -89,7 +92,9 @@ export const FollowButton: React.FC<{
         href='/settings/profile'
         target='_blank'
         rel='noopener'
-        className='button button-secondary'
+        className={classNames('button button-secondary', {
+          'button--compact': compact,
+        })}
       >
         {label}
       </a>
@@ -106,6 +111,7 @@ export const FollowButton: React.FC<{
           (account?.suspended || !!account?.moved))
       }
       secondary={following}
+      compact={compact}
       className={following ? 'button--destructive' : undefined}
     >
       {label}
diff --git a/app/javascript/mastodon/components/gifv.tsx b/app/javascript/mastodon/components/gifv.tsx
index c2be591128..8e3a434c14 100644
--- a/app/javascript/mastodon/components/gifv.tsx
+++ b/app/javascript/mastodon/components/gifv.tsx
@@ -1,70 +1,70 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useState, forwardRef } from 'react';
 
 interface Props {
   src: string;
-  key: string;
   alt?: string;
   lang?: string;
-  width: number;
-  height: number;
-  onClick?: () => void;
+  width?: number;
+  height?: number;
+  onClick?: React.MouseEventHandler;
+  onMouseDown?: React.MouseEventHandler;
+  onTouchStart?: React.TouchEventHandler;
 }
 
-export const GIFV: React.FC<Props> = ({
-  src,
-  alt,
-  lang,
-  width,
-  height,
-  onClick,
-}) => {
-  const [loading, setLoading] = useState(true);
+export const GIFV = forwardRef<HTMLVideoElement, Props>(
+  (
+    { src, alt, lang, width, height, onClick, onMouseDown, onTouchStart },
+    ref,
+  ) => {
+    const [loading, setLoading] = useState(true);
 
-  const handleLoadedData: React.ReactEventHandler<HTMLVideoElement> =
-    useCallback(() => {
+    const handleLoadedData = useCallback(() => {
       setLoading(false);
     }, [setLoading]);
 
-  const handleClick: React.MouseEventHandler = useCallback(
-    (e) => {
-      if (onClick) {
+    const handleClick = useCallback(
+      (e: React.MouseEvent) => {
         e.stopPropagation();
-        onClick();
-      }
-    },
-    [onClick],
-  );
+        onClick?.(e);
+      },
+      [onClick],
+    );
 
-  return (
-    <div className='gifv' style={{ position: 'relative' }}>
-      {loading && (
-        <canvas
-          width={width}
-          height={height}
+    return (
+      <div className='gifv'>
+        {loading && (
+          <canvas
+            role='button'
+            tabIndex={0}
+            aria-label={alt}
+            title={alt}
+            lang={lang}
+            onClick={handleClick}
+          />
+        )}
+
+        <video
+          ref={ref}
+          src={src}
           role='button'
           tabIndex={0}
           aria-label={alt}
           title={alt}
           lang={lang}
+          width={width}
+          height={height}
+          muted
+          loop
+          autoPlay
+          playsInline
           onClick={handleClick}
+          onLoadedData={handleLoadedData}
+          onMouseDown={onMouseDown}
+          onTouchStart={onTouchStart}
         />
-      )}
+      </div>
+    );
+  },
+);
 
-      <video
-        src={src}
-        role='button'
-        tabIndex={0}
-        aria-label={alt}
-        title={alt}
-        lang={lang}
-        muted
-        loop
-        autoPlay
-        playsInline
-        onClick={handleClick}
-        onLoadedData={handleLoadedData}
-        style={{ position: loading ? 'absolute' : 'static', top: 0, left: 0 }}
-      />
-    </div>
-  );
-};
+GIFV.displayName = 'GIFV';
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 544b5e1461..6cbdee6ce5 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -1,9 +1,10 @@
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { Icon } from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 
 const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
@@ -17,10 +18,12 @@ interface Props<T> {
 
 export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
   const intl = useIntl();
+  const [loading, setLoading] = useState(false);
 
   const handleClick = useCallback(() => {
+    setLoading(true);
     onClick(param);
-  }, [param, onClick]);
+  }, [setLoading, param, onClick]);
 
   return (
     <button
@@ -28,8 +31,13 @@ export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
       disabled={disabled}
       onClick={handleClick}
       aria-label={intl.formatMessage(messages.load_more)}
+      title={intl.formatMessage(messages.load_more)}
     >
-      <Icon id='ellipsis-h' icon={MoreHorizIcon} />
+      {loading ? (
+        <LoadingIndicator />
+      ) : (
+        <Icon id='ellipsis-h' icon={MoreHorizIcon} />
+      )}
     </button>
   );
 };
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 95b06abc54..5132316600 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -145,7 +145,6 @@ class Item extends PureComponent {
             srcSet={srcSet}
             sizes={sizes}
             alt={description}
-            title={description}
             lang={lang}
             style={{ objectPosition: `${x}% ${y}%` }}
             onLoad={this.handleImageLoad}
@@ -167,7 +166,6 @@ class Item extends PureComponent {
           <video
             className='media-gallery__item-gifv-thumbnail'
             aria-label={description}
-            title={description}
             lang={lang}
             role='application'
             src={attachment.get('url')}
diff --git a/app/javascript/mastodon/components/modal_root.jsx b/app/javascript/mastodon/components/modal_root.jsx
index b0d88fe8f9..1eae0819af 100644
--- a/app/javascript/mastodon/components/modal_root.jsx
+++ b/app/javascript/mastodon/components/modal_root.jsx
@@ -118,9 +118,9 @@ class ModalRoot extends PureComponent {
   }
 
   _ensureHistoryBuffer () {
-    const { pathname, state } = this.history.location;
+    const { pathname, search, hash, state } = this.history.location;
     if (!state || state.mastodonModalKey !== this._modalHistoryKey) {
-      this.history.push(pathname, { ...state, mastodonModalKey: this._modalHistoryKey });
+      this.history.push({ pathname, search, hash }, { ...state, mastodonModalKey: this._modalHistoryKey });
     }
   }
 
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index fb1fcb87fe..d4eb1463f0 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -333,7 +333,7 @@ class Status extends ImmutablePureComponent {
     const { onToggleHidden } = this.props;
     const status = this._properStatus();
 
-    if (status.get('matched_filters')) {
+    if (this.props.status.get('matched_filters')) {
       const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
       const expandedBecauseOfFilter = this.state.showDespiteFilter;
 
@@ -527,7 +527,7 @@ class Status extends ImmutablePureComponent {
           </Bundle>
         );
       }
-    } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
+    } else if (status.get('card')) {
       media = (
         <Card
           onOpenMedia={this.handleOpenMedia}
diff --git a/app/javascript/mastodon/features/account/components/domain_pill.jsx b/app/javascript/mastodon/features/account/components/domain_pill.jsx
deleted file mode 100644
index 0dadb947f9..0000000000
--- a/app/javascript/mastodon/features/account/components/domain_pill.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-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/domain_pill.tsx b/app/javascript/mastodon/features/account/components/domain_pill.tsx
new file mode 100644
index 0000000000..c60397448b
--- /dev/null
+++ b/app/javascript/mastodon/features/account/components/domain_pill.tsx
@@ -0,0 +1,202 @@
+import { useState, useRef, useCallback, useId } 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: React.FC<{
+  domain: string;
+  username: string;
+  isSelf: boolean;
+}> = ({ domain, username, isSelf }) => {
+  const accessibilityId = useId();
+  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}
+        aria-expanded={open}
+        aria-controls={accessibilityId}
+      >
+        {domain}
+      </button>
+
+      <Overlay
+        show={open}
+        rootClose
+        onHide={handleClick}
+        offset={[5, 5]}
+        target={triggerRef}
+      >
+        {({ props }) => (
+          <div
+            {...props}
+            role='region'
+            id={accessibilityId}
+            className='account__domain-pill__popout dropdown-animation'
+          >
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'>
+                <Icon id='' 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 id='' 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 id='' 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>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.tsx b/app/javascript/mastodon/features/account_gallery/components/media_item.tsx
index 729e40a993..fef8a1300d 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.tsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.tsx
@@ -93,7 +93,6 @@ export const MediaItem: React.FC<{
         <img
           src={previewUrl || avatarUrl}
           alt={description}
-          title={description}
           lang={lang}
           onLoad={handleImageLoad}
         />
@@ -113,7 +112,6 @@ export const MediaItem: React.FC<{
       <img
         src={previewUrl}
         alt={description}
-        title={description}
         lang={lang}
         style={{ objectPosition: `${x}% ${y}%` }}
         onLoad={handleImageLoad}
@@ -131,7 +129,6 @@ export const MediaItem: React.FC<{
         <video
           className='media-gallery__item-gifv-thumbnail'
           aria-label={description}
-          title={description}
           lang={lang}
           src={fullUrl}
           onMouseEnter={handleMouseEnter}
diff --git a/app/javascript/mastodon/features/alt_text_modal/components/info_button.tsx b/app/javascript/mastodon/features/alt_text_modal/components/info_button.tsx
new file mode 100644
index 0000000000..f867dfb393
--- /dev/null
+++ b/app/javascript/mastodon/features/alt_text_modal/components/info_button.tsx
@@ -0,0 +1,87 @@
+import { useState, useRef, useCallback, useId } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+import { useSelectableClick } from '@/hooks/useSelectableClick';
+import QuestionMarkIcon from '@/material-icons/400-24px/question_mark.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+const messages = defineMessages({
+  help: { id: 'info_button.label', defaultMessage: 'Help' },
+});
+
+export const InfoButton: React.FC = () => {
+  const intl = useIntl();
+  const [open, setOpen] = useState(false);
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  const accessibilityId = useId();
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const [handleMouseDown, handleMouseUp] = useSelectableClick(handleClick);
+
+  return (
+    <>
+      <button
+        type='button'
+        className={classNames('help-button', { active: open })}
+        ref={triggerRef}
+        onClick={handleClick}
+        aria-expanded={open}
+        aria-controls={accessibilityId}
+        aria-label={intl.formatMessage(messages.help)}
+      >
+        <Icon id='' icon={QuestionMarkIcon} />
+      </button>
+
+      <Overlay
+        show={open}
+        rootClose
+        placement='top'
+        onHide={handleClick}
+        offset={[5, 5]}
+        target={triggerRef}
+      >
+        {({ props }) => (
+          <div // eslint-disable-line jsx-a11y/no-noninteractive-element-interactions
+            {...props}
+            className='dialog-modal__popout prose dropdown-animation'
+            role='region'
+            id={accessibilityId}
+            onMouseDown={handleMouseDown}
+            onMouseUp={handleMouseUp}
+          >
+            <FormattedMessage
+              id='info_button.what_is_alt_text'
+              defaultMessage='<h1>What is alt text?</h1>
+
+            <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p>
+
+            <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p>
+
+            <ul>
+              <li>Capture important elements</li>
+              <li>Summarize text in images</li>
+              <li>Use regular sentence structure</li>
+              <li>Avoid redundant information</li>
+              <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li>
+            </ul>'
+              values={{
+                h1: (node) => <h1>{node}</h1>,
+                p: (node) => <p>{node}</p>,
+                ul: (node) => <ul>{node}</ul>,
+                li: (node) => <li>{node}</li>,
+              }}
+            />
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/alt_text_modal/index.tsx b/app/javascript/mastodon/features/alt_text_modal/index.tsx
new file mode 100644
index 0000000000..80c4f36105
--- /dev/null
+++ b/app/javascript/mastodon/features/alt_text_modal/index.tsx
@@ -0,0 +1,537 @@
+import {
+  useState,
+  useCallback,
+  useRef,
+  useEffect,
+  useImperativeHandle,
+  forwardRef,
+} from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
+
+import Textarea from 'react-textarea-autosize';
+import { length } from 'stringz';
+// eslint-disable-next-line import/extensions
+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 { showAlertForError } from 'mastodon/actions/alerts';
+import { uploadThumbnail } from 'mastodon/actions/compose';
+import { changeUploadCompose } from 'mastodon/actions/compose_typed';
+import { Button } from 'mastodon/components/button';
+import { GIFV } from 'mastodon/components/gifv';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { Skeleton } from 'mastodon/components/skeleton';
+import Audio from 'mastodon/features/audio';
+import { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
+import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
+import Video, { getPointerPosition } from 'mastodon/features/video';
+import { me } from 'mastodon/initial_state';
+import type { MediaAttachment } from 'mastodon/models/media_attachment';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+import { assetHost } from 'mastodon/utils/config';
+
+import { InfoButton } from './components/info_button';
+
+const messages = defineMessages({
+  placeholderVisual: {
+    id: 'alt_text_modal.describe_for_people_with_visual_impairments',
+    defaultMessage: 'Describe this for people with visual impairments…',
+  },
+  placeholderHearing: {
+    id: 'alt_text_modal.describe_for_people_with_hearing_impairments',
+    defaultMessage: 'Describe this for people with hearing impairments…',
+  },
+  discardMessage: {
+    id: 'confirmations.discard_edit_media.message',
+    defaultMessage:
+      'You have unsaved changes to the media description or preview, discard them anyway?',
+  },
+  discardConfirm: {
+    id: 'confirmations.discard_edit_media.confirm',
+    defaultMessage: 'Discard',
+  },
+});
+
+const MAX_LENGTH = 1500;
+
+type FocalPoint = [number, number];
+
+const UploadButton: React.FC<{
+  children: React.ReactNode;
+  onSelectFile: (arg0: File) => void;
+  mimeTypes: string;
+}> = ({ children, onSelectFile, mimeTypes }) => {
+  const fileRef = useRef<HTMLInputElement>(null);
+
+  const handleClick = useCallback(() => {
+    fileRef.current?.click();
+  }, []);
+
+  const handleChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const file = e.target.files?.[0];
+
+      if (file) {
+        onSelectFile(file);
+      }
+    },
+    [onSelectFile],
+  );
+
+  return (
+    <label>
+      <Button onClick={handleClick}>{children}</Button>
+
+      <input
+        id='upload-modal__thumbnail'
+        ref={fileRef}
+        type='file'
+        accept={mimeTypes}
+        onChange={handleChange}
+        style={{ display: 'none' }}
+      />
+    </label>
+  );
+};
+
+const Preview: React.FC<{
+  mediaId: string;
+  position: FocalPoint;
+  onPositionChange: (arg0: FocalPoint) => void;
+}> = ({ mediaId, position, onPositionChange }) => {
+  const media = useAppSelector((state) =>
+    (
+      (state.compose as ImmutableMap<string, unknown>).get(
+        'media_attachments',
+      ) as ImmutableList<MediaAttachment>
+    ).find((x) => x.get('id') === mediaId),
+  );
+  const account = useAppSelector((state) =>
+    me ? state.accounts.get(me) : undefined,
+  );
+
+  const [dragging, setDragging] = useState(false);
+  const [x, y] = position;
+  const nodeRef = useRef<HTMLImageElement | HTMLVideoElement | null>(null);
+  const draggingRef = useRef<boolean>(false);
+
+  const setRef = useCallback(
+    (e: HTMLImageElement | HTMLVideoElement | null) => {
+      nodeRef.current = e;
+    },
+    [],
+  );
+
+  const handleMouseDown = useCallback(
+    (e: React.MouseEvent) => {
+      if (e.button !== 0) {
+        return;
+      }
+
+      const { x, y } = getPointerPosition(nodeRef.current, e);
+      setDragging(true);
+      draggingRef.current = true;
+      onPositionChange([x, y]);
+    },
+    [setDragging, onPositionChange],
+  );
+
+  const handleTouchStart = useCallback(
+    (e: React.TouchEvent) => {
+      const { x, y } = getPointerPosition(nodeRef.current, e);
+      setDragging(true);
+      draggingRef.current = true;
+      onPositionChange([x, y]);
+    },
+    [setDragging, onPositionChange],
+  );
+
+  useEffect(() => {
+    const handleMouseUp = () => {
+      setDragging(false);
+      draggingRef.current = false;
+    };
+
+    const handleMouseMove = (e: MouseEvent) => {
+      if (draggingRef.current) {
+        const { x, y } = getPointerPosition(nodeRef.current, e);
+        onPositionChange([x, y]);
+      }
+    };
+
+    const handleTouchEnd = () => {
+      setDragging(false);
+      draggingRef.current = false;
+    };
+
+    const handleTouchMove = (e: TouchEvent) => {
+      if (draggingRef.current) {
+        const { x, y } = getPointerPosition(nodeRef.current, e);
+        onPositionChange([x, y]);
+      }
+    };
+
+    document.addEventListener('mouseup', handleMouseUp);
+    document.addEventListener('mousemove', handleMouseMove);
+    document.addEventListener('touchend', handleTouchEnd);
+    document.addEventListener('touchmove', handleTouchMove);
+
+    return () => {
+      document.removeEventListener('mouseup', handleMouseUp);
+      document.removeEventListener('mousemove', handleMouseMove);
+      document.removeEventListener('touchend', handleTouchEnd);
+      document.removeEventListener('touchmove', handleTouchMove);
+    };
+  }, [setDragging, onPositionChange]);
+
+  if (!media) {
+    return null;
+  }
+
+  if (media.get('type') === 'image') {
+    return (
+      <div className={classNames('focal-point', { dragging })}>
+        <img
+          ref={setRef}
+          draggable={false}
+          src={media.get('url') as string}
+          alt=''
+          role='presentation'
+          onMouseDown={handleMouseDown}
+          onTouchStart={handleTouchStart}
+        />
+        <div
+          className='focal-point__reticle'
+          style={{ top: `${y * 100}%`, left: `${x * 100}%` }}
+        />
+      </div>
+    );
+  } else if (media.get('type') === 'gifv') {
+    return (
+      <div className={classNames('focal-point', { dragging })}>
+        <GIFV
+          ref={setRef}
+          src={media.get('url') as string}
+          alt=''
+          onMouseDown={handleMouseDown}
+          onTouchStart={handleTouchStart}
+        />
+        <div
+          className='focal-point__reticle'
+          style={{ top: `${y * 100}%`, left: `${x * 100}%` }}
+        />
+      </div>
+    );
+  } else if (media.get('type') === 'video') {
+    return (
+      <Video
+        preview={media.get('preview_url') as string}
+        frameRate={media.getIn(['meta', 'original', 'frame_rate']) as string}
+        blurhash={media.get('blurhash') as string}
+        src={media.get('url') as string}
+        detailed
+        inline
+        editable
+      />
+    );
+  } else if (media.get('type') === 'audio') {
+    return (
+      <Audio
+        src={media.get('url') as string}
+        duration={media.getIn(['meta', 'original', 'duration'], 0) as number}
+        poster={
+          (media.get('preview_url') as string | undefined) ??
+          account?.avatar_static
+        }
+        backgroundColor={
+          media.getIn(['meta', 'colors', 'background']) as string
+        }
+        foregroundColor={
+          media.getIn(['meta', 'colors', 'foreground']) as string
+        }
+        accentColor={media.getIn(['meta', 'colors', 'accent']) as string}
+        editable
+      />
+    );
+  } else {
+    return null;
+  }
+};
+
+interface RestoreProps {
+  previousDescription: string;
+  previousPosition: FocalPoint;
+}
+
+interface Props {
+  mediaId: string;
+  onClose: () => void;
+}
+
+interface ConfirmationMessage {
+  message: string;
+  confirm: string;
+  props?: RestoreProps;
+}
+
+export interface ModalRef {
+  getCloseConfirmationMessage: () => null | ConfirmationMessage;
+}
+
+export const AltTextModal = forwardRef<ModalRef, Props & Partial<RestoreProps>>(
+  ({ mediaId, previousDescription, previousPosition, onClose }, ref) => {
+    const intl = useIntl();
+    const dispatch = useAppDispatch();
+    const media = useAppSelector((state) =>
+      (
+        (state.compose as ImmutableMap<string, unknown>).get(
+          'media_attachments',
+        ) as ImmutableList<MediaAttachment>
+      ).find((x) => x.get('id') === mediaId),
+    );
+    const lang = useAppSelector(
+      (state) =>
+        (state.compose as ImmutableMap<string, unknown>).get('lang') as string,
+    );
+    const focusX =
+      (media?.getIn(['meta', 'focus', 'x'], 0) as number | undefined) ?? 0;
+    const focusY =
+      (media?.getIn(['meta', 'focus', 'y'], 0) as number | undefined) ?? 0;
+    const [description, setDescription] = useState(
+      previousDescription ??
+        (media?.get('description') as string | undefined) ??
+        '',
+    );
+    const [position, setPosition] = useState<FocalPoint>(
+      previousPosition ?? [focusX / 2 + 0.5, focusY / -2 + 0.5],
+    );
+    const [isDetecting, setIsDetecting] = useState(false);
+    const [isSaving, setIsSaving] = useState(false);
+    const dirtyRef = useRef(
+      previousDescription || previousPosition ? true : false,
+    );
+    const type = media?.get('type') as string;
+    const valid = length(description) <= MAX_LENGTH;
+
+    const handleDescriptionChange = useCallback(
+      (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+        setDescription(e.target.value);
+        dirtyRef.current = true;
+      },
+      [setDescription],
+    );
+
+    const handleThumbnailChange = useCallback(
+      (file: File) => {
+        dispatch(uploadThumbnail(mediaId, file));
+      },
+      [dispatch, mediaId],
+    );
+
+    const handlePositionChange = useCallback(
+      (position: FocalPoint) => {
+        setPosition(position);
+        dirtyRef.current = true;
+      },
+      [setPosition],
+    );
+
+    const handleSubmit = useCallback(() => {
+      setIsSaving(true);
+
+      dispatch(
+        changeUploadCompose({
+          id: mediaId,
+          description,
+          focus: `${((position[0] - 0.5) * 2).toFixed(2)},${((position[1] - 0.5) * -2).toFixed(2)}`,
+        }),
+      )
+        .then(() => {
+          setIsSaving(false);
+          dirtyRef.current = false;
+          onClose();
+          return '';
+        })
+        .catch((err: unknown) => {
+          setIsSaving(false);
+          dispatch(showAlertForError(err));
+        });
+    }, [dispatch, setIsSaving, mediaId, onClose, position, description]);
+
+    const handleKeyUp = useCallback(
+      (e: React.KeyboardEvent) => {
+        if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') {
+          e.preventDefault();
+
+          if (valid) {
+            handleSubmit();
+          }
+        }
+      },
+      [handleSubmit, valid],
+    );
+
+    const handleDetectClick = useCallback(() => {
+      setIsDetecting(true);
+
+      fetchTesseract()
+        .then(async ({ createWorker }) => {
+          const worker = await createWorker('eng', 1, {
+            workerPath: tesseractWorkerPath as string,
+            corePath: tesseractCorePath as string,
+            langPath: `${assetHost}/ocr/lang-data`,
+            cacheMethod: 'write',
+          });
+
+          const image = URL.createObjectURL(media?.get('file') as File);
+          const result = await worker.recognize(image);
+
+          setDescription(result.data.text);
+          setIsDetecting(false);
+
+          await worker.terminate();
+
+          return '';
+        })
+        .catch(() => {
+          setIsDetecting(false);
+        });
+    }, [setDescription, setIsDetecting, media]);
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        getCloseConfirmationMessage: () => {
+          if (dirtyRef.current) {
+            return {
+              message: intl.formatMessage(messages.discardMessage),
+              confirm: intl.formatMessage(messages.discardConfirm),
+              props: {
+                previousDescription: description,
+                previousPosition: position,
+              },
+            };
+          }
+
+          return null;
+        },
+      }),
+      [intl, description, position],
+    );
+
+    return (
+      <div className='modal-root__modal dialog-modal'>
+        <div className='dialog-modal__header'>
+          <Button onClick={handleSubmit} disabled={!valid}>
+            {isSaving ? (
+              <LoadingIndicator />
+            ) : (
+              <FormattedMessage
+                id='alt_text_modal.done'
+                defaultMessage='Done'
+              />
+            )}
+          </Button>
+
+          <span className='dialog-modal__header__title'>
+            <FormattedMessage
+              id='alt_text_modal.add_alt_text'
+              defaultMessage='Add alt text'
+            />
+          </span>
+
+          <Button secondary onClick={onClose}>
+            <FormattedMessage
+              id='alt_text_modal.cancel'
+              defaultMessage='Cancel'
+            />
+          </Button>
+        </div>
+
+        <div className='dialog-modal__content'>
+          <div className='dialog-modal__content__preview'>
+            <Preview
+              mediaId={mediaId}
+              position={position}
+              onPositionChange={handlePositionChange}
+            />
+
+            {(type === 'audio' || type === 'video') && (
+              <UploadButton
+                onSelectFile={handleThumbnailChange}
+                mimeTypes='image/jpeg,image/png,image/gif,image/heic,image/heif,image/webp,image/avif'
+              >
+                <FormattedMessage
+                  id='alt_text_modal.change_thumbnail'
+                  defaultMessage='Change thumbnail'
+                />
+              </UploadButton>
+            )}
+          </div>
+
+          <form
+            className='dialog-modal__content__form simple_form'
+            onSubmit={handleSubmit}
+          >
+            <div className='input'>
+              <div className='label_input'>
+                <Textarea
+                  id='description'
+                  value={isDetecting ? ' ' : description}
+                  onChange={handleDescriptionChange}
+                  onKeyUp={handleKeyUp}
+                  lang={lang}
+                  placeholder={intl.formatMessage(
+                    type === 'audio'
+                      ? messages.placeholderHearing
+                      : messages.placeholderVisual,
+                  )}
+                  minRows={3}
+                  disabled={isDetecting}
+                />
+
+                {isDetecting && (
+                  <div className='label_input__loading-indicator'>
+                    <Skeleton width='100%' />
+                    <Skeleton width='100%' />
+                    <Skeleton width='61%' />
+                  </div>
+                )}
+              </div>
+
+              <div className='input__toolbar'>
+                <CharacterCounter
+                  max={MAX_LENGTH}
+                  text={isDetecting ? '' : description}
+                />
+
+                <div className='spacer' />
+
+                <button
+                  className='link-button'
+                  onClick={handleDetectClick}
+                  disabled={type !== 'image' || isDetecting}
+                >
+                  <FormattedMessage
+                    id='alt_text_modal.add_text_from_image'
+                    defaultMessage='Add text from image'
+                  />
+                </button>
+
+                <InfoButton />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  },
+);
+
+AltTextModal.displayName = 'AltTextModal';
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index fdc1b0be0f..56c0e524ad 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -581,10 +581,14 @@ class Audio extends PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
-              {!editable && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} className='player-button' onClick={this.toggleReveal}><Icon id='eye-slash' icon={VisibilityOffIcon} /></button>}
-              <a title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)} className='video-player__download__icon player-button' href={this.props.src} download>
-                <Icon id={'download'} icon={DownloadIcon} />
-              </a>
+              {!editable && (
+                <>
+                  <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} className='player-button' onClick={this.toggleReveal}><Icon id='eye-slash' icon={VisibilityOffIcon} /></button>
+                  <a title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)} className='video-player__download__icon player-button' href={this.props.src} download>
+                    <Icon id='download' icon={DownloadIcon} />
+                  </a>
+                </>
+              )}
             </div>
           </div>
         </div>
diff --git a/app/javascript/mastodon/features/compose/components/character_counter.jsx b/app/javascript/mastodon/features/compose/components/character_counter.jsx
deleted file mode 100644
index f400d1fe2f..0000000000
--- a/app/javascript/mastodon/features/compose/components/character_counter.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { length } from 'stringz';
-
-export const CharacterCounter = ({ text, max }) => {
-  const diff = max - length(text);
-
-  if (diff < 0) {
-    return <span className='character-counter character-counter--over'>{diff}</span>;
-  }
-
-  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/character_counter.tsx b/app/javascript/mastodon/features/compose/components/character_counter.tsx
new file mode 100644
index 0000000000..df70045493
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/character_counter.tsx
@@ -0,0 +1,16 @@
+import { length } from 'stringz';
+
+export const CharacterCounter: React.FC<{
+  text: string;
+  max: number;
+}> = ({ text, max }) => {
+  const diff = max - length(text);
+
+  if (diff < 0) {
+    return (
+      <span className='character-counter character-counter--over'>{diff}</span>
+    );
+  }
+
+  return <span className='character-counter'>{diff}</span>;
+};
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index b5e8dabb7b..2cd88aab41 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,11 +10,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
+import { missingAltTextModal } from 'mastodon/initial_state';
+
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
-import LanguageDropdown from '../containers/language_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
@@ -24,6 +25,7 @@ import { countableText } from '../util/counter';
 
 import { CharacterCounter } from './character_counter';
 import { EditIndicator } from './edit_indicator';
+import { LanguageDropdown } from './language_dropdown';
 import { NavigationBar } from './navigation_bar';
 import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
@@ -65,6 +67,7 @@ class ComposeForm extends ImmutablePureComponent {
     autoFocus: PropTypes.bool,
     withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
+    missingAltText: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
@@ -117,7 +120,7 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onSubmit();
+    this.props.onSubmit(missingAltTextModal && this.props.missingAltText);
 
     if (e) {
       e.preventDefault();
@@ -301,6 +304,7 @@ class ComposeForm extends ImmutablePureComponent {
               <div className='compose-form__submit'>
                 <Button
                   type='submit'
+                  compact
                   text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
                   disabled={!this.canSubmit()}
                 />
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
deleted file mode 100644
index b164a07cbd..0000000000
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ /dev/null
@@ -1,324 +0,0 @@
-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 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';
-
-const messages = defineMessages({
-  changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
-  search: { id: 'compose.language.search', defaultMessage: 'Search languages...' },
-  clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
-});
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-class LanguageDropdownMenu extends PureComponent {
-
-  static propTypes = {
-    value: PropTypes.string.isRequired,
-    frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string).isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-    languages: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
-    intl: PropTypes.object,
-  };
-
-  static defaultProps = {
-    languages: preloadedLanguages,
-  };
-
-  state = {
-    searchValue: '',
-  };
-
-  handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-
-    // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
-    // to wait for a frame before focusing
-    requestAnimationFrame(() => {
-      if (this.node) {
-        const element = this.node.querySelector('input[type="search"]');
-        if (element) element.focus();
-      }
-    });
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setListRef = c => {
-    this.listNode = c;
-  };
-
-  handleSearchChange = ({ target }) => {
-    this.setState({ searchValue: target.value });
-  };
-
-  search () {
-    const { languages, value, frequentlyUsedLanguages } = this.props;
-    const { searchValue } = this.state;
-
-    if (searchValue === '') {
-      return [...languages].sort((a, b) => {
-        // Push current selection to the top of the list
-
-        if (a[0] === value) {
-          return -1;
-        } else if (b[0] === value) {
-          return 1;
-        } else {
-          // Sort according to frequently used languages
-
-          const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
-          const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
-
-          return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity));
-        }
-      });
-    }
-
-    return fuzzysort.go(searchValue, languages, {
-      keys: ['0', '1', '2'],
-      limit: 5,
-      threshold: -10000,
-    }).map(result => result.obj);
-  }
-
-  handleClick = e => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    this.props.onClose();
-    this.props.onChange(value);
-  };
-
-  handleKeyDown = e => {
-    const { onClose } = this.props;
-    const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget);
-
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      onClose();
-      break;
-    case ' ':
-    case 'Enter':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
-      } else {
-        element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.listNode.firstChild;
-      break;
-    case 'End':
-      element = this.listNode.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  handleSearchKeyDown = e => {
-    const { onChange, onClose } = this.props;
-    const { searchValue } = this.state;
-
-    let element = null;
-
-    switch(e.key) {
-    case 'Tab':
-    case 'ArrowDown':
-      element = this.listNode.firstChild;
-
-      if (element) {
-        element.focus();
-        e.preventDefault();
-        e.stopPropagation();
-      }
-
-      break;
-    case 'Enter':
-      element = this.listNode.firstChild;
-
-      if (element) {
-        onChange(element.getAttribute('data-index'));
-        onClose();
-      }
-      break;
-    case 'Escape':
-      if (searchValue !== '') {
-        e.preventDefault();
-        this.handleClear();
-      }
-
-      break;
-    }
-  };
-
-  handleClear = () => {
-    this.setState({ searchValue: '' });
-  };
-
-  renderItem = lang => {
-    const { value } = this.props;
-
-    return (
-      <div key={lang[0]} role='option' tabIndex={0} data-index={lang[0]} className={classNames('language-dropdown__dropdown__results__item', { active: lang[0] === value })} aria-selected={lang[0] === value} onClick={this.handleClick} onKeyDown={this.handleKeyDown}>
-        <span className='language-dropdown__dropdown__results__item__native-name' lang={lang[0]}>{lang[2]}</span> <span className='language-dropdown__dropdown__results__item__common-name'>({lang[1]})</span>
-      </div>
-    );
-  };
-
-  render () {
-    const { intl } = this.props;
-    const { searchValue } = this.state;
-    const isSearching = searchValue !== '';
-    const results = this.search();
-
-    return (
-      <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}><Icon icon={!isSearching ? SearchIcon : CancelIcon} /></button>
-        </div>
-
-        <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
-          {results.map(this.renderItem)}
-        </div>
-      </div>
-    );
-  }
-
-}
-
-class LanguageDropdown extends PureComponent {
-
-  static propTypes = {
-    value: PropTypes.string,
-    frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
-    intl: PropTypes.object.isRequired,
-    onChange: PropTypes.func,
-  };
-
-  state = {
-    open: false,
-    placement: 'bottom',
-  };
-
-  handleToggle = () => {
-    if (this.state.open && this.activeElement) {
-      this.activeElement.focus({ preventScroll: true });
-    }
-
-    this.setState({ open: !this.state.open });
-  };
-
-  handleClose = () => {
-    if (this.state.open && this.activeElement) {
-      this.activeElement.focus({ preventScroll: true });
-    }
-
-    this.setState({ open: false });
-  };
-
-  handleChange = value => {
-    const { onChange } = this.props;
-    onChange(value);
-  };
-
-  setTargetRef = c => {
-    this.target = c;
-  };
-
-  findTarget = () => {
-    return this.target;
-  };
-
-  handleOverlayEnter = (state) => {
-    this.setState({ placement: state.placement });
-  };
-
-  render () {
-    const { value, intl, frequentlyUsedLanguages } = this.props;
-    const { open, placement } = this.state;
-    const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
-
-    return (
-      <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} 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}`} >
-                <LanguageDropdownMenu
-                  value={value}
-                  frequentlyUsedLanguages={frequentlyUsedLanguages}
-                  onClose={this.handleClose}
-                  onChange={this.handleChange}
-                  intl={intl}
-                />
-              </div>
-            </div>
-          )}
-        </Overlay>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(LanguageDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.tsx b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
new file mode 100644
index 0000000000..21c4359981
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
@@ -0,0 +1,427 @@
+import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { createSelector } from '@reduxjs/toolkit';
+import { Map as ImmutableMap } from 'immutable';
+
+import fuzzysort from 'fuzzysort';
+import Overlay from 'react-overlays/Overlay';
+import type { State, Placement } from 'react-overlays/usePopper';
+
+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 { changeComposeLanguage } from 'mastodon/actions/compose';
+import { Icon } from 'mastodon/components/icon';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+import type { RootState } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { debouncedGuess } from '../util/language_detection';
+
+const messages = defineMessages({
+  changeLanguage: {
+    id: 'compose.language.change',
+    defaultMessage: 'Change language',
+  },
+  search: {
+    id: 'compose.language.search',
+    defaultMessage: 'Search languages...',
+  },
+  clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
+});
+
+type Language = [string, string, string];
+
+const getFrequentlyUsedLanguages = createSelector(
+  [
+    (state: RootState) =>
+      (state.settings as ImmutableMap<string, unknown>).get(
+        'frequentlyUsedLanguages',
+        ImmutableMap(),
+      ) as ImmutableMap<string, number>,
+  ],
+  (languageCounters) =>
+    languageCounters
+      .keySeq()
+      .sort(
+        (a, b) =>
+          (languageCounters.get(a) ?? 0) - (languageCounters.get(b) ?? 0),
+      )
+      .reverse()
+      .toArray(),
+);
+
+const LanguageDropdownMenu: React.FC<{
+  value: string;
+  guess?: string;
+  onClose: () => void;
+  onChange: (arg0: string) => void;
+}> = ({ value, guess, onClose, onChange }) => {
+  const languages = preloadedLanguages as Language[];
+  const intl = useIntl();
+  const [searchValue, setSearchValue] = useState('');
+  const nodeRef = useRef<HTMLDivElement>(null);
+  const listNodeRef = useRef<HTMLDivElement>(null);
+
+  const frequentlyUsedLanguages = useAppSelector(getFrequentlyUsedLanguages);
+
+  const handleSearchChange = useCallback(
+    ({ target }: React.ChangeEvent<HTMLInputElement>) => {
+      setSearchValue(target.value);
+    },
+    [setSearchValue],
+  );
+
+  const handleClick = useCallback(
+    (e: React.MouseEvent | React.KeyboardEvent) => {
+      const value = e.currentTarget.getAttribute('data-index');
+
+      if (!value) {
+        return;
+      }
+
+      e.preventDefault();
+
+      onClose();
+      onChange(value);
+    },
+    [onClose, onChange],
+  );
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (!listNodeRef.current) {
+        return;
+      }
+
+      const index = Array.from(listNodeRef.current.childNodes).findIndex(
+        (node) => node === e.currentTarget,
+      );
+
+      let element = null;
+
+      switch (e.key) {
+        case 'Escape':
+          onClose();
+          break;
+        case ' ':
+        case 'Enter':
+          handleClick(e);
+          break;
+        case 'ArrowDown':
+          element =
+            listNodeRef.current.childNodes[index + 1] ??
+            listNodeRef.current.firstChild;
+          break;
+        case 'ArrowUp':
+          element =
+            listNodeRef.current.childNodes[index - 1] ??
+            listNodeRef.current.lastChild;
+          break;
+        case 'Tab':
+          if (e.shiftKey) {
+            element =
+              listNodeRef.current.childNodes[index - 1] ??
+              listNodeRef.current.lastChild;
+          } else {
+            element =
+              listNodeRef.current.childNodes[index + 1] ??
+              listNodeRef.current.firstChild;
+          }
+          break;
+        case 'Home':
+          element = listNodeRef.current.firstChild;
+          break;
+        case 'End':
+          element = listNodeRef.current.lastChild;
+          break;
+      }
+
+      if (element && element instanceof HTMLElement) {
+        element.focus();
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
+    [onClose, handleClick],
+  );
+
+  const handleSearchKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      let element = null;
+
+      if (!listNodeRef.current) {
+        return;
+      }
+
+      switch (e.key) {
+        case 'Tab':
+        case 'ArrowDown':
+          element = listNodeRef.current.firstChild;
+
+          if (element && element instanceof HTMLElement) {
+            element.focus();
+            e.preventDefault();
+            e.stopPropagation();
+          }
+
+          break;
+        case 'Enter':
+          element = listNodeRef.current.firstChild;
+
+          if (element && element instanceof HTMLElement) {
+            const value = element.getAttribute('data-index');
+
+            if (value) {
+              onChange(value);
+              onClose();
+            }
+          }
+          break;
+        case 'Escape':
+          if (searchValue !== '') {
+            e.preventDefault();
+            setSearchValue('');
+          }
+
+          break;
+      }
+    },
+    [setSearchValue, onChange, onClose, searchValue],
+  );
+
+  const handleClear = useCallback(() => {
+    setSearchValue('');
+  }, [setSearchValue]);
+
+  const isSearching = searchValue !== '';
+
+  useEffect(() => {
+    const handleDocumentClick = (e: MouseEvent) => {
+      if (
+        nodeRef.current &&
+        e.target instanceof HTMLElement &&
+        !nodeRef.current.contains(e.target)
+      ) {
+        onClose();
+        e.stopPropagation();
+      }
+    };
+
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+
+    // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
+    // to wait for a frame before focusing
+    requestAnimationFrame(() => {
+      if (nodeRef.current) {
+        const element = nodeRef.current.querySelector<HTMLInputElement>(
+          'input[type="search"]',
+        );
+        if (element) element.focus();
+      }
+    });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick);
+    };
+  }, [onClose]);
+
+  const results = useMemo(() => {
+    if (searchValue === '') {
+      return [...languages].sort((a, b) => {
+        if (guess && a[0] === guess) {
+          // Push guessed language higher than current selection
+          return -1;
+        } else if (guess && b[0] === guess) {
+          return 1;
+        } else if (a[0] === value) {
+          // Push current selection to the top of the list
+          return -1;
+        } else if (b[0] === value) {
+          return 1;
+        } else {
+          // Sort according to frequently used languages
+
+          const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
+          const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
+
+          return (
+            (indexOfA > -1 ? indexOfA : Infinity) -
+            (indexOfB > -1 ? indexOfB : Infinity)
+          );
+        }
+      });
+    }
+
+    return fuzzysort
+      .go(searchValue, languages, {
+        keys: ['0', '1', '2'],
+        limit: 5,
+        threshold: -10000,
+      })
+      .map((result) => result.obj);
+  }, [searchValue, languages, guess, frequentlyUsedLanguages, value]);
+
+  return (
+    <div ref={nodeRef}>
+      <div className='emoji-mart-search'>
+        <input
+          type='search'
+          value={searchValue}
+          onChange={handleSearchChange}
+          onKeyDown={handleSearchKeyDown}
+          placeholder={intl.formatMessage(messages.search)}
+        />
+        <button
+          type='button'
+          className='emoji-mart-search-icon'
+          disabled={!isSearching}
+          aria-label={intl.formatMessage(messages.clear)}
+          onClick={handleClear}
+        >
+          <Icon id='' icon={!isSearching ? SearchIcon : CancelIcon} />
+        </button>
+      </div>
+
+      <div
+        className='language-dropdown__dropdown__results emoji-mart-scroll'
+        role='listbox'
+        ref={listNodeRef}
+      >
+        {results.map((lang) => (
+          <div
+            key={lang[0]}
+            role='option'
+            tabIndex={0}
+            data-index={lang[0]}
+            className={classNames(
+              'language-dropdown__dropdown__results__item',
+              { active: lang[0] === value },
+            )}
+            aria-selected={lang[0] === value}
+            onClick={handleClick}
+            onKeyDown={handleKeyDown}
+          >
+            <span
+              className='language-dropdown__dropdown__results__item__native-name'
+              lang={lang[0]}
+            >
+              {lang[2]}
+            </span>{' '}
+            <span className='language-dropdown__dropdown__results__item__common-name'>
+              ({lang[1]})
+            </span>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export const LanguageDropdown: React.FC = () => {
+  const [open, setOpen] = useState(false);
+  const [placement, setPlacement] = useState<Placement | undefined>('bottom');
+  const [guess, setGuess] = useState('');
+  const activeElementRef = useRef<HTMLElement | null>(null);
+  const targetRef = useRef(null);
+
+  const intl = useIntl();
+
+  const dispatch = useAppDispatch();
+  const value = useAppSelector(
+    (state) => state.compose.get('language') as string,
+  );
+  const text = useAppSelector((state) => state.compose.get('text') as string);
+
+  const current =
+    (preloadedLanguages as Language[]).find((lang) => lang[0] === value) ?? [];
+
+  const handleMouseDown = useCallback(() => {
+    if (!open && document.activeElement instanceof HTMLElement) {
+      activeElementRef.current = document.activeElement;
+    }
+  }, [open]);
+
+  const handleToggle = useCallback(() => {
+    if (open && activeElementRef.current)
+      activeElementRef.current.focus({ preventScroll: true });
+
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleClose = useCallback(() => {
+    if (open && activeElementRef.current)
+      activeElementRef.current.focus({ preventScroll: true });
+
+    setOpen(false);
+  }, [open, setOpen]);
+
+  const handleChange = useCallback(
+    (value: string) => {
+      dispatch(changeComposeLanguage(value));
+    },
+    [dispatch],
+  );
+
+  const handleOverlayEnter = useCallback(
+    (state: Partial<State>) => {
+      setPlacement(state.placement);
+    },
+    [setPlacement],
+  );
+
+  useEffect(() => {
+    if (text.length > 20) {
+      debouncedGuess(text, setGuess);
+    } else {
+      setGuess('');
+    }
+  }, [text, setGuess]);
+
+  return (
+    <div ref={targetRef}>
+      <button
+        type='button'
+        title={intl.formatMessage(messages.changeLanguage)}
+        aria-expanded={open}
+        onClick={handleToggle}
+        onMouseDown={handleMouseDown}
+        className={classNames('dropdown-button', {
+          active: open,
+          warning: guess !== '' && guess !== value,
+        })}
+      >
+        <Icon id='' icon={TranslateIcon} />
+        <span className='dropdown-button__label'>{current[2] ?? value}</span>
+      </button>
+
+      <Overlay
+        show={open}
+        offset={[5, 5]}
+        placement={placement}
+        flip
+        target={targetRef}
+        popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}
+      >
+        {({ props, placement }) => (
+          <div {...props}>
+            <div
+              className={`dropdown-animation language-dropdown__dropdown ${placement}`}
+            >
+              <LanguageDropdownMenu
+                value={value}
+                guess={guess}
+                onClose={handleClose}
+                onChange={handleChange}
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload.tsx b/app/javascript/mastodon/features/compose/components/upload.tsx
index 3a24b28291..67c8ee5e9a 100644
--- a/app/javascript/mastodon/features/compose/components/upload.tsx
+++ b/app/javascript/mastodon/features/compose/components/upload.tsx
@@ -4,16 +4,16 @@ import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
+import type { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 
 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 { undoUploadCompose } from 'mastodon/actions/compose';
+import { openModal } from 'mastodon/actions/modal';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon } from 'mastodon/components/icon';
 import type { MediaAttachment } from 'mastodon/models/media_attachment';
@@ -27,16 +27,15 @@ export const Upload: React.FC<{
   wide?: boolean;
 }> = ({ id, dragging, overlay, tall, wide }) => {
   const dispatch = useAppDispatch();
-  const media = useAppSelector(
-    (state) =>
-      state.compose // eslint-disable-line @typescript-eslint/no-unsafe-call
-        .get('media_attachments') // eslint-disable-line @typescript-eslint/no-unsafe-member-access
-        .find((item: MediaAttachment) => item.get('id') === id) as  // eslint-disable-line @typescript-eslint/no-unsafe-member-access
-        | MediaAttachment
-        | undefined,
+  const media = useAppSelector((state) =>
+    (
+      (state.compose as ImmutableMap<string, unknown>).get(
+        'media_attachments',
+      ) as ImmutableList<MediaAttachment>
+    ).find((item) => item.get('id') === id),
   );
   const sensitive = useAppSelector(
-    (state) => state.compose.get('spoiler') as boolean, // eslint-disable-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('spoiler') as boolean,
   );
 
   const handleUndoClick = useCallback(() => {
@@ -44,7 +43,9 @@ export const Upload: React.FC<{
   }, [dispatch, id]);
 
   const handleFocalPointClick = useCallback(() => {
-    dispatch(initMediaEditModal(id));
+    dispatch(
+      openModal({ modalType: 'FOCAL_POINT', modalProps: { mediaId: id } }),
+    );
   }, [dispatch, id]);
 
   const { attributes, listeners, setNodeRef, transform, transition } =
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.tsx b/app/javascript/mastodon/features/compose/components/upload_form.tsx
index 1c01c2bd9c..81e361e35e 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.tsx
+++ b/app/javascript/mastodon/features/compose/components/upload_form.tsx
@@ -2,7 +2,11 @@ import { useState, useCallback, useMemo } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import type { List } from 'immutable';
+import type {
+  List,
+  Map as ImmutableMap,
+  List as ImmutableList,
+} from 'immutable';
 
 import type {
   DragStartEvent,
@@ -63,18 +67,20 @@ export const UploadForm: React.FC = () => {
   const intl = useIntl();
   const mediaIds = useAppSelector(
     (state) =>
-      state.compose // eslint-disable-line @typescript-eslint/no-unsafe-call
-        .get('media_attachments') // eslint-disable-line @typescript-eslint/no-unsafe-member-access
-        .map((item: MediaAttachment) => item.get('id')) as List<string>, // eslint-disable-line @typescript-eslint/no-unsafe-member-access
+      (
+        (state.compose as ImmutableMap<string, unknown>).get(
+          'media_attachments',
+        ) as ImmutableList<MediaAttachment>
+      ).map((item: MediaAttachment) => item.get('id')) as List<string>,
   );
   const active = useAppSelector(
-    (state) => state.compose.get('is_uploading') as boolean, // eslint-disable-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('is_uploading') as boolean,
   );
   const progress = useAppSelector(
-    (state) => state.compose.get('progress') as number, // eslint-disable-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('progress') as number,
   );
   const isProcessing = useAppSelector(
-    (state) => state.compose.get('is_processing') as boolean, // eslint-disable-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('is_processing') as boolean,
   );
   const [activeId, setActiveId] = useState<UniqueIdentifier | null>(null);
   const sensors = useSensors(
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 bda2edba60..15ccabf748 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -9,7 +9,9 @@ import {
   changeComposeSpoilerText,
   insertEmojiCompose,
   uploadCompose,
-} from '../../../actions/compose';
+} from 'mastodon/actions/compose';
+import { openModal } from 'mastodon/actions/modal';
+
 import ComposeForm from '../components/compose_form';
 
 const mapStateToProps = state => ({
@@ -26,6 +28,7 @@ const mapStateToProps = state => ({
   isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
   isUploading: state.getIn(['compose', 'is_uploading']),
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
+  missingAltText: state.getIn(['compose', 'media_attachments']).some(media => ['image', 'gifv'].includes(media.get('type')) && (media.get('description') ?? '').length === 0),
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
   maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
@@ -37,8 +40,15 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit () {
-    dispatch(submitCompose());
+  onSubmit (missingAltText) {
+    if (missingAltText) {
+      dispatch(openModal({
+        modalType: 'CONFIRM_MISSING_ALT_TEXT',
+        modalProps: {},
+      }));
+    } else {
+      dispatch(submitCompose());
+    }
   },
 
   onClearSuggestions () {
diff --git a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
deleted file mode 100644
index 64c90afa92..0000000000
--- a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { Map as ImmutableMap } from 'immutable';
-import { connect } from 'react-redux';
-
-
-import { changeComposeLanguage } from 'mastodon/actions/compose';
-
-import LanguageDropdown from '../components/language_dropdown';
-
-const getFrequentlyUsedLanguages = createSelector([
-  state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()),
-], languageCounters => (
-  languageCounters.keySeq()
-    .sort((a, b) => languageCounters.get(a) - languageCounters.get(b))
-    .reverse()
-    .toArray()
-));
-
-const mapStateToProps = state => ({
-  frequentlyUsedLanguages: getFrequentlyUsedLanguages(state),
-  value: state.getIn(['compose', 'language']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onChange (value) {
-    dispatch(changeComposeLanguage(value));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
diff --git a/app/javascript/mastodon/features/compose/util/language_detection.js b/app/javascript/mastodon/features/compose/util/language_detection.js
new file mode 100644
index 0000000000..ed22a2bd9c
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/util/language_detection.js
@@ -0,0 +1,76 @@
+import lande from 'lande';
+import { debounce } from 'lodash';
+
+import { urlRegex } from './url_regex';
+
+const ISO_639_MAP = {
+  afr: 'af', // Afrikaans
+  ara: 'ar', // Arabic
+  aze: 'az', // Azerbaijani
+  bel: 'be', // Belarusian
+  ben: 'bn', // Bengali
+  bul: 'bg', // Bulgarian
+  cat: 'ca', // Catalan
+  ces: 'cs', // Czech
+  ckb: 'ku', // Kurdish
+  cmn: 'zh', // Mandarin
+  dan: 'da', // Danish
+  deu: 'de', // German
+  ell: 'el', // Greek
+  eng: 'en', // English
+  est: 'et', // Estonian
+  eus: 'eu', // Basque
+  fin: 'fi', // Finnish
+  fra: 'fr', // French
+  hau: 'ha', // Hausa
+  heb: 'he', // Hebrew
+  hin: 'hi', // Hindi
+  hrv: 'hr', // Croatian
+  hun: 'hu', // Hungarian
+  hye: 'hy', // Armenian
+  ind: 'id', // Indonesian
+  isl: 'is', // Icelandic
+  ita: 'it', // Italian
+  jpn: 'ja', // Japanese
+  kat: 'ka', // Georgian
+  kaz: 'kk', // Kazakh
+  kor: 'ko', // Korean
+  lit: 'lt', // Lithuanian
+  mar: 'mr', // Marathi
+  mkd: 'mk', // Macedonian
+  nld: 'nl', // Dutch
+  nob: 'no', // Norwegian
+  pes: 'fa', // Persian
+  pol: 'pl', // Polish
+  por: 'pt', // Portuguese
+  ron: 'ro', // Romanian
+  run: 'rn', // Rundi
+  rus: 'ru', // Russian
+  slk: 'sk', // Slovak
+  spa: 'es', // Spanish
+  srp: 'sr', // Serbian
+  swe: 'sv', // Swedish
+  tgl: 'tl', // Tagalog
+  tur: 'tr', // Turkish
+  ukr: 'uk', // Ukrainian
+  vie: 'vi', // Vietnamese
+};
+
+const guessLanguage = (text) => {
+  text = text
+    .replace(urlRegex, '')
+    .replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '');
+
+  if (text.length > 20) {
+    const [lang, confidence] = lande(text)[0];
+  
+    if (confidence > 0.8)
+      return ISO_639_MAP[lang];
+  }
+
+  return '';
+};
+
+export const debouncedGuess = debounce((text, setGuess) => {
+  setGuess(guessLanguage(text));
+}, 500, { maxWait: 1500, leading: true, trailing: true });
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index 022c9baaf7..35804de82a 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(
-        '<picture><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">');
       expect(emojify('👨‍👩‍👧‍👧')).toEqual(
-        '<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>');
+        '<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">');
       expect(emojify('\u2757')).toEqual(
-        '<picture><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">');
     });
 
     it('does multiple unicode', () => {
       expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
-        '<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>');
+        '<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">');
       expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
-        '<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>');
+        '<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">');
       expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
-        '<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>');
+        '<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">');
       expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
-        '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');
+        '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');
     });
 
     it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
     });
 
     it('does multiple emoji properly (issue 5188)', () => {
-      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>');
+      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">');
     });
 
     it('does an emoji that has no shortcode', () => {
-      expect(emojify('👁‍🗨')).toEqual('<picture><img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg"></picture>');
+      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg">');
     });
 
     it('does an emoji whose filename is irregular', () => {
-      expect(emojify('↙️')).toEqual('<picture><img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg"></picture>');
+      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg">');
     });
 
     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><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
       expect(emojify('<span class="invisible">😄<span class="invisible">😕</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
       expect(emojify('<span class="invisible">😄<br>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<br>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<br>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
     });
 
     it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -81,17 +81,17 @@ describe('emoji', () => {
 
     it('does a simple emoji properly', () => {
       expect(emojify('♀♂'))
-        .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>');
+        .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">');
     });
 
     it('does an emoji containing ZWJ properly', () => {
       expect(emojify('💂‍♀️💂‍♂️'))
-        .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>');
+        .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">');
     });
 
     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" 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" 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" 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 e4aad302f6..d1843c33bd 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -97,30 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
       const { filename, shortCode } = unicodeMapping[unicode_emoji];
       const title = shortCode ? `:${shortCode}:` : '';
 
-      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);
-      }
+      const theme = (isSystemTheme || document.body?.classList.contains('theme-mastodon-light')) ? 'light' : 'dark';
+
+      const imageFilename = emojiFilename(filename, theme);
 
-      let img = document.createElement('img');
+      const img = document.createElement('img');
       img.setAttribute('draggable', 'false');
       img.setAttribute('class', 'emojione');
       img.setAttribute('alt', unicode_emoji);
       img.setAttribute('title', title);
+      img.setAttribute('src', `${assetHost}/emoji/${imageFilename}.svg`);
 
-      let theme = "light";
+      if (isSystemTheme && imageFilename !== emojiFilename(filename, 'dark')) {
+        replacement = document.createElement('picture');
 
-      if(!isSystemTheme && !document.body?.classList.contains('theme-mastodon-light'))
-        theme = "dark";
-
-      img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
-      replacement.appendChild(img);
+        const source = document.createElement('source');
+        source.setAttribute('media', '(prefers-color-scheme: dark)');
+        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, 'dark')}.svg`);
+        replacement.appendChild(source);
+        replacement.appendChild(img);
+      } else {
+        replacement = img;
+      }
     }
 
     // Add the processed-up-to-now string and the emoji replacement
@@ -135,7 +135,7 @@ const emojifyTextNode = (node, customEmojis) => {
 };
 
 const emojifyNode = (node, customEmojis) => {
-  for (const child of node.childNodes) {
+  for (const child of Array.from(node.childNodes)) {
     switch(child.nodeType) {
     case Node.TEXT_NODE:
       emojifyTextNode(child, customEmojis);
diff --git a/app/javascript/mastodon/features/explore/components/card.jsx b/app/javascript/mastodon/features/explore/components/card.jsx
index 1908648510..15470ec24c 100644
--- a/app/javascript/mastodon/features/explore/components/card.jsx
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@@ -55,11 +55,11 @@ export const Card = ({ id, source }) => {
       </div>
 
       <div className='explore__suggestions__card__body'>
-        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+        <Link to={`/@${account.get('acct')}`} data-hover-card-account={account.id}><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>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`} data-hover-card-account={account.id}><DisplayName account={account} /></Link>
             <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
             <FollowButton accountId={account.get('id')} />
           </div>
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
index 5fd47443d9..777ffb4e18 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
@@ -145,13 +145,13 @@ const Card: React.FC<{
       />
 
       <div className='inline-follow-suggestions__body__scrollable__card__avatar'>
-        <Link to={`/@${account?.acct}`}>
+        <Link to={`/@${account?.acct}`} data-hover-card-account={account?.id}>
           <Avatar account={account} size={72} />
         </Link>
       </div>
 
       <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
-        <Link to={`/@${account?.acct}`}>
+        <Link to={`/@${account?.acct}`} data-hover-card-account={account?.id}>
           <DisplayName account={account} />
         </Link>
         {firstVerifiedField ? (
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
index 78ba260fa9..4e0b5bf652 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -65,7 +65,9 @@ export const NotificationFollow: React.FC<{
     const account = notification.sampleAccountIds[0];
 
     if (account) {
-      actions = <FollowButton accountId={notification.sampleAccountIds[0]} />;
+      actions = (
+        <FollowButton compact accountId={notification.sampleAccountIds[0]} />
+      );
       additionalContent = <FollowerCount accountId={account} />;
     }
   }
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.tsx b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
index 72a28a01f9..1963189194 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
@@ -28,7 +28,6 @@ export const BoostModal: React.FC<{
   const intl = useIntl();
 
   const defaultPrivacy = useAppSelector(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     (state) => state.compose.get('default_privacy') as StatusVisibility,
   );
 
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
index ab567c697a..929b1a240f 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -56,14 +56,6 @@ export const ConfirmationModal: React.FC<
 
       <div className='safety-action-modal__bottom'>
         <div className='safety-action-modal__actions'>
-          {secondary && (
-            <>
-              <Button onClick={handleSecondary}>{secondary}</Button>
-
-              <div className='spacer' />
-            </>
-          )}
-
           <button onClick={handleCancel} className='link-button'>
             <FormattedMessage
               id='confirmation_modal.cancel'
@@ -71,6 +63,15 @@ export const ConfirmationModal: React.FC<
             />
           </button>
 
+          {secondary && (
+            <>
+              <div className='spacer' />
+              <button onClick={handleSecondary} className='link-button'>
+                {secondary}
+              </button>
+            </>
+          )}
+
           {/* eslint-disable-next-line jsx-a11y/no-autofocus -- we are in a modal and thus autofocusing is justified */}
           <Button onClick={handleClick} autoFocus>
             {confirm}
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
index 16478d0d11..4893fb096a 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
@@ -7,3 +7,4 @@ export { ConfirmUnfollowModal } from './unfollow';
 export { ConfirmClearNotificationsModal } from './clear_notifications';
 export { ConfirmLogOutModal } from './log_out';
 export { ConfirmFollowToListModal } from './follow_to_list';
+export { ConfirmMissingAltTextModal } from './missing_alt_text';
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/missing_alt_text.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/missing_alt_text.tsx
new file mode 100644
index 0000000000..057a1191d9
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/missing_alt_text.tsx
@@ -0,0 +1,81 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import type { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import { submitCompose } from 'mastodon/actions/compose';
+import { openModal } from 'mastodon/actions/modal';
+import type { MediaAttachment } from 'mastodon/models/media_attachment';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  title: {
+    id: 'confirmations.missing_alt_text.title',
+    defaultMessage: 'Add alt text?',
+  },
+  confirm: {
+    id: 'confirmations.missing_alt_text.confirm',
+    defaultMessage: 'Add alt text',
+  },
+  message: {
+    id: 'confirmations.missing_alt_text.message',
+    defaultMessage:
+      'Your post contains media without alt text. Adding descriptions helps make your content accessible to more people.',
+  },
+  secondary: {
+    id: 'confirmations.missing_alt_text.secondary',
+    defaultMessage: 'Post anyway',
+  },
+});
+
+export const ConfirmMissingAltTextModal: React.FC<
+  BaseConfirmationModalProps
+> = ({ onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const mediaId = useAppSelector(
+    (state) =>
+      (
+        (state.compose as ImmutableMap<string, unknown>).get(
+          'media_attachments',
+        ) as ImmutableList<MediaAttachment>
+      )
+        .find(
+          (media) =>
+            ['image', 'gifv'].includes(media.get('type') as string) &&
+            ((media.get('description') ?? '') as string).length === 0,
+        )
+        ?.get('id') as string,
+  );
+
+  const handleConfirm = useCallback(() => {
+    dispatch(
+      openModal({
+        modalType: 'FOCAL_POINT',
+        modalProps: {
+          mediaId,
+        },
+      }),
+    );
+  }, [dispatch, mediaId]);
+
+  const handleSecondary = useCallback(() => {
+    dispatch(submitCompose());
+  }, [dispatch]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.title)}
+      message={intl.formatMessage(messages.message)}
+      confirm={intl.formatMessage(messages.confirm)}
+      secondary={intl.formatMessage(messages.secondary)}
+      onConfirm={handleConfirm}
+      onSecondary={handleSecondary}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
deleted file mode 100644
index 7adfc208e7..0000000000
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ /dev/null
@@ -1,438 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-
-import classNames from 'classnames';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import Textarea from 'react-textarea-autosize';
-import { length } from 'stringz';
-// eslint-disable-next-line import/extensions
-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 '@/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 { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
-import { me } from 'mastodon/initial_state';
-import { assetHost } from 'mastodon/utils/config';
-
-import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose';
-import Video, { getPointerPosition } from '../../video';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-  apply: { id: 'upload_modal.apply', defaultMessage: 'Apply' },
-  applying: { id: 'upload_modal.applying', defaultMessage: 'Applying…' },
-  placeholder: { id: 'upload_modal.description_placeholder', defaultMessage: 'A quick brown fox jumps over the lazy dog' },
-  chooseImage: { id: 'upload_modal.choose_image', defaultMessage: 'Choose image' },
-  discardMessage: { id: 'confirmations.discard_edit_media.message', defaultMessage: 'You have unsaved changes to the media description or preview, discard them anyway?' },
-  discardConfirm: { id: 'confirmations.discard_edit_media.confirm', defaultMessage: 'Discard' },
-});
-
-const mapStateToProps = (state, { id }) => ({
-  media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
-  account: state.getIn(['accounts', me]),
-  isUploadingThumbnail: state.getIn(['compose', 'isUploadingThumbnail']),
-  description: state.getIn(['compose', 'media_modal', 'description']),
-  lang: state.getIn(['compose', 'language']),
-  focusX: state.getIn(['compose', 'media_modal', 'focusX']),
-  focusY: state.getIn(['compose', 'media_modal', 'focusY']),
-  dirty: state.getIn(['compose', 'media_modal', 'dirty']),
-  is_changing_upload: state.getIn(['compose', 'is_changing_upload']),
-});
-
-const mapDispatchToProps = (dispatch, { id }) => ({
-
-  onSave: (description, x, y) => {
-    dispatch(changeUploadCompose(id, { description, focus: `${x.toFixed(2)},${y.toFixed(2)}` }));
-  },
-
-  onChangeDescription: (description) => {
-    dispatch(onChangeMediaDescription(description));
-  },
-
-  onChangeFocus: (focusX, focusY) => {
-    dispatch(onChangeMediaFocus(focusX, focusY));
-  },
-
-  onSelectThumbnail: files => {
-    dispatch(uploadThumbnail(id, files[0]));
-  },
-
-});
-
-const removeExtraLineBreaks = str => str.replace(/\n\n/g, '******')
-  .replace(/\n/g, ' ')
-  .replace(/\*\*\*\*\*\*/g, '\n\n');
-
-class ImageLoader extends PureComponent {
-
-  static propTypes = {
-    src: PropTypes.string.isRequired,
-    width: PropTypes.number,
-    height: PropTypes.number,
-  };
-
-  state = {
-    loading: true,
-  };
-
-  componentDidMount() {
-    const image = new Image();
-    image.addEventListener('load', () => this.setState({ loading: false }));
-    image.src = this.props.src;
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    if (loading) {
-      return <canvas width={this.props.width} height={this.props.height} />;
-    } else {
-      return <img {...this.props} alt='' />;
-    }
-  }
-
-}
-
-class FocalPointModal extends ImmutablePureComponent {
-
-  static propTypes = {
-    media: ImmutablePropTypes.map.isRequired,
-    account: ImmutablePropTypes.record.isRequired,
-    isUploadingThumbnail: PropTypes.bool,
-    onSave: PropTypes.func.isRequired,
-    onChangeDescription: PropTypes.func.isRequired,
-    onChangeFocus: PropTypes.func.isRequired,
-    onSelectThumbnail: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  state = {
-    dragging: false,
-    dirty: false,
-    progress: 0,
-    loading: true,
-    ocrStatus: '',
-  };
-
-  componentWillUnmount () {
-    document.removeEventListener('mousemove', this.handleMouseMove);
-    document.removeEventListener('mouseup', this.handleMouseUp);
-  }
-
-  handleMouseDown = e => {
-    document.addEventListener('mousemove', this.handleMouseMove);
-    document.addEventListener('mouseup', this.handleMouseUp);
-
-    this.updatePosition(e);
-    this.setState({ dragging: true });
-  };
-
-  handleTouchStart = e => {
-    document.addEventListener('touchmove', this.handleMouseMove);
-    document.addEventListener('touchend', this.handleTouchEnd);
-
-    this.updatePosition(e);
-    this.setState({ dragging: true });
-  };
-
-  handleMouseMove = e => {
-    this.updatePosition(e);
-  };
-
-  handleMouseUp = () => {
-    document.removeEventListener('mousemove', this.handleMouseMove);
-    document.removeEventListener('mouseup', this.handleMouseUp);
-
-    this.setState({ dragging: false });
-  };
-
-  handleTouchEnd = () => {
-    document.removeEventListener('touchmove', this.handleMouseMove);
-    document.removeEventListener('touchend', this.handleTouchEnd);
-
-    this.setState({ dragging: false });
-  };
-
-  updatePosition = e => {
-    const { x, y } = getPointerPosition(this.node, e);
-    const focusX   = (x - .5) *  2;
-    const focusY   = (y - .5) * -2;
-
-    this.props.onChangeFocus(focusX, focusY);
-  };
-
-  handleChange = e => {
-    this.props.onChangeDescription(e.target.value);
-  };
-
-  handleKeyDown = (e) => {
-    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.props.onChangeDescription(e.target.value);
-      this.handleSubmit(e);
-    }
-  };
-
-  handleSubmit = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    this.props.onSave(this.props.description, this.props.focusX, this.props.focusY);
-  };
-
-  getCloseConfirmationMessage = () => {
-    const { intl, dirty } = this.props;
-
-    if (dirty) {
-      return {
-        message: intl.formatMessage(messages.discardMessage),
-        confirm: intl.formatMessage(messages.discardConfirm),
-      };
-    } else {
-      return null;
-    }
-  };
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  handleTextDetection = () => {
-    this._detectText();
-  };
-
-  _detectText = (refreshCache = false) => {
-    const { media } = this.props;
-
-    this.setState({ detecting: true });
-
-    fetchTesseract().then(({ createWorker }) => {
-      const worker = createWorker({
-        workerPath: tesseractWorkerPath,
-        corePath: tesseractCorePath,
-        langPath: `${assetHost}/ocr/lang-data`,
-        logger: ({ status, progress }) => {
-          if (status === 'recognizing text') {
-            this.setState({ ocrStatus: 'detecting', progress });
-          } else {
-            this.setState({ ocrStatus: 'preparing', progress });
-          }
-        },
-        cacheMethod: refreshCache ? 'refresh' : 'write',
-      });
-
-      let media_url = media.get('url');
-
-      if (window.URL && URL.createObjectURL) {
-        try {
-          media_url = URL.createObjectURL(media.get('file'));
-        } catch (error) {
-          console.error(error);
-        }
-      }
-
-      return (async () => {
-        await worker.load();
-        await worker.loadLanguage('eng');
-        await worker.initialize('eng');
-        const { data: { text } } = await worker.recognize(media_url);
-        this.setState({ detecting: false });
-        this.props.onChangeDescription(removeExtraLineBreaks(text));
-        await worker.terminate();
-      })().catch((e) => {
-        if (refreshCache) {
-          throw e;
-        } else {
-          this._detectText(true);
-        }
-      });
-    }).catch((e) => {
-      console.error(e);
-      this.setState({ detecting: false });
-    });
-  };
-
-  handleThumbnailChange = e => {
-    if (e.target.files.length > 0) {
-      this.props.onSelectThumbnail(e.target.files);
-    }
-  };
-
-  setFileInputRef = c => {
-    this.fileInput = c;
-  };
-
-  handleFileInputClick = () => {
-    this.fileInput.click();
-  };
-
-  render () {
-    const { media, intl, account, onClose, isUploadingThumbnail, description, lang, focusX, focusY, dirty, is_changing_upload } = this.props;
-    const { dragging, detecting, progress, ocrStatus } = this.state;
-    const x = (focusX /  2) + .5;
-    const y = (focusY / -2) + .5;
-
-    const width  = media.getIn(['meta', 'original', 'width']) || null;
-    const height = media.getIn(['meta', 'original', 'height']) || null;
-    const focals = ['image', 'gifv'].includes(media.get('type'));
-    const thumbnailable = ['audio', 'video'].includes(media.get('type'));
-
-    const previewRatio  = 16/9;
-    const previewWidth  = 200;
-    const previewHeight = previewWidth / previewRatio;
-
-    let descriptionLabel = null;
-
-    if (media.get('type') === 'audio') {
-      descriptionLabel = <FormattedMessage id='upload_form.audio_description' defaultMessage='Describe for people who are hard of hearing' />;
-    } else if (media.get('type') === 'video') {
-      descriptionLabel = <FormattedMessage id='upload_form.video_description' defaultMessage='Describe for people who are deaf, hard of hearing, blind or have low vision' />;
-    } else {
-      descriptionLabel = <FormattedMessage id='upload_form.description' defaultMessage='Describe for people who are blind or have low vision' />;
-    }
-
-    let ocrMessage = '';
-    if (ocrStatus === 'detecting') {
-      ocrMessage = <FormattedMessage id='upload_modal.analyzing_picture' defaultMessage='Analyzing picture…' />;
-    } else {
-      ocrMessage = <FormattedMessage id='upload_modal.preparing_ocr' defaultMessage='Preparing OCR…' />;
-    }
-
-    return (
-      <div className='modal-root__modal report-modal' style={{ maxWidth: 960 }}>
-        <div className='report-modal__target'>
-          <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' iconComponent={CloseIcon} onClick={onClose} size={20} />
-          <FormattedMessage id='upload_modal.edit_media' defaultMessage='Edit media' />
-        </div>
-
-        <div className='report-modal__container'>
-          <form className='report-modal__comment' onSubmit={this.handleSubmit} >
-            {focals && <p><FormattedMessage id='upload_modal.hint' defaultMessage='Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.' /></p>}
-
-            {thumbnailable && (
-              <>
-                <label className='setting-text-label' htmlFor='upload-modal__thumbnail'><FormattedMessage id='upload_form.thumbnail' defaultMessage='Change thumbnail' /></label>
-
-                <Button disabled={isUploadingThumbnail || !media.get('unattached')} text={intl.formatMessage(messages.chooseImage)} onClick={this.handleFileInputClick} />
-
-                <label>
-                  <span style={{ display: 'none' }}>{intl.formatMessage(messages.chooseImage)}</span>
-
-                  <input
-                    id='upload-modal__thumbnail'
-                    ref={this.setFileInputRef}
-                    type='file'
-                    accept='image/png,image/jpeg'
-                    onChange={this.handleThumbnailChange}
-                    style={{ display: 'none' }}
-                    disabled={isUploadingThumbnail || is_changing_upload}
-                  />
-                </label>
-
-                <hr className='setting-divider' />
-              </>
-            )}
-
-            <label className='setting-text-label' htmlFor='upload-modal__description'>
-              {descriptionLabel}
-            </label>
-
-            <div className='setting-text__wrapper'>
-              <Textarea
-                id='upload-modal__description'
-                className='setting-text light'
-                value={detecting ? '…' : description}
-                lang={lang}
-                onChange={this.handleChange}
-                onKeyDown={this.handleKeyDown}
-                disabled={detecting || is_changing_upload}
-                autoFocus
-              />
-
-              <div className='setting-text__modifiers'>
-                <UploadProgress progress={progress * 100} active={detecting} icon='file-text-o' message={ocrMessage} />
-              </div>
-            </div>
-
-            <div className='setting-text__toolbar'>
-              <button
-                type='button'
-                disabled={detecting || media.get('type') !== 'image' || is_changing_upload}
-                className='link-button'
-                onClick={this.handleTextDetection}
-              >
-                <FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' />
-              </button>
-              <CharacterCounter max={1500} text={detecting ? '' : description} />
-            </div>
-
-            <Button
-              type='submit'
-              disabled={!dirty || detecting || isUploadingThumbnail || length(description) > 1500 || is_changing_upload}
-              text={intl.formatMessage(is_changing_upload ? messages.applying : messages.apply)}
-            />
-          </form>
-
-          <div className='focal-point-modal__content'>
-            {focals && (
-              <div className={classNames('focal-point', { dragging })} ref={this.setRef} onMouseDown={this.handleMouseDown} onTouchStart={this.handleTouchStart}>
-                {media.get('type') === 'image' && <ImageLoader src={media.get('url')} width={width} height={height} alt='' />}
-                {media.get('type') === 'gifv' && <GIFV src={media.get('url')} key={media.get('url')} width={width} height={height} />}
-
-                <div className='focal-point__preview'>
-                  <strong><FormattedMessage id='upload_modal.preview_label' defaultMessage='Preview ({ratio})' values={{ ratio: '16:9' }} /></strong>
-                  <div style={{ width: previewWidth, height: previewHeight, backgroundImage: `url(${media.get('preview_url')})`, backgroundSize: 'cover', backgroundPosition: `${x * 100}% ${y * 100}%` }} />
-                </div>
-
-                <div className='focal-point__reticle' style={{ top: `${y * 100}%`, left: `${x * 100}%` }} />
-                <div className='focal-point__overlay' />
-              </div>
-            )}
-
-            {media.get('type') === 'video' && (
-              <Video
-                preview={media.get('preview_url')}
-                frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
-                blurhash={media.get('blurhash')}
-                src={media.get('url')}
-                detailed
-                inline
-                editable
-              />
-            )}
-
-            {media.get('type') === 'audio' && (
-              <Audio
-                src={media.get('url')}
-                duration={media.getIn(['meta', 'original', 'duration'], 0)}
-                height={150}
-                poster={media.get('preview_url') || account.get('avatar_static')}
-                backgroundColor={media.getIn(['meta', 'colors', 'background'])}
-                foregroundColor={media.getIn(['meta', 'colors', 'foreground'])}
-                accentColor={media.getIn(['meta', 'colors', 'accent'])}
-                editable
-              />
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps, null, {
-  forwardRef: true,
-})(injectIntl(FocalPointModal, { forwardRef: true }));
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 16d4973b94..cb1e499dbb 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -4,6 +4,7 @@ import { PureComponent } from 'react';
 import { Helmet } from 'react-helmet';
 
 import Base from 'mastodon/components/modal_root';
+import { AltTextModal } from 'mastodon/features/alt_text_modal';
 import {
   MuteModal,
   BlockModal,
@@ -36,8 +37,8 @@ import {
   ConfirmClearNotificationsModal,
   ConfirmLogOutModal,
   ConfirmFollowToListModal,
+  ConfirmMissingAltTextModal,
 } from './confirmation_modals';
-import FocalPointModal from './focal_point_modal';
 import ImageModal from './image_modal';
 import MediaModal from './media_modal';
 import { ModalPlaceholder } from './modal_placeholder';
@@ -58,13 +59,14 @@ export const MODAL_COMPONENTS = {
   'CONFIRM_CLEAR_NOTIFICATIONS': () => Promise.resolve({ default: ConfirmClearNotificationsModal }),
   'CONFIRM_LOG_OUT': () => Promise.resolve({ default: ConfirmLogOutModal }),
   'CONFIRM_FOLLOW_TO_LIST': () => Promise.resolve({ default: ConfirmFollowToListModal }),
+  'CONFIRM_MISSING_ALT_TEXT': () => Promise.resolve({ default: ConfirmMissingAltTextModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
   'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,
-  'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
+  'FOCAL_POINT': () => Promise.resolve({ default: AltTextModal }),
   'LIST_ADDER': ListAdder,
   'COMPARE_HISTORY': CompareHistoryModal,
   'FILTER': FilterModal,
@@ -139,8 +141,7 @@ export default class ModalRoot extends PureComponent {
           <>
             <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>
               {(SpecificComponent) => {
-                const ref = typeof SpecificComponent !== 'function' ? this.setModalRef : undefined;
-                return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={ref} />;
+                return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />;
               }}
             </BundleContainer>
 
diff --git a/app/javascript/mastodon/features/ui/containers/modal_container.js b/app/javascript/mastodon/features/ui/containers/modal_container.js
index 63c568f847..fe87380431 100644
--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -16,6 +16,7 @@ const mapDispatchToProps = dispatch => ({
     if (confirmationMessage) {
       dispatch(
         openModal({
+          previousModalProps: confirmationMessage.props,
           modalType: 'CONFIRM',
           modalProps: {
             message: confirmationMessage.message,
@@ -24,7 +25,8 @@ const mapDispatchToProps = dispatch => ({
               modalType: undefined,
               ignoreFocus: { ignoreFocus },
             })),
-          } }),
+          },
+        }),
       );
     } else {
       dispatch(closeModal({
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 40942eb7ec..093422ac87 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -14,6 +14,7 @@
  * @property {string} admin
  * @property {boolean=} boost_modal
  * @property {boolean=} delete_modal
+ * @property {boolean=} missing_alt_text_modal
  * @property {boolean=} disable_swiping
  * @property {boolean=} disable_hover_cards
  * @property {string=} disabled_account_id
@@ -88,6 +89,7 @@ export const activityApiEnabled = getMeta('activity_api_enabled');
 export const autoPlayGif = getMeta('auto_play_gif');
 export const boostModal = getMeta('boost_modal');
 export const deleteModal = getMeta('delete_modal');
+export const missingAltTextModal = getMeta('missing_alt_text_modal');
 export const disableSwiping = getMeta('disable_swiping');
 export const disableHoverCards = getMeta('disable_hover_cards');
 export const disabledAccountId = getMeta('disabled_account_id');
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 2273c1063f..13cc4d726f 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -277,9 +277,6 @@
   "tabs_bar.home": "Tuis",
   "tabs_bar.notifications": "Kennisgewings",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…",
   "video.fullscreen": "Volskerm",
   "video.mute": "Klank afskakel",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 6bb6915edf..73ff10d70e 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -497,21 +497,7 @@
   "upload_button.label": "Puyar imachens, un vido u un fichero d'audio",
   "upload_error.limit": "Limite de puyada de fichers excedido.",
   "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.edit": "Editar",
-  "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
-  "upload_modal.analyzing_picture": "Analisando imachen…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Triar imachen",
-  "upload_modal.description_placeholder": "Una rapida rabosa marrón blinca sobre lo can perezoso",
-  "upload_modal.detect_text": "Detectar texto d'a imachen",
-  "upload_modal.edit_media": "Editar multimedia",
-  "upload_modal.hint": "Faiga clic u arrociegue lo cerclo en a vista previa pa triar lo punto focal que siempre será a la vista en totas las miniaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Puyando...",
   "upload_progress.processing": "Procesando…",
   "video.close": "Zarrar video",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index b9f6782fb9..30d7105184 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -85,6 +85,7 @@
   "alert.unexpected.message": "لقد طرأ خطأ غير متوقّع.",
   "alert.unexpected.title": "المعذرة!",
   "alt_text_badge.title": "نص بديل",
+  "alt_text_modal.cancel": "إلغاء",
   "announcement.announcement": "إعلان",
   "annual_report.summary.archetype.booster": "The cool-hunter",
   "attachments_list.unprocessed": "(غير معالَج)",
@@ -120,13 +121,16 @@
   "column.blocks": "المُستَخدِمون المَحظورون",
   "column.bookmarks": "الفواصل المرجعية",
   "column.community": "الخيط الزمني المحلي",
+  "column.create_list": "إنشاء القائمة",
   "column.direct": "الإشارات الخاصة",
   "column.directory": "تَصَفُّحُ المَلفات الشخصية",
   "column.domain_blocks": "النطاقات المحظورة",
+  "column.edit_list": "تعديل القائمة",
   "column.favourites": "المفضلة",
   "column.firehose": "الموجزات الحية",
   "column.follow_requests": "طلبات المتابعة",
   "column.home": "الرئيسية",
+  "column.list_members": "إدارة أعضاء القائمة",
   "column.lists": "القوائم",
   "column.mutes": "المُستَخدِمون المَكتومون",
   "column.notifications": "الإشعارات",
@@ -139,6 +143,7 @@
   "column_header.pin": "تثبيت",
   "column_header.show_settings": "إظهار الإعدادات",
   "column_header.unpin": "إلغاء التَّثبيت",
+  "column_search.cancel": "إلغاء",
   "column_subheading.settings": "الإعدادات",
   "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
@@ -157,6 +162,7 @@
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
   "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": "الطراز",
@@ -195,6 +201,7 @@
   "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
   "content_warning.hide": "إخفاء المنشور",
   "content_warning.show": "إظهار على أي حال",
+  "content_warning.show_more": "إظهار المزيد",
   "conversation.delete": "احذف المحادثة",
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
@@ -325,6 +332,7 @@
   "footer.privacy_policy": "سياسة الخصوصية",
   "footer.source_code": "الاطلاع على الشفرة المصدرية",
   "footer.status": "الحالة",
+  "footer.terms_of_service": "شروط الخدمة",
   "generic.saved": "تم الحفظ",
   "getting_started.heading": "استعدّ للبدء",
   "hashtag.column_header.tag_mode.all": "و {additional}",
@@ -358,6 +366,7 @@
   "ignore_notifications_modal.ignore": "تجاهل الإشعارات",
   "ignore_notifications_modal.limited_accounts_title": "تجاهل الإشعارات من الحسابات التي هي تحت الإشراف؟",
   "ignore_notifications_modal.new_accounts_title": "تجاهل الإشعارات الصادرة من الحسابات الجديدة؟",
+  "interaction_modal.no_account_yet": "لا تملك حساباً بعد؟",
   "interaction_modal.on_another_server": "على خادم مختلف",
   "interaction_modal.on_this_server": "على هذا الخادم",
   "interaction_modal.title.favourite": "إضافة منشور {name} إلى المفضلة",
@@ -408,11 +417,21 @@
   "limited_account_hint.title": "تم إخفاء هذا الملف الشخصي من قبل مشرفي {domain}.",
   "link_preview.author": "مِن {name}",
   "link_preview.more_from_author": "المزيد من {name}",
+  "lists.add_member": "إضافة",
+  "lists.add_to_list": "إضافة إلى القائمة",
+  "lists.add_to_lists": "إضافة {name} إلى القوائم",
+  "lists.create": "إنشاء",
+  "lists.create_list": "إنشاء قائمة",
   "lists.delete": "احذف القائمة",
+  "lists.done": "تمّ",
   "lists.edit": "عدّل القائمة",
+  "lists.exclusive": "إخفاء الأعضاء في الصفحة الرئيسية",
+  "lists.remove_member": "إزالة",
   "lists.replies_policy.followed": "أي مستخدم متابَع",
   "lists.replies_policy.list": "أعضاء القائمة",
   "lists.replies_policy.none": "لا أحد",
+  "lists.save": "حفظ",
+  "lists.search": "بحث",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
   "loading_indicator.label": "جاري التحميل…",
   "media_gallery.hide": "إخفاء",
@@ -464,7 +483,7 @@
   "notification.label.private_reply": "رد خاص",
   "notification.label.reply": "ردّ",
   "notification.mention": "إشارة",
-  "notification.mentioned_you": "{name} mentioned you",
+  "notification.mentioned_you": "أشارَ إليك {name}",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
   "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
   "notification.moderation_warning.action_delete_statuses": "تم حذف بعض من منشوراتك.",
@@ -740,6 +759,7 @@
   "subscribed_languages.target": "تغيير اللغات المشتركة لـ {target}",
   "tabs_bar.home": "الرئيسية",
   "tabs_bar.notifications": "الإشعارات",
+  "terms_of_service.title": "شروط الخدمة",
   "time_remaining.days": "{number, plural, one {# يوم} other {# أيام}} متبقية",
   "time_remaining.hours": "{number, plural, one {# ساعة} other {# ساعات}} متبقية",
   "time_remaining.minutes": "{number, plural, one {# دقيقة} other {# دقائق}} متبقية",
@@ -755,21 +775,7 @@
   "upload_button.label": "إضافة وسائط",
   "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
-  "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
-  "upload_form.description": "وصف للمعاقين بصريا",
   "upload_form.edit": "تعديل",
-  "upload_form.thumbnail": "غيّر الصورة المصغرة",
-  "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
-  "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
-  "upload_modal.apply": "طبّق",
-  "upload_modal.applying": "جارٍ التطبيق…",
-  "upload_modal.choose_image": "اختر صورة",
-  "upload_modal.description_placeholder": "نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق",
-  "upload_modal.detect_text": "اكتشف النص مِن الصورة",
-  "upload_modal.edit_media": "تعديل الوسائط",
-  "upload_modal.hint": "اضغط أو اسحب الدائرة على خانة المعاينة لاختيار نقطة التركيز التي ستُعرَض دائمًا على كل المصغرات.",
-  "upload_modal.preparing_ocr": "جار إعداد OCR (تعرف ضوئي على الرموز)…",
-  "upload_modal.preview_label": "معاينة ({ratio})",
   "upload_progress.label": "يرفع...",
   "upload_progress.processing": "تتم المعالجة…",
   "username.taken": "اسم المستخدم هذا مأخوذ. الرجاء محاولة اسم اخر",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 6af0bd0582..818670742a 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -58,6 +58,7 @@
   "account.unendorse": "Dexar de destacar nel perfil",
   "account.unfollow": "Dexar de siguir",
   "account.unmute": "Activar los avisos de @{name}",
+  "account.unmute_notifications_short": "Dexar de silenciar notificaciones",
   "account.unmute_short": "Activar los avisos",
   "account_note.placeholder": "Calca equí p'amestar una nota",
   "admin.dashboard.retention.average": "Media",
@@ -70,9 +71,13 @@
   "announcement.announcement": "Anunciu",
   "annual_report.summary.followers.followers": "siguidores",
   "annual_report.summary.new_posts.new_posts": "artículos nuevos",
+  "annual_report.summary.thanks": "Gracies por ser parte de Mastodon!",
   "attachments_list.unprocessed": "(ensin procesar)",
   "block_modal.show_less": "Amosar menos",
   "block_modal.show_more": "Amosar más",
+  "block_modal.they_cant_mention": "Nun van poder mencionate o siguite.",
+  "block_modal.they_cant_see_posts": "Nun pueden ver les tos espublizaciones y tu nun podrás ver les suyes.",
+  "block_modal.you_wont_see_mentions": "Nun verás espublizaciones que-yos mencionen.",
   "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.",
@@ -116,6 +121,7 @@
   "compose.language.search": "Buscar llingües…",
   "compose.published.body": "Espublizóse l'artículu.",
   "compose.published.open": "Abrir",
+  "compose.saved.body": "Post guardáu.",
   "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.",
@@ -512,14 +518,7 @@
   "upload_area.title": "Arrastra y suelta pa xubir",
   "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 y/o ciegues",
   "upload_form.edit": "Editar",
-  "upload_modal.analyzing_picture": "Analizando la semeya…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.detect_text": "Detectar el testu de la semeya",
-  "upload_modal.edit_media": "Edición",
-  "upload_modal.hint": "Calca o arrastra'l círculu de la previsualización pa escoyer el puntu d'enfoque que siempre va tar a la vista en toles miniatures.",
   "upload_progress.label": "Xubiendo…",
   "upload_progress.processing": "Procesando…",
   "video.close": "Zarrar el videu",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index 5f1efe3d72..a60087890b 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Bilinməyən bir xəta baş verdi.",
   "alert.unexpected.title": "Ah!",
   "alt_text_badge.title": "Alternativ mətn",
+  "alt_text_modal.add_alt_text": "Alternativ mətn əlavə et",
+  "alt_text_modal.add_text_from_image": "Şəkildəki mətni əlavə et",
+  "alt_text_modal.cancel": "İmtina",
+  "alt_text_modal.change_thumbnail": "Miniatürü dəyişdir",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Eşitmə məhdudiyyətli insanlar üçün bunu izah et…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Görmə məhdudiyyətli insanlar üçün bunu təsvir et…",
+  "alt_text_modal.done": "Oldu",
   "announcement.announcement": "Elan",
   "annual_report.summary.archetype.booster": "Trend ovçusu",
   "annual_report.summary.archetype.lurker": "Lurker",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Çıxış et",
   "confirmations.logout.message": "Çıxmaq istədiyinizə əminsiniz?",
   "confirmations.logout.title": "Çıxış edilsin?",
+  "confirmations.missing_alt_text.confirm": "Alternativ mətn əlavə et",
+  "confirmations.missing_alt_text.message": "Paylaşımınız alternativ mətn ehtiva etmir. Təsvir əlavə etmək onun daha çox insan üçün əlçatan olmasına kömək edir.",
+  "confirmations.missing_alt_text.secondary": "Yenə də paylaş",
+  "confirmations.missing_alt_text.title": "Alternativ mətn əlavə edilsin?",
   "confirmations.mute.confirm": "Səssizləşdir",
   "confirmations.redraft.confirm": "Sil və qaralamaya köçür",
   "confirmations.redraft.message": "Bu paylaşımı silmək və qaralamaya köçürmək istədiyinizə əminsiniz? Bəyənmələr və gücləndirmələr itəcək və orijinal paylaşıma olan cavablar tənha qalacaq.",
@@ -241,6 +252,7 @@
   "dismissable_banner.dismiss": "Bağla",
   "dismissable_banner.explore_links": "Bu xəbərlər bu gün fediversedə ən çox paylaşılır. Daha fərqli insanlar tərəfindən dərc edilən daha yeni xəbərlər daha yuxarıda sıralanır.",
   "dismissable_banner.explore_statuses": "Fediversedən olan bu paylaşımlar bu gün maraq qazanır. Daha çox gücləndirici və bəyənmə olan daha yeni paylaşımlar daha yuxarıda sıralanır.",
+  "dismissable_banner.explore_tags": "Bu heşteqlər fediverse-də trend olublar. Daha çox fərqli insanlar tərəfindən istifadə olunan heşteqlər daha yuxarıda sıralanır.",
   "domain_block_modal.block_account_instead": "@{name} istifadəçisini blokla",
   "domain_block_modal.they_can_interact_with_old_posts": "Bu serverdən olan insanlar köhnə paylaşımlarınızla əlaqə qura bilər."
 }
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 8ad231eb5b..c68ff38a7c 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -140,16 +140,16 @@
   "column.blocks": "Заблакіраваныя карыстальнікі",
   "column.bookmarks": "Закладкі",
   "column.community": "Лакальная стужка",
-  "column.create_list": "Стварыць сьпіс",
+  "column.create_list": "Стварыць спіс",
   "column.direct": "Асабістыя згадванні",
   "column.directory": "Праглядзець профілі",
   "column.domain_blocks": "Заблакіраваныя дамены",
-  "column.edit_list": "Рэдагаваць сьпіс",
+  "column.edit_list": "Рэдагаваць спіс",
   "column.favourites": "Упадабанае",
   "column.firehose": "Стужкі",
   "column.follow_requests": "Запыты на падпіску",
   "column.home": "Галоўная",
-  "column.list_members": "Кіраваньне карыстальнікамі сьпіса",
+  "column.list_members": "Кіраванне ўдзельнікамі спісу",
   "column.lists": "Спісы",
   "column.mutes": "Ігнараваныя карыстальнікі",
   "column.notifications": "Апавяшчэнні",
@@ -460,11 +460,17 @@
   "link_preview.author": "Ад {name}",
   "link_preview.more_from_author": "Больш ад {name}",
   "link_preview.shares": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
+  "lists.add_member": "Дадаць",
+  "lists.create": "Стварыць",
+  "lists.create_list": "Стварыць спіс",
   "lists.delete": "Выдаліць спіс",
   "lists.edit": "Рэдагаваць спіс",
+  "lists.remove_member": "Выдаліць",
   "lists.replies_policy.followed": "Любы карыстальнік, на якога вы падпісаліся",
   "lists.replies_policy.list": "Удзельнікі гэтага спісу",
   "lists.replies_policy.none": "Нікога",
+  "lists.save": "Захаваць",
+  "lists.search": "Пошук",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
   "loading_indicator.label": "Загрузка…",
   "media_gallery.hide": "Схаваць",
@@ -823,21 +829,7 @@
   "upload_button.label": "Дадаць выяву, відэа- ці аўдыяфайл",
   "upload_error.limit": "Перавышана колькасць файлаў.",
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
-  "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
-  "upload_form.description": "Апісаць для людзей са слабым зрокам",
   "upload_form.edit": "Рэдагаваць",
-  "upload_form.thumbnail": "Змяніць мініяцюру",
-  "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
-  "upload_modal.analyzing_picture": "Аналіз выявы…",
-  "upload_modal.apply": "Ужыць",
-  "upload_modal.applying": "Ужываецца…",
-  "upload_modal.choose_image": "Выбраць выяву",
-  "upload_modal.description_placeholder": "У рудога вераб’я ў сховішчы пад фатэлем ляжаць нейкія гаючыя зёлкі",
-  "upload_modal.detect_text": "Распазнаць тэкст з выявы",
-  "upload_modal.edit_media": "Рэдагаваць медыя",
-  "upload_modal.hint": "Націсніце ці перацягніце кружок на перадпрагляд каб выбраць фокусную кропку, што заўсёды будзе бачна на мініяцюрах.",
-  "upload_modal.preparing_ocr": "Падрыхтоўка OCR…",
-  "upload_modal.preview_label": "Перадпрагляд ({ratio})",
   "upload_progress.label": "Запампоўванне...",
   "upload_progress.processing": "Апрацоўка…",
   "username.taken": "Гэта імя карыстальніка занята. Паспрабуйце іншае",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7b6d205045..e01f6dd448 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Възникна неочаквана грешка.",
   "alert.unexpected.title": "Опаа!",
   "alt_text_badge.title": "Алтернативен текст",
+  "alt_text_modal.add_alt_text": "Добавяне на алтернативен текст",
+  "alt_text_modal.add_text_from_image": "Добавяне на текст от образ",
+  "alt_text_modal.cancel": "Отказ",
+  "alt_text_modal.change_thumbnail": "Промяна на миниобраза",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Опишете това за хора със слухови увреждания…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Опишете това за хора със зрителни увреждания…",
+  "alt_text_modal.done": "Готово",
   "announcement.announcement": "Оповестяване",
   "annual_report.summary.archetype.booster": "Якият подсилвател",
   "annual_report.summary.archetype.lurker": "Дебнещото",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.logout.title": "Излизате ли от системата?",
+  "confirmations.missing_alt_text.confirm": "Добавяне на алтернативен текст",
+  "confirmations.missing_alt_text.message": "Вашата публикация съдържа мултимедия без алтернативен текст. Добавянето на описание помага да направите съдържанието си по-достъпно за повече хора.",
+  "confirmations.missing_alt_text.secondary": "Все пак да се публикува",
+  "confirmations.missing_alt_text.title": "Добавяте ли алтернативен текст?",
   "confirmations.mute.confirm": "Заглушаване",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Пренебрегвате ли известията от хора, които не са ви последвали?",
   "ignore_notifications_modal.not_following_title": "Пренебрегвате ли известията от хора, които не сте последвали?",
   "ignore_notifications_modal.private_mentions_title": "Пренебрегвате ли известия от непоискани лични споменавания?",
+  "info_button.label": "Помощ",
+  "info_button.what_is_alt_text": "<h1>Какво е алтернативен текст?</h1> <p>Алтернативният текст осигурява описания на изображение за хора със зрителни увреждания, връзки с ниска честотна лента или търсещите допълнителен контекст.</p> <p>Може да подобрите достъпността и разбираемостта за всеки, пишейки ясен, кратък и обективен алтернативен текст.</p> <ul> <li>Уловете важните елементи</li> <li>Обобщете текста в образите</li> <li>Употребявайте правилна структура на изречението</li> <li>Избягвайте излишна информация</li> <li>Съсредоточете се върху тенденциите и ключови констатации в сложни онагледявания (като диаграми и карти)</li> </ul>",
   "interaction_modal.action.favourite": "Трябва да направите любимо от акаунта си, за да продължите.",
   "interaction_modal.action.follow": "Трябва да последвате от акаунта си, за да продължите.",
   "interaction_modal.action.reblog": "Трябва да разпространите нечий блог от акаунта си, за да продължите.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Добавете файл с образ, видео или звук",
   "upload_error.limit": "Превишено ограничението за качване на файлове.",
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
-  "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
-  "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
   "upload_form.drag_and_drop.instructions": "Натиснете интервал или enter, за да подберете мултимедийно прикачване. Провлачвайки, ползвайте клавишите със стрелки, за да премествате мултимедията във всяка дадена посока. Натиснете пак интервал или enter, за да се стовари мултимедийното прикачване в новото си положение или натиснете Esc за отмяна.",
   "upload_form.drag_and_drop.on_drag_cancel": "Провлачването е отменено. Мултимедийното прикачване {item} е спуснато.",
   "upload_form.drag_and_drop.on_drag_end": "Мултимедийното прикачване {item} е спуснато.",
   "upload_form.drag_and_drop.on_drag_over": "Мултимедийното прикачване {item} е преместено.",
   "upload_form.drag_and_drop.on_drag_start": "Избрано мултимедийно прикачване {item}.",
   "upload_form.edit": "Редактиране",
-  "upload_form.thumbnail": "Промяна на миниобраза",
-  "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
-  "upload_modal.analyzing_picture": "Снимков анализ…",
-  "upload_modal.apply": "Прилагане",
-  "upload_modal.applying": "Прилагане…",
-  "upload_modal.choose_image": "Избор на образ",
-  "upload_modal.description_placeholder": "Ах, чудна българска земьо, полюшвай цъфтящи жита",
-  "upload_modal.detect_text": "Откриване на текст от картина",
-  "upload_modal.edit_media": "Промяна на мултимедия",
-  "upload_modal.hint": "Щракнете или плъзнете кръга на визуализацията, за да изберете фокусна точка, която винаги ще бъде видима на всички миниатюри.",
-  "upload_modal.preparing_ocr": "Подготовка за оптично разпознаване на знаци…",
-  "upload_modal.preview_label": "Нагледно ({ratio})",
   "upload_progress.label": "Качване...",
   "upload_progress.processing": "Обработка…",
   "username.taken": "Това потребителско име е взето. Опитайте друго",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 9f0c968dab..d90934b6c9 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -425,19 +425,7 @@
   "upload_button.label": "ছবি বা ভিডিও যুক্ত করতে (এসব ধরণের: JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "যা যুক্ত করতে চাচ্ছেন সেটি বেশি বড়, এখানকার সর্বাধিকের মেমোরির উপরে চলে গেছে।",
   "upload_error.poll": "নির্বাচনক্ষেত্রে কোনো ফাইল যুক্ত করা যাবেনা।",
-  "upload_form.audio_description": "শ্রবণশক্তি লোকদের জন্য বর্ণনা করুন",
-  "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
   "upload_form.edit": "সম্পাদন",
-  "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
-  "upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
-  "upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
-  "upload_modal.apply": "প্রয়োগ করুন",
-  "upload_modal.applying": "প্রয়োগ করা হচ্ছে…",
-  "upload_modal.choose_image": "ছবি নির্বাচন করুন",
-  "upload_modal.detect_text": "ছবি থেকে পাঠ্য সনাক্ত করুন",
-  "upload_modal.edit_media": "মিডিয়া সম্পাদনা করুন",
-  "upload_modal.hint": "একটি দৃশ্যমান পয়েন্ট নির্বাচন করুন ক্লিক অথবা টানার মাধ্যমে যেটি সবময় সব থাম্বনেলে দেখা যাবে।",
-  "upload_modal.preview_label": "পূর্বরূপ({ratio})",
   "upload_progress.label": "যুক্ত করতে পাঠানো হচ্ছে...",
   "video.close": "ভিডিওটি বন্ধ করতে",
   "video.download": "ফাইলটি ডাউনলোড করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 96600bd305..f551cd5654 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -595,21 +595,7 @@
   "upload_button.label": "Ouzhpennañ ur media",
   "upload_error.limit": "Bevenn evit pellgargañ restroù a zo distremenet.",
   "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.edit": "Kemmañ",
-  "upload_form.thumbnail": "Kemmañ ar velvenn",
-  "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ñ",
-  "upload_modal.applying": "Oc'h arloañ…",
-  "upload_modal.choose_image": "Dibab ur skeudenn",
-  "upload_modal.description_placeholder": "Ul louarn gell mibin a zo o lammat a-zioc'h ar c'hi lezirek",
-  "upload_modal.detect_text": "Dinoiñ testenn diouzh ar skeudenn",
-  "upload_modal.edit_media": "Embann ar media",
-  "upload_modal.hint": "Klikit pe tennit ar c'helc'h war ar rakwel evit dibab al lerc'h kengreizel a vo gwelet atav war an holl melvennoù.",
-  "upload_modal.preparing_ocr": "Oc'h aozañ OCR…",
-  "upload_modal.preview_label": "Rakwel ({ratio})",
   "upload_progress.label": "O pellgargañ...",
   "upload_progress.processing": "War ober…",
   "username.taken": "Tapet eo an anv implijer-mañ dija. Klaskit skrivañ unan all",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 35e91a8fc7..9fbed54565 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -61,8 +61,5 @@
   "status.open": "Expand this status",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 0e9a9051a8..27683a0933 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "S'ha produït un error inesperat.",
   "alert.unexpected.title": "Vaja!",
   "alt_text_badge.title": "Text alternatiu",
+  "alt_text_modal.add_alt_text": "Afegiu text alternatiu",
+  "alt_text_modal.add_text_from_image": "Afegiu text d'una imatge",
+  "alt_text_modal.cancel": "Cancel·la",
+  "alt_text_modal.change_thumbnail": "Canvia la miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descriviu això per a persones amb problemes d'audició…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Descriviu això per a persones amb problemes visuals…",
+  "alt_text_modal.done": "Fet",
   "announcement.announcement": "Anunci",
   "annual_report.summary.archetype.booster": "Sempre a la moda",
   "annual_report.summary.archetype.lurker": "Tot ho llegeix",
@@ -173,7 +180,7 @@
   "compose.published.open": "Obre",
   "compose.saved.body": "Tut desat.",
   "compose_form.direct_message_warning_learn_more": "Més informació",
-  "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació sensible mitjançant Mastodon.",
+  "compose_form.encryption_warning": "Els tuts a Mastodon no estan xifrats punt a punt. No compartiu informació confidencial mitjançant Mastodon.",
   "compose_form.hashtag_warning": "Aquest tut no apareixerà a les llistes d'etiquetes perquè no és públic. Només els tuts públics apareixen a les cerques per etiqueta.",
   "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",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.logout.title": "Tancar la sessió?",
+  "confirmations.missing_alt_text.confirm": "Afegiu un text alternatiu",
+  "confirmations.missing_alt_text.message": "La vostra publicació té contingut sense text alternatiu. Afegir-hi descripcions la farà accessible a més persones.",
+  "confirmations.missing_alt_text.secondary": "Publica-la igualment",
+  "confirmations.missing_alt_text.title": "Hi voleu afegir text alternatiu?",
   "confirmations.mute.confirm": "Silencia",
   "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.",
@@ -407,6 +418,7 @@
   "ignore_notifications_modal.not_followers_title": "Voleu ignorar les notificacions de qui no us segueix?",
   "ignore_notifications_modal.not_following_title": "Voleu ignorar les notificacions de qui no seguiu?",
   "ignore_notifications_modal.private_mentions_title": "Voleu ignorar les notificacions de mencions privades no sol·licitades?",
+  "info_button.label": "Ajuda",
   "interaction_modal.action.favourite": "Per a continuar heu d'afavorir des del vostre compte.",
   "interaction_modal.action.follow": "Per a continuar heu de seguir des del vostre compte.",
   "interaction_modal.action.reblog": "Per a continuar heu d'impulsar des del vostre compte.",
@@ -875,26 +887,12 @@
   "upload_button.label": "Afegeix imatges, un vídeo o un fitxer d'àudio",
   "upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
   "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.drag_and_drop.instructions": "Per a agafar un fitxer multimèdia adjunt, premeu l'espai o la tecla Enter. Mentre l'arrossegueu, utilitzeu les fletxes per a moure l'adjunt en qualsevol direcció. Premeu espai o Enter un altre cop per a deixar-lo anar a la seva nova posició, o premeu la tecla d'escapament per cancel·lar.",
   "upload_form.drag_and_drop.on_drag_cancel": "S'ha cancel·lat l'arrossegament. S'ha deixat anar l'adjunt multimèdia {item}.",
   "upload_form.drag_and_drop.on_drag_end": "S'ha deixat anar l'adjunt multimèdia {item}.",
   "upload_form.drag_and_drop.on_drag_over": "S'ha mogut l'adjunt multimèdia {item}.",
   "upload_form.drag_and_drop.on_drag_start": "S'ha agafat l'adjunt multimèdia {item}.",
   "upload_form.edit": "Edita",
-  "upload_form.thumbnail": "Canvia la miniatura",
-  "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",
-  "upload_modal.applying": "S'aplica…",
-  "upload_modal.choose_image": "Tria la imatge",
-  "upload_modal.description_placeholder": "Setze jutges d'un jutjat mengen fetge d'un penjat",
-  "upload_modal.detect_text": "Detecta el text de la imatge",
-  "upload_modal.edit_media": "Edita el Mèdia",
-  "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualització per a triar el punt focal que sempre serà visible en totes les miniatures.",
-  "upload_modal.preparing_ocr": "Es prepara l'OCR…",
-  "upload_modal.preview_label": "Previsualitza ({ratio})",
   "upload_progress.label": "Pujant...",
   "upload_progress.processing": "En procés…",
   "username.taken": "Aquest nom d'usuari ja està agafat. Prova un altre",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 039812f08c..4ae3d38690 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -554,21 +554,7 @@
   "upload_button.label": "وێنە، ڤیدیۆ یان پەیامی دەنگی زیاد بکە",
   "upload_error.limit": "سنووری بەرزکردنەوەت بەزاندووە.",
   "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
-  "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
-  "upload_form.description": "پەیامەکەت بۆ نابیناکان",
   "upload_form.edit": "دەستکاری",
-  "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
-  "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
-  "upload_modal.apply": "بیسەپێنە",
-  "upload_modal.applying": "داواکاری…",
-  "upload_modal.choose_image": "وێنە هەڵبژێرە",
-  "upload_modal.description_placeholder": "بە دڵ کەین با بە نەشئەی مەی غوباری میحنەتی دونیا",
-  "upload_modal.detect_text": "نووسینی ناو وێنەکە دەستنیشان بکە",
-  "upload_modal.edit_media": "دەستکاریکردنی میدیا",
-  "upload_modal.hint": "گەر وێنە چکۆلە یان بڕاوەبێت، خاڵی ناوەندی دیار دەکەوێت. خاڵی ناوەندی وێنە بە کرتە یان جێبەجیکردنی رێکبخەن.",
-  "upload_modal.preparing_ocr": "نووسینەکە دەستنیشان دەکرێت…",
-  "upload_modal.preview_label": "پێشبینین ({ratio})",
   "upload_progress.label": "بار دەکرێت...",
   "upload_progress.processing": "جێبەجێکردن...",
   "video.close": "داخستنی ڤیدیۆ",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 666ea797f0..a452e81d88 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -333,21 +333,7 @@
   "upload_button.label": "Aghjunghje un media",
   "upload_error.limit": "Limita di caricamentu di fugliali trapassata.",
   "upload_error.poll": "Ùn si pò micca caricà fugliali cù i scandagli.",
-  "upload_form.audio_description": "Discrizzione per i ciochi",
-  "upload_form.description": "Discrizzione per i malvistosi",
   "upload_form.edit": "Mudificà",
-  "upload_form.thumbnail": "Cambià vignetta",
-  "upload_form.video_description": "Discrizzione per i ciochi o cechi",
-  "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
-  "upload_modal.apply": "Affettà",
-  "upload_modal.applying": "Appiegazione…",
-  "upload_modal.choose_image": "Cambià ritrattu",
-  "upload_modal.description_placeholder": "Chì tempi brevi ziu, quandu solfeghji",
-  "upload_modal.detect_text": "Ditettà testu da u ritrattu",
-  "upload_modal.edit_media": "Cambià media",
-  "upload_modal.hint": "Cliccate o sguillate u chjerchju nant'à a vista per sceglie u puntu fucale chì sarà sempre in vista indè tutte e miniature.",
-  "upload_modal.preparing_ocr": "Priparazione di l'OCR…",
-  "upload_modal.preview_label": "Vista ({ratio})",
   "upload_progress.label": "Caricamentu...",
   "video.close": "Chjudà a video",
   "video.download": "Scaricà fugliale",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 81540c823c..62df3be279 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Objevila se neočekávaná chyba.",
   "alert.unexpected.title": "Jejda!",
   "alt_text_badge.title": "Popisek",
+  "alt_text_modal.add_alt_text": "Přidat alt text",
+  "alt_text_modal.add_text_from_image": "Přidat text z obrázku",
+  "alt_text_modal.cancel": "Zrušit",
+  "alt_text_modal.change_thumbnail": "Změnit miniaturu",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Popište to pro osoby se sluchovým postižením…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Popište to pro osoby se zrakovým postižením…",
+  "alt_text_modal.done": "Hotovo",
   "announcement.announcement": "Oznámení",
   "annual_report.summary.archetype.booster": "Lovec obsahu",
   "annual_report.summary.archetype.lurker": "Špión",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
   "confirmations.logout.title": "Odhlásit se?",
+  "confirmations.missing_alt_text.confirm": "Přidat alt text",
+  "confirmations.missing_alt_text.message": "Váš příspěvek obsahuje média bez alt textu. Přidání popisů pomáhá zpřístupnit váš obsah většímu počtu lidí.",
+  "confirmations.missing_alt_text.secondary": "Přesto odeslat",
+  "confirmations.missing_alt_text.title": "Přidat alt text?",
   "confirmations.mute.confirm": "Skrýt",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorovat oznámení od lidí, kteří vás nesledují?",
   "ignore_notifications_modal.not_following_title": "Ignorovat oznámení od lidí, které nesledujete?",
   "ignore_notifications_modal.private_mentions_title": "Ignorovat oznámení z nevyžádaných soukromých zmínek?",
+  "info_button.label": "Nápověda",
+  "info_button.what_is_alt_text": "<h1>Co je to alt text?</h1> <p>Alt text poskytuje popis obrázků pro lidi se zrakovými postižením, špatným připojením něbo těm, kteří potřebují více kontextu.</p> <p>Můžete zlepšit přístupnost a porozumění napsáním jasného, stručného a objektivního alt textu.</p> <ul> <li>Zachyťte důležité prvky</li> <li>Shrňte text v obrázku</li> <li>Použijte pravidelnou větnou skladbu</li> <li>Vyhněte se nadbytečným informacím</li> <li>U komplexních vizualizací (diagramy, mapy...) se zaměřte na trendy a klíčová zjištění</li> </ul>",
   "interaction_modal.action.favourite": "Chcete-li pokračovat, musíte oblíbit z vašeho účtu.",
   "interaction_modal.action.follow": "Chcete-li pokračovat, musíte sledovat z vašeho účtu.",
   "interaction_modal.action.reblog": "Chcete-li pokračovat, musíte dát boost z vašeho účtu.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Přidat obrázky, video nebo audio soubor",
   "upload_error.limit": "Byl překročen limit nahraných souborů.",
   "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.drag_and_drop.instructions": "Chcete-li zvednout přílohu, stiskněte mezerník nebo enter. Při přetažení použijte klávesnicové šipky k přesunutí mediální přílohy v libovolném směru. Stiskněte mezerník nebo enter pro vložení přílohy do nové pozice, nebo stiskněte Esc pro ukončení.",
   "upload_form.drag_and_drop.on_drag_cancel": "Přetažení bylo zrušeno. Příloha {item} byla vrácena.",
   "upload_form.drag_and_drop.on_drag_end": "Příloha {item} byla vrácena.",
   "upload_form.drag_and_drop.on_drag_over": "Příloha {item} byla přesunuta.",
   "upload_form.drag_and_drop.on_drag_start": "Zvednuta příloha {item}.",
   "upload_form.edit": "Upravit",
-  "upload_form.thumbnail": "Změnit miniaturu",
-  "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
-  "upload_modal.analyzing_picture": "Analyzuji obrázek…",
-  "upload_modal.apply": "Použít",
-  "upload_modal.applying": "Aplikuji…",
-  "upload_modal.choose_image": "Vybrat obrázek",
-  "upload_modal.description_placeholder": "Příliš žluťoučký kůň úpěl ďábelské ódy",
-  "upload_modal.detect_text": "Detekovat text z obrázku",
-  "upload_modal.edit_media": "Upravit média",
-  "upload_modal.hint": "Kliknutím na nebo přetáhnutím kruhu na náhledu vyberte oblast, která bude na všech náhledech vždy zobrazen.",
-  "upload_modal.preparing_ocr": "Příprava OCR…",
-  "upload_modal.preview_label": "Náhled ({ratio})",
   "upload_progress.label": "Nahrávání...",
   "upload_progress.processing": "Zpracovávání…",
   "username.taken": "Toto uživatelské jméno je obsazeno. Zkuste jiné",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d7585b4ac2..c9a22ff8f1 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
   "alert.unexpected.title": "Wps!",
   "alt_text_badge.title": "Testun Amgen",
+  "alt_text_modal.add_alt_text": "Ychwanegu testun amgen",
+  "alt_text_modal.add_text_from_image": "Ychwanegu testun o'r ddelwedd",
+  "alt_text_modal.cancel": "Diddymu",
+  "alt_text_modal.change_thumbnail": "Newid llun bach",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Disgrifiwch hyn ar gyfer pobl â nam ar eu clyw…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Disgrifiwch hyn ar gyfer pobl â nam ar eu golwg…",
+  "alt_text_modal.done": "Gorffen",
   "announcement.announcement": "Cyhoeddiad",
   "annual_report.summary.archetype.booster": "Y hyrwyddwr",
   "annual_report.summary.archetype.lurker": "Yr arsylwr",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.logout.title": "Allgofnodi?",
+  "confirmations.missing_alt_text.confirm": "Ychwanegu testun amgen",
+  "confirmations.missing_alt_text.message": "Mae eich postiad yn cynnwys cyfryngau heb destun amgen. Mae ychwanegu disgrifiadau yn helpu i wneud eich cynnwys yn hygyrch i fwy o bobl.",
+  "confirmations.missing_alt_text.secondary": "Postio beth bynnag",
+  "confirmations.missing_alt_text.title": "Ychwanegu testun amgen?",
   "confirmations.mute.confirm": "Tewi",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Anwybyddu hysbysiadau gan bobl nad ydynt yn eich dilyn?",
   "ignore_notifications_modal.not_following_title": "Anwybyddu hysbysiadau gan bobl nad ydych yn eu dilyn?",
   "ignore_notifications_modal.private_mentions_title": "Anwybyddu hysbysiadau o Grybwylliadau Preifat digymell?",
+  "info_button.label": "Cymorth",
+  "info_button.what_is_alt_text": "<h1>Beth yw testun amgen?</h1><p> Mae Testun Amgen yn darparu disgrifiadau delwedd ar gyfer pobl â nam ar eu golwg, cysylltiadau lled band isel, neu'r rhai sy'n ceisio cyd-destun ychwanegol.</p><p> Gallwch wella hygyrchedd a dealltwriaeth i bawb trwy ysgrifennu testun amgen clir, cryno a gwrthrychol.</p><ul><li> Dal elfennau pwysig</li><li> Crynhoi testun mewn delweddau</li><li> Defnyddiwch strwythur brawddegau rheolaidd</li><li> Osgoi gwybodaeth ddiangen</li><li> Canolbwyntio ar dueddiadau a chanfyddiadau allweddol mewn delweddau cymhleth (fel diagramau neu fapiau)</li></ul>",
   "interaction_modal.action.favourite": "I barhau, mae angen i chi hoffi o'ch cyfrif.",
   "interaction_modal.action.follow": "I barhau, mae angen i chi ddilyn o'ch cyfrif.",
   "interaction_modal.action.reblog": "I barhau, mae angen i chi ail-flogio o'ch cyfrif.",
@@ -874,26 +887,12 @@
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Wedi pasio'r uchafswm llwytho.",
   "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.drag_and_drop.instructions": "I godi atodiad cyfryngau, pwyswch y space neu enter. Wrth lusgo, defnyddiwch y bysellau saeth i symud yr atodiad cyfryngau i unrhyw gyfeiriad penodol. Pwyswch space neu enter eto i ollwng yr atodiad cyfryngau yn ei safle newydd, neu pwyswch escape i ddiddymu.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cafodd llusgo ei ddiddymu. Cafodd atodiad cyfryngau {item} ei ollwng.",
   "upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
   "upload_form.drag_and_drop.on_drag_over": "Symudwyd atodiad cyfryngau {item}.",
   "upload_form.drag_and_drop.on_drag_start": "Atodiad cyfryngau godwyd {item}.",
   "upload_form.edit": "Golygu",
-  "upload_form.thumbnail": "Newid llun bach",
-  "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",
-  "upload_modal.applying": "Yn gosod…",
-  "upload_modal.choose_image": "Dewis delwedd",
-  "upload_modal.description_placeholder": "Mae ei phen bach llawn jocs, 'run peth a fy nghot golff, rhai dyddiau",
-  "upload_modal.detect_text": "Canfod testun o'r llun",
-  "upload_modal.edit_media": "Golygu cyfryngau",
-  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob llun bach.",
-  "upload_modal.preparing_ocr": "Yn paratoi OCR…",
-  "upload_modal.preview_label": "Rhagolwg ({ratio})",
   "upload_progress.label": "Yn llwytho...",
   "upload_progress.processing": "Wrthi'n prosesu…",
   "username.taken": "Mae'r enw defnyddiwr hwnnw'n cael ei ddefnyddio eisoes. Rhowch gynnig ar un arall",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ad81e5f35a..3fa92cd53e 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -29,7 +29,7 @@
   "account.endorse": "Fremhæv på profil",
   "account.featured_tags.last_status_at": "Seneste indlæg {date}",
   "account.featured_tags.last_status_never": "Ingen indlæg",
-  "account.featured_tags.title": "{name}s fremhævede hashtags",
+  "account.featured_tags.title": "{name}s fremhævede etiketter",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbage",
   "account.followers": "Følgere",
@@ -39,7 +39,7 @@
   "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.go_to_profile": "Gå til profil",
-  "account.hide_reblogs": "Skjul boosts fra @{name}",
+  "account.hide_reblogs": "Skjul fremhævelser fra @{name}",
   "account.in_memoriam": "Til minde om.",
   "account.joined_short": "Oprettet",
   "account.languages": "Skift abonnementssprog",
@@ -49,9 +49,9 @@
   "account.mention": "Nævn @{name}",
   "account.moved_to": "{name} har angivet, at vedkommendes nye konto nu er:",
   "account.mute": "Skjul @{name}",
-  "account.mute_notifications_short": "Slå lyden fra for notifikationer",
-  "account.mute_short": "Skjul (mute)",
-  "account.muted": "Skjult (muted)",
+  "account.mute_notifications_short": "Sluk for notifikationer",
+  "account.mute_short": "Skjul",
+  "account.muted": "Skjult",
   "account.mutual": "Fælles",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.open_original_page": "Åbn oprindelig side",
@@ -63,14 +63,14 @@
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
-  "account.unblock": "Afblokér @{name}",
-  "account.unblock_domain": "Afblokér domænet {domain}",
-  "account.unblock_short": "Afblokér",
+  "account.unblock": "Fjern blokering af @{name}",
+  "account.unblock_domain": "Fjern blokering af domænet {domain}",
+  "account.unblock_short": "Fjern blokering",
   "account.unendorse": "Fjern visning på din profil",
   "account.unfollow": "Følg ikke længere",
-  "account.unmute": "Vis @{name} igen (unmute)",
-  "account.unmute_notifications_short": "Slå lyden fra for notifikationer",
-  "account.unmute_short": "Vis igen (unmute)",
+  "account.unmute": "Vis @{name} igen",
+  "account.unmute_notifications_short": "Tænd for notifikationer",
+  "account.unmute_short": "Vis igen",
   "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate per dag efter tilmelding",
   "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate per måned efter tilmelding",
@@ -86,39 +86,46 @@
   "alert.unexpected.message": "En uventet fejl opstod.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Alt text",
+  "alt_text_modal.add_alt_text": "Tilføj alternativ tekst",
+  "alt_text_modal.add_text_from_image": "Tilføj tekst fra billede",
+  "alt_text_modal.cancel": "Afbryd",
+  "alt_text_modal.change_thumbnail": "Skift miniature",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beskriv dette for personer med nedsat hørelse…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beskriv dette for personer med nedsat syn…",
+  "alt_text_modal.done": "Færdig",
   "announcement.announcement": "Bekendtgørelse",
-  "annual_report.summary.archetype.booster": "Cool-hunter",
-  "annual_report.summary.archetype.lurker": "Lurker",
-  "annual_report.summary.archetype.oracle": "Oracle",
-  "annual_report.summary.archetype.pollster": "Pollster",
-  "annual_report.summary.archetype.replier": "Social butterfly",
+  "annual_report.summary.archetype.booster": "Fremhæveren",
+  "annual_report.summary.archetype.lurker": "Lureren",
+  "annual_report.summary.archetype.oracle": "Oraklet",
+  "annual_report.summary.archetype.pollster": "Afstemningsmageren",
+  "annual_report.summary.archetype.replier": "Den social sommerfugl",
   "annual_report.summary.followers.followers": "følgere",
   "annual_report.summary.followers.total": "{count} i alt",
-  "annual_report.summary.here_it_is": "Her er {year} i sammendrag:",
+  "annual_report.summary.here_it_is": "Her er dit {year} i sammendrag:",
   "annual_report.summary.highlighted_post.by_favourites": "mest favoritmarkerede indlæg",
-  "annual_report.summary.highlighted_post.by_reblogs": "mest boostede indlæg",
-  "annual_report.summary.highlighted_post.by_replies": "indlæg med flest svar",
+  "annual_report.summary.highlighted_post.by_reblogs": "mest fremhævede indlæg",
+  "annual_report.summary.highlighted_post.by_replies": "mest besvarede indlæg",
   "annual_report.summary.highlighted_post.possessive": "{name}s",
   "annual_report.summary.most_used_app.most_used_app": "mest benyttede app",
-  "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest benyttede hashtag",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest benyttede etiket",
   "annual_report.summary.most_used_hashtag.none": "Intet",
   "annual_report.summary.new_posts.new_posts": "nye indlæg",
   "annual_report.summary.percentile.text": "<topLabel>Det betyder, at man er i top</topLabel><percentage></percentage><bottomLabel>af {domain}-brugere.</bottomLabel>",
-  "annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til Bernie.",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til Pernille Skipper.",
   "annual_report.summary.thanks": "Tak for at være en del af Mastodon!",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
   "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_less": "Vis færre",
   "block_modal.show_more": "Vis flere",
-  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke omtale 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.",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som omtaler vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
-  "boost_modal.reblog": "Boost indlæg?",
-  "boost_modal.undo_reblog": "Fjern boost af indlæg?",
+  "boost_modal.reblog": "Fremhæv indlæg?",
+  "boost_modal.undo_reblog": "Fjern fremhævning af indlæg?",
   "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.",
   "bundle_column_error.error.title": "Åh nej!",
@@ -146,12 +153,12 @@
   "column.domain_blocks": "Blokerede domæner",
   "column.edit_list": "Redigér liste",
   "column.favourites": "Favoritter",
-  "column.firehose": "Live feeds",
+  "column.firehose": "Realtids-strømme",
   "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.list_members": "Håndtér listemedlemmer",
   "column.lists": "Lister",
-  "column.mutes": "Skjulte brugere (mutede)",
+  "column.mutes": "Skjulte brugere",
   "column.notifications": "Notifikationer",
   "column.pins": "Fastgjorte indlæg",
   "column.public": "Fælles tidslinje",
@@ -161,7 +168,7 @@
   "column_header.moveRight_settings": "Flyt kolonne til højre",
   "column_header.pin": "Fastgør",
   "column_header.show_settings": "Vis indstillinger",
-  "column_header.unpin": "Løsgør",
+  "column_header.unpin": "Frigør",
   "column_search.cancel": "Afbryd",
   "column_subheading.settings": "Indstillinger",
   "community.column_settings.local_only": "Kun lokalt",
@@ -174,7 +181,7 @@
   "compose.saved.body": "Indlæg gemt.",
   "compose_form.direct_message_warning_learn_more": "Få mere at vide",
   "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende-krypteret. Del derfor ikke sensitiv information via Mastodon.",
-  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, da kun offentlige indlæg er søgbare via hashtags.",
+  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under nogen etiket, da kun offentlige indlæg er søgbare via etiketter.",
   "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å?",
@@ -189,9 +196,9 @@
   "compose_form.publish_form": "Publicér",
   "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": "Indholdsadvarsel (valgfri)",
+  "compose_form.spoiler.marked": "Fjern emnefelt",
+  "compose_form.spoiler.unmarked": "Tilføj emnefelt",
+  "compose_form.spoiler_placeholder": "Emnefelt (valgfrit)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.confirm": "Blokér",
   "confirmations.delete.confirm": "Slet",
@@ -211,9 +218,13 @@
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.logout.title": "Log ud?",
-  "confirmations.mute.confirm": "Skjul (mute)",
+  "confirmations.missing_alt_text.confirm": "Tilføj alt-tekst",
+  "confirmations.missing_alt_text.message": "Indlægget indeholder medier uden alt-tekst. Tilføjelse af beskrivelser bidrager til at gøre indholdet tilgængeligt for flere brugere.",
+  "confirmations.missing_alt_text.secondary": "Læg op alligevel",
+  "confirmations.missing_alt_text.title": "Tilføj alt-tekst?",
+  "confirmations.mute.confirm": "Skjul",
   "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.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og fremhævelser går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
   "confirmations.redraft.title": "Slet og omformulér indlæg?",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Hvis du svarer nu, vil det overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
@@ -231,7 +242,7 @@
   "copy_icon_button.copied": "Kopieret til udklipsholderen",
   "copypaste.copied": "Kopieret",
   "copypaste.copy_to_clipboard": "Kopiér til udklipsholder",
-  "directory.federated": "Fra kendt fedivers",
+  "directory.federated": "Fra kendt fødivers",
   "directory.local": "Kun fra {domain}",
   "directory.new_arrivals": "Nye ankomster",
   "directory.recently_active": "Aktive for nyligt",
@@ -239,10 +250,10 @@
   "disabled_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret.",
   "dismissable_banner.community_timeline": "Disse er de seneste offentlige indlæg fra personer med konti hostet af {domain}.",
   "dismissable_banner.dismiss": "Afvis",
-  "dismissable_banner.explore_links": "Disse nyhedshistorier deles mest på fediverset i dag. Nyere nyhedshistorier lagt op af flere forskellige personer rangeres højere.",
-  "dismissable_banner.explore_statuses": "Disse indlæg på tværs af fediverset opnår momentum i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
-  "dismissable_banner.explore_tags": "Disse hashtags opnår momentum på fediverset i dag. Hashtags brugt af flere forskellige personer rangeres højere.",
-  "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra personer på fediverset, som folk på {domain} følger.",
+  "dismissable_banner.explore_links": "Disse nyhedshistorier deles mest på fødiverset i dag. Nyere nyhedshistorier lagt op af flere forskellige personer rangeres højere.",
+  "dismissable_banner.explore_statuses": "Disse indlæg på tværs af fødiverset opnår momentum i dag. Nyere indlæg med flere fremhævninger og favoritmærker rangeres højere.",
+  "dismissable_banner.explore_tags": "Disse etiketter opnår momentum på fødiverset i dag. Etiketter brugt af flere forskellige personer rangeres højere.",
+  "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra personer på fødiverset, 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.",
@@ -252,20 +263,20 @@
   "domain_block_modal.you_will_lose_num_followers": "Man vil miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} person, man følger} other {{followingCountDisplay} personer, man følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Alle følgere og personer som følges på denne server mistes.",
   "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.activitypub_lets_connect": "Det muliggører at forbinde 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\", som Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Vedkommendes handle:",
+  "domain_pill.their_handle": "Deres greb:",
   "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
   "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "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.whats_in_a_handle": "Hvad er der i et greb?",
+  "domain_pill.who_they_are": "Da et greb 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 greb 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 greb:",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.",
   "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.instructions": "Indlejr dette indlæg på din hjemmeside ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
   "emoji_button.clear": "Ryd",
@@ -284,36 +295,36 @@
   "emoji_button.travel": "Rejser og steder",
   "empty_column.account_hides_collections": "Brugeren har valgt ikke at gøre denne information tilgængelig",
   "empty_column.account_suspended": "Konto suspenderet",
-  "empty_column.account_timeline": "Ingen indlæg hér!",
+  "empty_column.account_timeline": "Ingen indlæg her!",
   "empty_column.account_unavailable": "Profil utilgængelig",
   "empty_column.blocks": "Ingen brugere blokeret endnu.",
   "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.direct": "Der er endnu ingen private omtaler. Når en sendes eller modtages, dukker den op hér.",
+  "empty_column.direct": "Der er endnu ingen private omtaler. Når en sendes eller modtages, dukker den op her.",
   "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
   "empty_column.explore_statuses": "Ingen nye tendenser lige nu. Tjek igen senere!",
-  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
-  "empty_column.favourites": "Ingen har endnu gjort dette indlæg til favorit. Når nogen gør dét, vil det dukke op hér.",
-  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op hér.",
-  "empty_column.followed_tags": "Ingen hashtags følges endnu. Når det sker, vil de fremgå hér.",
-  "empty_column.hashtag": "Der er intet med dette hashtag endnu.",
-  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at udfylde den. {suggestions}",
-  "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.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.",
+  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du føjer et opslag til favoritter, vil det dukke op her.",
+  "empty_column.favourites": "Ingen har endnu føjet dette indlæg til favoritter. Når nogen gør det, vil det dukke op her.",
+  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op her.",
+  "empty_column.followed_tags": "Ingen etiketter følges endnu. Når det sker, vil de fremgå her.",
+  "empty_column.hashtag": "Der er intet med denne etiket endnu.",
+  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at fylde den op.",
+  "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå her.",
+  "empty_column.mutes": "Du har endnu ikke skjult nogle brugere.",
+  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jævnfør dine indstillinger.",
+  "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå her.",
+  "empty_column.public": "Der er intet her! 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 netlæser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
   "error.unexpected_crash.explanation_addons": "Denne side kunne ikke vises korrekt. Fejlen skyldes sandsynligvis en browsertilføjelse eller automatiske oversættelsesværktøjer.",
-  "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
-  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
+  "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden netlæser eller app.",
+  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden netlæser eller app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiér stacktrace til udklipsholderen",
   "errors.unexpected_crash.report_issue": "Anmeld problem",
   "explore.suggested_follows": "Personer",
   "explore.title": "Udforsk",
   "explore.trending_links": "Nyheder",
   "explore.trending_statuses": "Indlæg",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_tags": "Etiketter",
   "filter_modal.added.context_mismatch_explanation": "Denne filterkategori omfatter ikke konteksten, hvorunder dette indlæg er tilgået. Redigér filteret, hvis indlægget også ønskes filtreret i denne kontekst.",
   "filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
   "filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",
@@ -321,7 +332,7 @@
   "filter_modal.added.review_and_configure": "Gå til {settings_link} for at gennemse og yderligere opsætte denne filterkategori.",
   "filter_modal.added.review_and_configure_title": "Filterindstillinger",
   "filter_modal.added.settings_link": "indstillingsside",
-  "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til flg. filterkategori: {title}.",
+  "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til følgende filterkategori: {title}.",
   "filter_modal.added.title": "Filter tilføjet!",
   "filter_modal.select_filter.context_mismatch": "gælder ikke for denne kontekst",
   "filter_modal.select_filter.expired": "udløbet",
@@ -354,7 +365,7 @@
   "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",
+  "followed_tags": "Etiketter, som følges",
   "footer.about": "Om",
   "footer.directory": "Profiloversigt",
   "footer.get_app": "Hent appen",
@@ -370,7 +381,7 @@
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
   "hashtag.column_settings.select.no_options_message": "Ingen forslag fundet",
-  "hashtag.column_settings.select.placeholder": "Angiv hashtags…",
+  "hashtag.column_settings.select.placeholder": "Angiv etiketter…",
   "hashtag.column_settings.tag_mode.all": "Alle disse",
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
@@ -378,8 +389,8 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltager} other {{counter} deltagere}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
-  "hashtag.follow": "Følg hashtag",
-  "hashtag.unfollow": "Stop med at følge hashtag",
+  "hashtag.follow": "Følg etiket",
+  "hashtag.unfollow": "Stop med at følge etiket",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
   "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",
   "hints.profiles.follows_may_be_missing": "Fulgte kan mangle for denne profil.",
@@ -389,15 +400,15 @@
   "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
   "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
   "hints.threads.see_more": "Se flere svar på {domain}",
-  "home.column_settings.show_reblogs": "Vis boosts",
+  "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
-  "home.pending_critical_update.body": "Opdater din Mastodon-server snarest muligt!",
+  "home.pending_critical_update.body": "Opdatér venligst din Mastodon-server snarest muligt!",
   "home.pending_critical_update.link": "Se opdateringer",
   "home.pending_critical_update.title": "Kritisk sikkerhedsopdatering tilgængelig!",
   "home.show_announcements": "Vis bekendtgørelser",
   "ignore_notifications_modal.disclaimer": "Mastodon kan ikke informere brugere om, at man har ignoreret deres notifikationer. Ignorerer man notifikationer, forhindrer det ikke selve beskedafsendelsen.",
-  "ignore_notifications_modal.filter_instead": "Filtrer i stedet",
+  "ignore_notifications_modal.filter_instead": "Filtrér i stedet",
   "ignore_notifications_modal.filter_to_act_users": "Man vil stadig kunne acceptere, afvise eller anmelde brugere",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering medvirker til at undgå potentiel forvirring",
   "ignore_notifications_modal.filter_to_review_separately": "Man kan gennemgå filtrerede notifikationer separat",
@@ -407,43 +418,45 @@
   "ignore_notifications_modal.not_followers_title": "Ignorér notifikationer fra folk, som ikke er følgere?",
   "ignore_notifications_modal.not_following_title": "Ignorér notifikationer fra folk, man ikke følger?",
   "ignore_notifications_modal.private_mentions_title": "Ignorér notifikationer fra uopfordrede Private omtaler?",
-  "interaction_modal.action.favourite": "For at fortsætte, skal man vælge Gør til favorit fra sin konto.",
+  "info_button.label": "Hjælp",
+  "info_button.what_is_alt_text": "<h1>Hvad er alt-tekst?</h1> <p>Alt-tekst leverer billedbeskrivelser til folk med synsnedsættelser, lav båndbredde-forbindelser eller med ønske om ekstra kontekst.</p> <p>Tilgængelighed og forståelse kan forbedres for alle ved at skrive klar, kortfattet og objektiv alt-tekst.</p> <ul> <li>Fang vigtige elementer</li> <li>Opsummér tekst i billeder</li> <li>Brug almindelig sætningsstruktur</li> <li>Undgå overflødig information</li> <li>Fokusér på tendenser og centrale resultater i kompleks grafik (såsom diagrammer eller kort)</li> </ul>",
+  "interaction_modal.action.favourite": "For at fortsætte, skal du føje til favoritter fra din konto.",
   "interaction_modal.action.follow": "For at fortsætte, skal man vælge Følg fra sin konto.",
-  "interaction_modal.action.reblog": "For at fortsætte, skal man vælge Genblog fra sin konto.",
+  "interaction_modal.action.reblog": "For at fortsætte, skal man vælge Fremhæv fra sin konto.",
   "interaction_modal.action.reply": "For at fortsætte, skal man besvar fra sin konto.",
   "interaction_modal.action.vote": "For at fortsætte, skal man stemme fra sin konto.",
   "interaction_modal.go": "Gå",
   "interaction_modal.no_account_yet": "Har endnu ingen konto?",
   "interaction_modal.on_another_server": "På en anden server",
   "interaction_modal.on_this_server": "På denne server",
-  "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit",
+  "interaction_modal.title.favourite": "Føj {name}s indlæg til favoritter",
   "interaction_modal.title.follow": "Følg {name}",
-  "interaction_modal.title.reblog": "Boost {name}s indlæg",
+  "interaction_modal.title.reblog": "Fremhæv {name}s indlæg",
   "interaction_modal.title.reply": "Besvar {name}s indlæg",
-  "interaction_modal.title.vote": "Deltag i {name}s afstemning",
+  "interaction_modal.title.vote": "Stem i {name}s afstemning",
   "interaction_modal.username_prompt": "F.eks. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
   "keyboard_shortcuts.back": "Gå tilbage",
   "keyboard_shortcuts.blocked": "Åbn listen over blokerede brugere",
-  "keyboard_shortcuts.boost": "Boost indlæg",
+  "keyboard_shortcuts.boost": "Fremhæv indlæg",
   "keyboard_shortcuts.column": "Fokusér kolonne",
   "keyboard_shortcuts.compose": "Fokusér skriveområdet",
   "keyboard_shortcuts.description": "Beskrivelse",
   "keyboard_shortcuts.direct": "for at åbne kolonnen private omtaler",
   "keyboard_shortcuts.down": "Flyt nedad på listen",
   "keyboard_shortcuts.enter": "Åbn indlæg",
-  "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
+  "keyboard_shortcuts.favourite": "Føj indlæg til favoritter",
   "keyboard_shortcuts.favourites": "Åbn favoritlisten",
-  "keyboard_shortcuts.federated": "Åbn fælles tidslinje",
+  "keyboard_shortcuts.federated": "Åbn fødereret tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
   "keyboard_shortcuts.home": "Åbn hjemmetidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
   "keyboard_shortcuts.legend": "Vis dette symbol",
   "keyboard_shortcuts.local": "Åbn lokal tidslinje",
   "keyboard_shortcuts.mention": "Omtal forfatter",
-  "keyboard_shortcuts.muted": "Åbn listen over skjulte (mutede) brugere",
+  "keyboard_shortcuts.muted": "Åbn listen over skjulte brugere",
   "keyboard_shortcuts.my_profile": "Åbn din profil",
   "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen",
   "keyboard_shortcuts.open_media": "Åbn medier",
@@ -452,9 +465,9 @@
   "keyboard_shortcuts.reply": "Besvar indlægget",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
   "keyboard_shortcuts.search": "Fokusér søgebjælke",
-  "keyboard_shortcuts.spoilers": "Vis/skjul CW-felt",
+  "keyboard_shortcuts.spoilers": "Vis/skjul emnefelt",
   "keyboard_shortcuts.start": "Åbn \"komme i gang\"-kolonne",
-  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag CW",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag emnefelt",
   "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul medier",
   "keyboard_shortcuts.toot": "Påbegynd nyt indlæg",
   "keyboard_shortcuts.translate": "for at oversætte et indlæg",
@@ -502,16 +515,16 @@
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
   "mute_modal.hide_options": "Skjul valgmuligheder",
-  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.indefinite": "Indtil jeg vælger at se dem igen",
   "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.",
+  "mute_modal.they_can_mention_and_follow": "De kan omtale og følge dig, men du vil ikke se dem.",
+  "mute_modal.they_wont_know": "De vil ikke vide, at de er blevet skjult.",
+  "mute_modal.title": "Skjul bruger?",
+  "mute_modal.you_wont_see_mentions": "Du vil ikke se indlæg som omtaler dem.",
+  "mute_modal.you_wont_see_posts": "De kan stadig se dine indlæg, men du vil ikke se deres.",
   "navigation_bar.about": "Om",
-  "navigation_bar.administration": "Håndtering",
-  "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
+  "navigation_bar.administration": "Administration",
+  "navigation_bar.advanced_interface": "Åbn i avanceret netgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
@@ -521,14 +534,14 @@
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Skjulte ord (mutede)",
+  "navigation_bar.filters": "Skjulte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
-  "navigation_bar.followed_tags": "Hashtag, som følges",
+  "navigation_bar.followed_tags": "Etiketter, som følges",
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Log af",
   "navigation_bar.moderation": "Moderering",
-  "navigation_bar.mutes": "Skjulte brugere (mutede)",
+  "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.personal": "Personlig",
   "navigation_bar.pins": "Fastgjorte indlæg",
@@ -546,10 +559,10 @@
   "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} tilmeldte sig",
   "notification.annual_report.message": "{year} #Wrapstodon venter! Afslør årets højdepunkter og mindeværdige øjeblikke på Mastodon!",
   "notification.annual_report.view": "Vis #Wrapstodon",
-  "notification.favourite": "{name} favoritmarkerede dit indlæg",
-  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> gjorde dit indlæg til favorit",
-  "notification.favourite_pm": "{name} favoritmarkerede din private omtale",
-  "notification.favourite_pm.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> favoritmarkerede dit indlæg",
+  "notification.favourite": "{name} føjede dit indlæg til favoritter",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> føjede dit indlæg til favoritter",
+  "notification.favourite_pm": "{name} føjede din private omtale til favoritter",
+  "notification.favourite_pm.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> føjede dit indlæg til favoritter",
   "notification.follow": "{name} begyndte at følge dig",
   "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# andre} other {# andre}}</a> begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
@@ -557,36 +570,36 @@
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
-  "notification.label.reply": "Besvar",
+  "notification.label.reply": "Svar",
   "notification.mention": "Omtale",
-  "notification.mentioned_you": "{name} nævnte dig",
+  "notification.mentioned_you": "{name} omtalte dig",
   "notification.moderation-warning.learn_more": "Læs mere",
-  "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+  "notification.moderation_warning": "Du har fået 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_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som følsomme.",
+  "notification.moderation_warning.action_none": "Din konto har fået en moderationsadvarsel.",
+  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som følsomme.",
   "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 har stemt, er slut",
-  "notification.reblog": "{name} boostede dit indlæg",
-  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> boostede dit indlæg",
+  "notification.reblog": "{name} fremhævede dit indlæg",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> fremhævede 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.account_suspension": "En admin fra {from} har suspenderet {target}, så du kan ikke længere få opdateringer fra eller interagere med dem.",
+  "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} følgere og {followingCount, plural, one {# konto, der} other {# konti, som}} som du følger.",
   "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.relationships_severance_event.user_domain_block": "Du har blokeret {target}. {followersCount} af dine følgere samt {followingCount, plural, one {# konto, der} other {# konti, som}} du følger, er hermed fjernet.",
+  "notification.status": "{name} har netop slået noget op",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
   "notification_requests.accept_multiple": "{count, plural, one {Acceptér # anmodning…} other {Acceptér # anmodninger…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptér anmodning} other {Acceptér anmodninger}}",
-  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive accepteret. Fortsæt, sikker?",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive accepteret. Er du sikker på, at du vil fortsætte?",
   "notification_requests.confirm_accept_multiple.title": "Acceptér notifikationsanmodninger?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Afvis anmodning} other {Afvis anmodninger}}",
-  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive afvist, hvorfor man ikke nemt vil kunne tilgå {count, plural, one {den} other {dem}} igen. Fortsæt, sikker?",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive afvist, hvorfor man ikke nemt vil kunne tilgå {count, plural, one {den} other {dem}} igen. Er du sikker på, at du vil fortsætte?",
   "notification_requests.confirm_dismiss_multiple.title": "Afvis notifikationsanmodninger?",
   "notification_requests.dismiss": "Afvis",
   "notification_requests.dismiss_multiple": "{count, plural, one {Afvis # anmodning…} other {Afvis # anmodninger…}}",
@@ -602,7 +615,7 @@
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.clear_title": "Ryd notifikationer?",
-  "notifications.column_settings.admin.report": "Nye anmeldelser:",
+  "notifications.column_settings.admin.report": "Nye rapporteringer:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
@@ -614,7 +627,7 @@
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
   "notifications.column_settings.push": "Push-notifikationer",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.reblog": "Fremhævelser:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
   "notifications.column_settings.status": "Nye indlæg:",
@@ -622,7 +635,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Fremhæv ulæste notifikationer",
   "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
-  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.boosts": "Fremhævelser",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "Følger",
   "notifications.filter.mentions": "Omtaler",
@@ -631,8 +644,8 @@
   "notifications.grant_permission": "Tildel tilladelse.",
   "notifications.group": "{count} notifikationer",
   "notifications.mark_as_read": "Markér alle notifikationer som læst",
-  "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_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist netlæser-tilladelsesanmodning",
+  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da netlæser-tilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
   "notifications.policy.accept": "Acceptér",
   "notifications.policy.accept_hint": "Vis notifikationer",
@@ -661,14 +674,14 @@
   "onboarding.follows.title": "Følg folk for at komme i gang",
   "onboarding.profile.discoverable": "Gør min profil synlig",
   "onboarding.profile.discoverable_hint": "Når man vælger at være synlig på Mastodon, kan ens indlæg fremgå i søgeresultater og tendenser, og profilen kan blive foreslået til andre med tilsvarende interesse.",
-  "onboarding.profile.display_name": "Visningsnavn",
-  "onboarding.profile.display_name_hint": "Fulde navn eller dit sjove navn…",
+  "onboarding.profile.display_name": "Vist navn",
+  "onboarding.profile.display_name_hint": "Dit fulde navn eller dit sjove navn…",
   "onboarding.profile.note": "Bio",
-  "onboarding.profile.note_hint": "Man kan @omtale andre personer eller #hashtags…",
+  "onboarding.profile.note_hint": "Man kan @omtale andre personer eller #etiketter…",
   "onboarding.profile.save_and_continue": "Gem og fortsæt",
   "onboarding.profile.title": "Profilopsætning",
   "onboarding.profile.upload_avatar": "Upload profilbillede",
-  "onboarding.profile.upload_header": "Upload profiloverskrift",
+  "onboarding.profile.upload_header": "Upload profilbanner",
   "password_confirmation.exceeds_maxlength": "Adgangskodebekræftelse overstiger maks. adgangskodelængde",
   "password_confirmation.mismatching": "Adgangskodebekræftelse matcher ikke",
   "picture_in_picture.restore": "Indsæt det igen",
@@ -683,21 +696,21 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.long": "Alle omtalt 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.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.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i realtids-strømme/etiketter, 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.unlisted.short": "Stille offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
   "refresh": "Genindlæs",
   "regeneration_indicator.please_stand_by": "Vent venligst.",
-  "regeneration_indicator.preparing_your_home_feed": "Forbereder hjemme-feed'et…",
+  "regeneration_indicator.preparing_your_home_feed": "Forbereder hjemmestrømmen…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",
@@ -726,12 +739,12 @@
   "report.comment.title": "Er der andet, som vi bør vide?",
   "report.forward": "Videresend til {target}",
   "report.forward_hint": "Kontoen er fra en anden server. Send også en anonymiseret kopi af anmeldelsen dertil?",
-  "report.mute": "Skjul (mute)",
-  "report.mute_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende kan stadig se dine indlæg og følge dig. Vedkommende vil ikke kunne se, at de er blevet skjult.",
+  "report.mute": "Skjul",
+  "report.mute_explanation": "Du vil ikke se deres indlæg. De kan stadig se dine indlæg og følge dig. De vil ikke kunne se, at de er blevet skjult.",
   "report.next": "Næste",
   "report.placeholder": "Yderligere kommentarer",
   "report.reasons.dislike": "Jeg bryder mig ikke om det",
-  "report.reasons.dislike_description": "Det er ikke noget, man ønsker at se",
+  "report.reasons.dislike_description": "Det er ikke noget, du ønsker at se",
   "report.reasons.legal": "Det er ulovligt",
   "report.reasons.legal_description": "Du mener, at det er i strid med lovgivningen i dit eller serverens land",
   "report.reasons.other": "Det er noget andet",
@@ -751,7 +764,7 @@
   "report.thanks.title": "Ønsker ikke at se dette?",
   "report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
   "report.unfollow": "Følg ikke længere @{name}",
-  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i dit hjemmefeed, kan du stoppe med at følge dem.",
+  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i din hjemmestrøm, kan du stoppe med at følge dem.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
   "report_notification.categories.legal": "Juridisk",
   "report_notification.categories.legal_sentence": "ikke-tilladt indhold",
@@ -766,7 +779,7 @@
   "search.placeholder": "Søg",
   "search.quick_action.account_search": "Profiler matchende {x}",
   "search.quick_action.go_to_account": "Gå til profilen {x}",
-  "search.quick_action.go_to_hashtag": "Gå til hashtagget {x}",
+  "search.quick_action.go_to_hashtag": "Gå til etiketten {x}",
   "search.quick_action.open_url": "Åbn URL i Mastodon",
   "search.quick_action.status_search": "Indlæg matchende {x}",
   "search.search_or_paste": "Søg efter eller angiv URL",
@@ -780,19 +793,19 @@
   "search_popout.user": "bruger",
   "search_results.accounts": "Profiler",
   "search_results.all": "Alle",
-  "search_results.hashtags": "Hashtags",
+  "search_results.hashtags": "Etiketter",
   "search_results.no_results": "Ingen resultater.",
-  "search_results.no_search_yet": "Prøv at søge efter indlæg, profiler eller hashtags.",
+  "search_results.no_search_yet": "Prøv at søge efter indlæg, profiler eller etiketter.",
   "search_results.see_all": "Vis alle",
   "search_results.statuses": "Indlæg",
   "search_results.title": "Søg efter \"{q}\"",
   "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
-  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fediverset.",
+  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fødiverset.",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
-  "sign_in_banner.follow_anyone": "Følg alle på tværs af fediverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
+  "sign_in_banner.follow_anyone": "Følg alle på tværs af fødiverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
   "sign_in_banner.mastodon_is": "Mastodon er den bedste måde at holde sig ajour med, hvad der sker.",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
@@ -801,7 +814,7 @@
   "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
   "status.block": "Blokér @{name}",
   "status.bookmark": "Bogmærk",
-  "status.cancel_reblog_private": "Fjern boost",
+  "status.cancel_reblog_private": "Fjern fremhævelse",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
   "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
@@ -824,24 +837,24 @@
   "status.media_hidden": "Medie skjult",
   "status.mention": "Nævn @{name}",
   "status.more": "Mere",
-  "status.mute": "Skjul @{name} (mute)",
-  "status.mute_conversation": "Skjul samtale (mute)",
+  "status.mute": "Skjul @{name}",
+  "status.mute_conversation": "Skjul samtale",
   "status.open": "Udvid dette indlæg",
   "status.pin": "Fastgør til profil",
   "status.pinned": "Fastgjort indlæg",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
-  "status.reblog_private": "Boost med oprindelig synlighed",
+  "status.reblog_private": "Fremhæv med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
-  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
+  "status.reblogs": "{count, plural, one {# fremhævelse} other {# fremhævelser}}",
   "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",
   "status.remove_favourite": "Fjern fra favoritter",
   "status.replied_in_thread": "Svaret i tråd",
-  "status.replied_to": "Besvarede {name}",
+  "status.replied_to": "Svarede {name}",
   "status.reply": "Besvar",
-  "status.replyAll": "Besvar alle",
+  "status.replyAll": "Svar alle",
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
@@ -875,26 +888,12 @@
   "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
   "upload_error.limit": "Grænse for filupload nået.",
   "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.drag_and_drop.instructions": "For at opsamle en medievedhæftning, tryk på Mellemrum eller Retur. Mens der trækkes, benyt piletasterne til at flytte medievedhæftningen i en given retning. Tryk på Mellemrum eller Retur igen for at slippe medievedhæftningen på den nye position, eller tryk på Escape for at afbryde.",
   "upload_form.drag_and_drop.on_drag_cancel": "Træk blev afbrudt. Medievedhæftningen {item} blev sluppet.",
   "upload_form.drag_and_drop.on_drag_end": "Medievedhæftningen {item} er sluppet.",
   "upload_form.drag_and_drop.on_drag_over": "Medievedhæftningen {item} er flyttet.",
   "upload_form.drag_and_drop.on_drag_start": "Opsamlede medievedhæftningen {item}.",
   "upload_form.edit": "Redigér",
-  "upload_form.thumbnail": "Skift miniature",
-  "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
-  "upload_modal.analyzing_picture": "Analyserer billede…",
-  "upload_modal.apply": "Anvend",
-  "upload_modal.applying": "Effektuerer…",
-  "upload_modal.choose_image": "Vælg billede",
-  "upload_modal.description_placeholder": "En hurtig brun ræv hopper over den dovne hund",
-  "upload_modal.detect_text": "Detektér tekst i billede",
-  "upload_modal.edit_media": "Redigér medie",
-  "upload_modal.hint": "Klik eller træk cirklen i forhåndsvisningen for at vælge det fokuspunkt, der altid vil være synligt på alle miniaturer.",
-  "upload_modal.preparing_ocr": "Klargør OCR…",
-  "upload_modal.preview_label": "Forhåndsvisning ({ratio})",
   "upload_progress.label": "Uploader...",
   "upload_progress.processing": "Behandler…",
   "username.taken": "Brugernavnet er taget. Prøv et andet",
@@ -904,8 +903,8 @@
   "video.expand": "Udvid video",
   "video.fullscreen": "Fuldskærm",
   "video.hide": "Skjul video",
-  "video.mute": "Sluk lyden",
-  "video.pause": "Pausér",
+  "video.mute": "Sluk for lyden",
+  "video.pause": "Sæt på pause",
   "video.play": "Afspil",
   "video.unmute": "Tænd for lyden"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index f7e64d034d..e7499cac8d 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -4,7 +4,7 @@
   "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Grund unbekannt",
   "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.",
-  "about.domain_blocks.silenced.explanation": "Alle Inhalte und Profile dieses Servers werden zunächst nicht angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
+  "about.domain_blocks.silenced.explanation": "Standardmäßig werden von diesem Server keine Inhalte oder Profile angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
   "about.domain_blocks.silenced.title": "Stummgeschaltet",
   "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.",
   "about.domain_blocks.suspended.title": "Gesperrt",
@@ -42,8 +42,8 @@
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
   "account.in_memoriam": "Zum Andenken.",
   "account.joined_short": "Mitglied seit",
-  "account.languages": "Ausgewählte Sprachen ändern",
-  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
+  "account.languages": "Sprache ändern.",
+  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} verifiziert",
   "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
   "account.media": "Medien",
   "account.mention": "@{name} erwähnen",
@@ -63,7 +63,7 @@
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Geteilte Beiträge von @{name} anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "Blockierung von @{name} aufheben",
+  "account.unblock": "{name} nicht mehr blockieren",
   "account.unblock_domain": "Blockierung von {domain} aufheben",
   "account.unblock_short": "Blockierung aufheben",
   "account.unendorse": "Im Profil nicht mehr empfehlen",
@@ -72,12 +72,12 @@
   "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben",
   "account.unmute_short": "Stummschaltung aufheben",
   "account_note.placeholder": "Klicken, um Notiz hinzuzufügen",
-  "admin.dashboard.daily_retention": "Verweildauer der Benutzer*innen pro Tag nach der Registrierung",
-  "admin.dashboard.monthly_retention": "Verweildauer der Benutzer*innen pro Monat nach der Registrierung",
+  "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag nach der Registrierung",
+  "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat nach der Registrierung",
   "admin.dashboard.retention.average": "Durchschnitt",
   "admin.dashboard.retention.cohort": "Monat der Registrierung",
   "admin.dashboard.retention.cohort_size": "Neue Konten",
-  "admin.impact_report.instance_accounts": "Kontenprofile, die dadurch gelöscht würden",
+  "admin.impact_report.instance_accounts": "Profilkonten, die dadurch gelöscht würden",
   "admin.impact_report.instance_followers": "Follower, die unsere Nutzer*innen verlieren würden",
   "admin.impact_report.instance_follows": "Follower, die deren Nutzer*innen verlieren würden",
   "admin.impact_report.title": "Zusammenfassung der Auswirkung",
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
   "alert.unexpected.title": "Oha!",
   "alt_text_badge.title": "Bildbeschreibung",
+  "alt_text_modal.add_alt_text": "Bildbeschreibung hinzufügen",
+  "alt_text_modal.add_text_from_image": "Text aus Bild hinzufügen",
+  "alt_text_modal.cancel": "Abbrechen",
+  "alt_text_modal.change_thumbnail": "Vorschaubild ändern",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beschreibe den Inhalt für Menschen mit Schwerhörigkeit …",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beschreibe den Inhalt für Menschen mit Sehschwäche …",
+  "alt_text_modal.done": "Fertig",
   "announcement.announcement": "Ankündigung",
   "annual_report.summary.archetype.booster": "Trendjäger*in",
   "annual_report.summary.archetype.lurker": "Beobachter*in",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
   "confirmations.logout.title": "Abmelden?",
+  "confirmations.missing_alt_text.confirm": "Bildbeschreibung hinzufügen",
+  "confirmations.missing_alt_text.message": "Dein Beitrag enthält Medien ohne Bildbeschreibung. Mit Alt-Texten erreichst du auch Menschen mit einer Sehschwäche.",
+  "confirmations.missing_alt_text.secondary": "Trotzdem veröffentlichen",
+  "confirmations.missing_alt_text.title": "Bildbeschreibung hinzufügen?",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Alle Favoriten sowie die bisher geteilten Beiträge werden verloren gehen und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Benachrichtigungen von Profilen ignorieren, die dir nicht folgen?",
   "ignore_notifications_modal.not_following_title": "Benachrichtigungen von Profilen ignorieren, denen du nicht folgst?",
   "ignore_notifications_modal.private_mentions_title": "Benachrichtigungen von unerwünschten privaten Erwähnungen ignorieren?",
+  "info_button.label": "Hilfe",
+  "info_button.what_is_alt_text": "<h1>Was ist Alt-Text?</h1> <p>Alt-Text bietet Bildbeschreibungen für Personen mit einer Sehschwäche, einer schlechten Internetverbindung und für alle, die zusätzlichen Kontext möchten.</p> <p>Du kannst die Zugänglichkeit und die Verständlichkeit für alle verbessern, indem du eine klare, genaue und objektive Bildbeschreibung hinzufügst.</p> <ul> <li>Erfasse wichtige Elemente</li> <li>Fasse Text in Bildern zusammen</li> <li>Verwende einen korrekten Satzbau</li> <li>Vermeide unwichtige Informationen</li> <li>Konzentriere dich bei komplexen Darstellungen (z. B. Diagramme oder Karten) auf Trends und wichtige Erkenntnisse</li> </ul>",
   "interaction_modal.action.favourite": "Du musst von deinem Konto aus favorisieren, um fortzufahren.",
   "interaction_modal.action.follow": "Du musst von deinem Konto aus folgen, um fortzufahren.",
   "interaction_modal.action.reblog": "Du musst von deinem Konto aus teilen, um fortzufahren.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Bilder, Video oder Audio hinzufügen",
   "upload_error.limit": "Dateiupload-Limit überschritten.",
   "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.drag_and_drop.instructions": "Drücke zum Aufnehmen eines Medienanhangs die Eingabe- oder Leertaste. Verwende beim Ziehen die Pfeiltasten, um den Medienanhang zur gewünschten Position zu bewegen. Drücke erneut die Eingabe- oder Leertaste, um den Medienanhang an der gewünschten Position abzulegen. Mit der Escape-Taste kannst du den Vorgang abbrechen.",
   "upload_form.drag_and_drop.on_drag_cancel": "Das Ziehen wurde abgebrochen und der Medienanhang {item} wurde abgelegt.",
   "upload_form.drag_and_drop.on_drag_end": "Der Medienanhang {item} wurde abgelegt.",
   "upload_form.drag_and_drop.on_drag_over": "Der Medienanhang {item} wurde bewegt.",
   "upload_form.drag_and_drop.on_drag_start": "Der Medienanhang {item} wurde aufgenommen.",
   "upload_form.edit": "Bearbeiten",
-  "upload_form.thumbnail": "Vorschaubild ändern",
-  "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",
-  "upload_modal.applying": "Wird übernommen …",
-  "upload_modal.choose_image": "Bild auswählen",
-  "upload_modal.description_placeholder": "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
-  "upload_modal.detect_text": "Text aus Bild erkennen",
-  "upload_modal.edit_media": "Medien bearbeiten",
-  "upload_modal.hint": "Ziehe den Kreis auf die Stelle deines Bildes, um den Fokuspunkt festzulegen, der bei Vorschaubildern immer zu sehen sein soll.",
-  "upload_modal.preparing_ocr": "Texterkennung wird vorbereitet …",
-  "upload_modal.preview_label": "Vorschau ({ratio})",
   "upload_progress.label": "Wird hochgeladen …",
   "upload_progress.processing": "Wird verarbeitet…",
   "username.taken": "Dieser Profilname ist vergeben. Versuche einen anderen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 293dcc8205..45f23dbe84 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
   "alert.unexpected.title": "Ουπς!",
   "alt_text_badge.title": "Εναλλακτικό κείμενο",
+  "alt_text_modal.add_alt_text": "Προσθήκη εναλλακτικού κειμένου",
+  "alt_text_modal.add_text_from_image": "Προσθήκη κειμένου από εικόνα",
+  "alt_text_modal.cancel": "Ακύρωση",
+  "alt_text_modal.change_thumbnail": "Αλλαγή μικρογραφίας",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Περιέγραψε αυτό για άτομα με προβλήματα ακοής…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Περιέγραψε αυτό για άτομα με προβλήματα όρασης…",
+  "alt_text_modal.done": "Ολοκληρώθηκε",
   "announcement.announcement": "Ανακοίνωση",
   "annual_report.summary.archetype.booster": "Ο κυνηγός των φοβερών",
   "annual_report.summary.archetype.lurker": "Ο διακριτικός",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
   "confirmations.logout.title": "Αποσύνδεση;",
+  "confirmations.missing_alt_text.confirm": "Προσθήκη εναλ κειμένου",
+  "confirmations.missing_alt_text.message": "Η ανάρτησή σου περιέχει πολυμέσα χωρίς εναλλακτικό κείμενο. Η προσθήκη περιγραφών βοηθά να γίνει το περιεχόμενό σου προσβάσιμο σε περισσότερους ανθρώπους.",
+  "confirmations.missing_alt_text.secondary": "Δημοσίευση όπως και να ΄χει",
+  "confirmations.missing_alt_text.title": "Προσθήκη alt κειμένου;",
   "confirmations.mute.confirm": "Αποσιώπηση",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Αγνόηση ειδοποιήσεων από άτομα που δε σας ακολουθούν;",
   "ignore_notifications_modal.not_following_title": "Αγνόηση ειδοποιήσεων από άτομα που δεν ακολουθείς;",
   "ignore_notifications_modal.private_mentions_title": "Αγνόηση ειδοποιήσεων από μη ζητηθείσες ιδιωτικές αναφορές;",
+  "info_button.label": "Βοήθεια",
+  "info_button.what_is_alt_text": "Το εναλλακτικό κείμενο παρέχει περιγραφές εικόνας για άτομα με προβλήματα όρασης, διαδικτυακές συνδέσεις χαμηλής ταχύτητας ή για άτομα που αναζητούν επιπλέον περιεχόμενο.\\n\\nΜπορείς να βελτιώσεις την προσβασιμότητα και την κατανόηση για όλους, γράφοντας σαφές, συνοπτικό και αντικειμενικό εναλλακτικό κείμενο.\\n\\n<ul><li>Κατέγραψε σημαντικά στοιχεία</li>\\n<li>Συνόψισε το κείμενο στις εικόνες</li>\\n<li>Χρησιμοποίησε δομή κανονικής πρότασης</li>\\n<li>Απέφυγε περιττές πληροφορίες</li>\\n<li>Εστίασε στις τάσεις και τα βασικά ευρήματα σε σύνθετα οπτικά στοιχεία (όπως διαγράμματα ή χάρτες)</li></ul>",
   "interaction_modal.action.favourite": "Για να συνεχίσεις, θα πρέπει να αγαπήσεις από τον λογαριασμό σου.",
   "interaction_modal.action.follow": "Για να συνεχίσεις, θα πρέπει να ακολουθήσεις από τον λογαριασμό σου.",
   "interaction_modal.action.reblog": "Για να συνεχίσεις, θα πρέπει να αναδημοσιεύσεις από τον λογαριασμό σου.",
@@ -457,6 +470,7 @@
   "keyboard_shortcuts.toggle_hidden": "Εμφάνιση/απόκρυψη κειμένου πίσω από το CW",
   "keyboard_shortcuts.toggle_sensitivity": "Εμφάνιση/απόκρυψη πολυμέσων",
   "keyboard_shortcuts.toot": "Δημιουργία νέας ανάρτησης",
+  "keyboard_shortcuts.translate": "να μεταφράσει μια δημοσίευση",
   "keyboard_shortcuts.unfocus": "Αποεστίαση του πεδίου σύνθεσης/αναζήτησης",
   "keyboard_shortcuts.up": "Μετακίνηση προς τα πάνω στη λίστα",
   "lightbox.close": "Κλείσιμο",
@@ -836,6 +850,7 @@
   "status.reblogs.empty": "Κανείς δεν ενίσχυσε αυτή την ανάρτηση ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.",
   "status.redraft": "Σβήσε & ξαναγράψε",
   "status.remove_bookmark": "Αφαίρεση σελιδοδείκτη",
+  "status.remove_favourite": "Κατάργηση από τα αγαπημένα",
   "status.replied_in_thread": "Απαντήθηκε σε νήμα",
   "status.replied_to": "Απάντησε στον {name}",
   "status.reply": "Απάντησε",
@@ -873,26 +888,12 @@
   "upload_button.label": "Πρόσθεσε εικόνες, ένα βίντεο ή ένα αρχείο ήχου",
   "upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
-  "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
-  "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
   "upload_form.drag_and_drop.instructions": "Για να επιλέξετε ένα συνημμένο αρχείο πολυμέσων, πατήστε το Space ή το Enter. Ενώ το σέρνετε, χρησιμοποιήστε τα πλήκτρα βέλους για να μετακινήσετε το συνημμένο αρχείο πολυμέσων προς οποιαδήποτε κατεύθυνση. Πατήστε ξανά το Space ή το Enter για να αποθέσετε το συνημμένο αρχείο πολυμέσων στη νέα του θέση ή πατήστε το Escape για ακύρωση.",
   "upload_form.drag_and_drop.on_drag_cancel": "Η μετακίνηση ακυρώθηκε. Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",
   "upload_form.drag_and_drop.on_drag_end": "Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",
   "upload_form.drag_and_drop.on_drag_over": "Έγινε μετακίνηση του συνημμένου αρχείου πολυμέσων «{item}».",
   "upload_form.drag_and_drop.on_drag_start": "Έγινε επιλογή του συνημμένου αρχείου πολυμέσων «{item}».",
   "upload_form.edit": "Επεξεργασία",
-  "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
-  "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
-  "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
-  "upload_modal.apply": "Εφαρμογή",
-  "upload_modal.applying": "Εφαρμογή…",
-  "upload_modal.choose_image": "Επιλογή εικόνας",
-  "upload_modal.description_placeholder": "Αρνάκι άσπρο και παχύ της μάνας του καμάρι",
-  "upload_modal.detect_text": "Αναγνώριση κειμένου από την εικόνα",
-  "upload_modal.edit_media": "Επεξεργασία Πολυμέσων",
-  "upload_modal.hint": "Κάνε κλικ ή σείρε τον κύκλο στην προεπισκόπηση για να επιλέξεις το σημείο εστίασης που θα είναι πάντα εμφανές σε όλες τις μικρογραφίες.",
-  "upload_modal.preparing_ocr": "Προετοιμασία αναγνώρισης κειμένου…",
-  "upload_modal.preview_label": "Προεπισκόπηση ({ratio})",
   "upload_progress.label": "Μεταφόρτωση...",
   "upload_progress.processing": "Επεξεργασία…",
   "username.taken": "Αυτό το όνομα χρήστη χρησιμοποιείται. Δοκίμασε ένα άλλο",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 5ad52a2ed2..1974d1e62b 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
   "alt_text_badge.title": "Alt text",
+  "alt_text_modal.add_alt_text": "Add alt text",
+  "alt_text_modal.add_text_from_image": "Add text from image",
+  "alt_text_modal.cancel": "Cancel",
+  "alt_text_modal.change_thumbnail": "Change thumbnail",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describe this for people with hearing impairments…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describe this for people with visual impairments…",
+  "alt_text_modal.done": "Done",
   "announcement.announcement": "Announcement",
   "annual_report.summary.archetype.booster": "The cool-hunter",
   "annual_report.summary.archetype.lurker": "The lurker",
@@ -103,6 +110,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "most used hashtag",
   "annual_report.summary.most_used_hashtag.none": "None",
   "annual_report.summary.new_posts.new_posts": "new posts",
+  "annual_report.summary.percentile.text": "<topLabel>That puts you in the top</topLabel><percentage></percentage><bottomLabel>of {domain} users.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "We won't tell Bernie.",
   "annual_report.summary.thanks": "Thanks for being part of Mastodon!",
   "attachments_list.unprocessed": "(unprocessed)",
@@ -128,6 +136,7 @@
   "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this screen.",
   "bundle_modal_error.retry": "Try again",
   "closed_registrations.other_server_instructions": "Since Mastodon is decentralised, 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.",
@@ -203,9 +212,16 @@
   "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.edit.title": "Overwrite post?",
+  "confirmations.follow_to_list.confirm": "Follow and add to list",
+  "confirmations.follow_to_list.message": "You need to be following {name} to add them to a list.",
+  "confirmations.follow_to_list.title": "Follow user?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.logout.title": "Log out?",
+  "confirmations.missing_alt_text.confirm": "Add alt text",
+  "confirmations.missing_alt_text.message": "Your post contains media without alt text. Adding descriptions helps make your content accessible to more people.",
+  "confirmations.missing_alt_text.secondary": "Post anyway",
+  "confirmations.missing_alt_text.title": "Add alt text?",
   "confirmations.mute.confirm": "Mute",
   "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.",
@@ -234,6 +250,10 @@
   "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
   "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
   "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being shared the most on the Fediverse today. Newer news stories posted by more different people are ranked higher.",
+  "dismissable_banner.explore_statuses": "These posts from across the Fediverse are gaining traction today. Newer posts with more boosts and favourites are ranked higher.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction on the Fediverse 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 Fediverse 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.",
@@ -353,8 +373,10 @@
   "footer.privacy_policy": "Privacy policy",
   "footer.source_code": "View source code",
   "footer.status": "Status",
+  "footer.terms_of_service": "Terms of service",
   "generic.saved": "Saved",
   "getting_started.heading": "Getting started",
+  "hashtag.admin_moderation": "Open moderation interface for #{name}",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -396,6 +418,15 @@
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
+  "info_button.label": "Help",
+  "info_button.what_is_alt_text": "<h1>What is alt text?</h1> <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p> <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p> <ul> <li>Capture important elements</li> <li>Summarise text in images</li> <li>Use regular sentence structure</li> <li>Avoid redundant information</li> <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li> </ul>",
+  "interaction_modal.action.favourite": "To continue, you need to favourite from your account.",
+  "interaction_modal.action.follow": "To continue, you need to follow from your account.",
+  "interaction_modal.action.reblog": "To continue, you need to reblog from your account.",
+  "interaction_modal.action.reply": "To continue, you need to reply from your account.",
+  "interaction_modal.action.vote": "To continue, you need to vote from your account.",
+  "interaction_modal.go": "Go",
+  "interaction_modal.no_account_yet": "Don't have an account yet?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
   "interaction_modal.title.favourite": "Favourite {name}'s post",
@@ -403,6 +434,7 @@
   "interaction_modal.title.reblog": "Boost {name}'s post",
   "interaction_modal.title.reply": "Reply to {name}'s post",
   "interaction_modal.title.vote": "Vote in {name}'s poll",
+  "interaction_modal.username_prompt": "E.g. {example}",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -438,6 +470,7 @@
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
   "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.translate": "to translate a post",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "Move up in the list",
   "lightbox.close": "Close",
@@ -474,6 +507,7 @@
   "lists.replies_policy.list": "Members of the list",
   "lists.replies_policy.none": "No one",
   "lists.save": "Save",
+  "lists.search": "Search",
   "lists.show_replies_to": "Include replies from list members to",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading…",
@@ -527,6 +561,8 @@
   "notification.annual_report.view": "View #Wrapstodon",
   "notification.favourite": "{name} favourited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your post",
+  "notification.favourite_pm": "{name} favourited your private mention",
+  "notification.favourite_pm.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your private mention",
   "notification.follow": "{name} followed you",
   "notification.follow.name_and_others": "{name} and <a>{count, plural, one {# other} other {# others}}</a> followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -673,6 +709,8 @@
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
   "refresh": "Refresh",
+  "regeneration_indicator.please_stand_by": "Please stand by.",
+  "regeneration_indicator.preparing_your_home_feed": "Preparing your home feed…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
@@ -756,8 +794,11 @@
   "search_results.accounts": "Profiles",
   "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.no_results": "No results.",
+  "search_results.no_search_yet": "Try searching for posts, profiles or hashtags.",
   "search_results.see_all": "See all",
   "search_results.statuses": "Posts",
+  "search_results.title": "Search for \"{q}\"",
   "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:",
@@ -809,6 +850,7 @@
   "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",
+  "status.remove_favourite": "Remove from favourites",
   "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
@@ -830,6 +872,7 @@
   "subscribed_languages.target": "Change subscribed languages for {target}",
   "tabs_bar.home": "Home",
   "tabs_bar.notifications": "Notifications",
+  "terms_of_service.title": "Terms of Service",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -845,26 +888,12 @@
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "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.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
   "upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_over": "Media attachment {item} was moved.",
   "upload_form.drag_and_drop.on_drag_start": "Picked up media attachment {item}.",
   "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "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",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
   "upload_progress.processing": "Processing…",
   "username.taken": "That username is taken. Try another",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index cf5834835d..93e485f096 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
   "alt_text_badge.title": "Alt text",
+  "alt_text_modal.add_alt_text": "Add alt text",
+  "alt_text_modal.add_text_from_image": "Add text from image",
+  "alt_text_modal.cancel": "Cancel",
+  "alt_text_modal.change_thumbnail": "Change thumbnail",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describe this for people with hearing impairments…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describe this for people with visual impairments…",
+  "alt_text_modal.done": "Done",
   "announcement.announcement": "Announcement",
   "annual_report.summary.archetype.booster": "The cool-hunter",
   "annual_report.summary.archetype.lurker": "The lurker",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.logout.title": "Log out?",
+  "confirmations.missing_alt_text.confirm": "Add alt text",
+  "confirmations.missing_alt_text.message": "Your post contains media without alt text. Adding descriptions helps make your content accessible to more people.",
+  "confirmations.missing_alt_text.secondary": "Post anyway",
+  "confirmations.missing_alt_text.title": "Add alt text?",
   "confirmations.mute.confirm": "Mute",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
+  "info_button.label": "Help",
+  "info_button.what_is_alt_text": "<h1>What is alt text?</h1> <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p> <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p> <ul> <li>Capture important elements</li> <li>Summarize text in images</li> <li>Use regular sentence structure</li> <li>Avoid redundant information</li> <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li> </ul>",
   "interaction_modal.action.favourite": "To continue, you need to favorite from your account.",
   "interaction_modal.action.follow": "To continue, you need to follow from your account.",
   "interaction_modal.action.reblog": "To continue, you need to reblog from your account.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "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.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
   "upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_over": "Media attachment {item} was moved.",
   "upload_form.drag_and_drop.on_drag_start": "Picked up media attachment {item}.",
   "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "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",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading...",
   "upload_progress.processing": "Processing…",
   "username.taken": "That username is taken. Try another",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 6408ce4b65..9ec4c4e8a6 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -45,7 +45,7 @@
   "account.languages": "Ŝanĝi la abonitajn lingvojn",
   "account.link_verified_on": "Propreco de tiu ligilo estis konfirmita je {date}",
   "account.locked_info": "Tiu konto estas privatigita. La posedanto mane akceptas tiun, kiu povas sekvi rin.",
-  "account.media": "Plurmedio",
+  "account.media": "Aŭdovidaĵoj",
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Neatendita eraro okazis.",
   "alert.unexpected.title": "Aj!",
   "alt_text_badge.title": "Alt-teksto",
+  "alt_text_modal.add_alt_text": "Aldoni alttekston",
+  "alt_text_modal.add_text_from_image": "Aldoni tekston de bildo",
+  "alt_text_modal.cancel": "Nuligi",
+  "alt_text_modal.change_thumbnail": "Ŝanĝi bildeton",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Priskribi ĉi tion por homoj kun aŭdmalkapabloj…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Priskribi ĉi tion por homoj kun vidaj malkapabloj…",
+  "alt_text_modal.done": "Farita",
   "announcement.announcement": "Anonco",
   "annual_report.summary.archetype.booster": "La Ĉasanto de Mojoso",
   "annual_report.summary.archetype.lurker": "La vidanto",
@@ -165,7 +172,7 @@
   "column_search.cancel": "Nuligi",
   "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
-  "community.column_settings.media_only": "Nur plurmedio",
+  "community.column_settings.media_only": "Nur vidaŭdaĵoj",
   "community.column_settings.remote_only": "Nur fora",
   "compose.language.change": "Ŝanĝi lingvon",
   "compose.language.search": "Serĉi lingvojn...",
@@ -201,7 +208,7 @@
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.delete_list.title": "Ĉu forigi 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.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭvidigo de la vidaŭdaĵo, ĉu vi forĵetu ilin malgraŭe?",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.edit.title": "Ĉu superskribi afiŝon?",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Elsaluti",
   "confirmations.logout.message": "Ĉu vi certas, ke vi volas elsaluti?",
   "confirmations.logout.title": "Ĉu elsaluti?",
+  "confirmations.missing_alt_text.confirm": "Aldoni alttekston",
+  "confirmations.missing_alt_text.message": "Via afiŝo enhavas amaskomunikilaron sen altteksto. Aldono de priskriboj helpas fari vian enhavon alirebla por pli da homoj.",
+  "confirmations.missing_alt_text.secondary": "Afiŝu ĉiukaze",
+  "confirmations.missing_alt_text.title": "Ĉu aldoni alttekston?",
   "confirmations.mute.confirm": "Silentigi",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ĉu ignori sciigojn de homoj, kiuj ne sekvas vin?",
   "ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
   "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
+  "info_button.label": "Helpo",
+  "info_button.what_is_alt_text": "<h1>Kio estas la alternativa teksto?</h1> <p>La alternativa teksto ofertas priskribojn de la bildoj por individuoj kun vidaj malfacilaĵoj, konektoj kun malalta larĝa bando aŭ kiuj serĉas plian kuntekston.</p> <p>Vi povas plibonigi alireblecon kaj komprenon por ĉiuj per skribado de klaraj, koncizaj, kaj objektivaj alternativaj tekstoj.</p><ul><li>Kaptu gravajn elementojn.</li><li> Resumu tekston en bildoj.</li> <li>Uzu regulan frazstrukturon.</li> <li>Evitu redundan informon.</li><li>Fokusu sur tendencoj kaj ĉefaj trovoj en kompleksaj visualoj (kiel diagramoj aŭ mapoj).</li></ul>",
   "interaction_modal.action.favourite": "Por daŭrigi, vi devas stelumi el via konto.",
   "interaction_modal.action.follow": "Por daŭrigi, vi devas sekvi el via konto.",
   "interaction_modal.action.reblog": "Por daŭrigi, vi devas diskonigi el via konto.",
@@ -446,7 +459,7 @@
   "keyboard_shortcuts.muted": "Malfermu la liston de silentigitaj uzantoj",
   "keyboard_shortcuts.my_profile": "Malfermu vian profilon",
   "keyboard_shortcuts.notifications": "Malfermu la sciigajn kolumnon",
-  "keyboard_shortcuts.open_media": "Malfermu plurmedion",
+  "keyboard_shortcuts.open_media": "Malfermi vidaŭdaĵon",
   "keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
   "keyboard_shortcuts.profile": "Malfermu la profilon de aŭtoroprofilo",
   "keyboard_shortcuts.reply": "Respondu al afiŝo",
@@ -455,7 +468,7 @@
   "keyboard_shortcuts.spoilers": "Montri/kaŝi CW-kampon",
   "keyboard_shortcuts.start": "Malfermu \"por komenci\" kolumnon",
   "keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ CW",
-  "keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi plurmedion",
+  "keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi vidaŭdaĵojn",
   "keyboard_shortcuts.toot": "Komencu novan afiŝon",
   "keyboard_shortcuts.translate": "Traduki afiŝon",
   "keyboard_shortcuts.unfocus": "Senfokusigi verki tekstareon/serĉon",
@@ -527,7 +540,7 @@
   "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
   "navigation_bar.lists": "Listoj",
   "navigation_bar.logout": "Elsaluti",
-  "navigation_bar.moderation": "Modereco",
+  "navigation_bar.moderation": "Reguligo",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
   "navigation_bar.personal": "Persone",
@@ -561,11 +574,11 @@
   "notification.mention": "Mencii",
   "notification.mentioned_you": "{name} menciis vin",
   "notification.moderation-warning.learn_more": "Lerni pli",
-  "notification.moderation_warning": "Vi ricevis moderigan averton",
+  "notification.moderation_warning": "Vi ricevis reguligan averton",
   "notification.moderation_warning.action_delete_statuses": "Kelkaj el viaj afiŝoj estis forigitaj.",
   "notification.moderation_warning.action_disable": "Via konto estas malŝaltita.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kelkaj el viaj afiŝoj estis markitaj kiel sentemaj.",
-  "notification.moderation_warning.action_none": "Via konto ricevis moderigan averton.",
+  "notification.moderation_warning.action_none": "Via konto ricevis reguligan averton.",
   "notification.moderation_warning.action_sensitive": "Viaj afiŝoj estos markitaj kiel sentemaj ekde nun.",
   "notification.moderation_warning.action_silence": "Via konto estis limigita.",
   "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
@@ -592,8 +605,8 @@
   "notification_requests.dismiss_multiple": "{count, plural, one {Malakcepti # peton…} other {# Malakcepti # petojn…}}",
   "notification_requests.edit_selection": "Redakti",
   "notification_requests.exit_selection": "Farita",
-  "notification_requests.explainer_for_limited_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto estis limigita de moderanto.",
-  "notification_requests.explainer_for_limited_remote_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto aŭ ĝia servilo estis limigitaj de moderanto.",
+  "notification_requests.explainer_for_limited_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto estis limigita de reguligisto.",
+  "notification_requests.explainer_for_limited_remote_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto aŭ ĝia servilo estis limigitaj de reguligisto.",
   "notification_requests.maximize": "Maksimumigi",
   "notification_requests.minimize_banner": "Minimumigi filtritajn sciigojn-rubandon",
   "notification_requests.notifications_from": "Sciigoj de {name}",
@@ -640,8 +653,8 @@
   "notifications.policy.drop_hint": "Sendi al la malpleno, por neniam esti vidita denove",
   "notifications.policy.filter": "Filtri",
   "notifications.policy.filter_hint": "Sendi al filtritaj sciigoj-enirkesto",
-  "notifications.policy.filter_limited_accounts_hint": "Limigita de servilaj moderigantoj",
-  "notifications.policy.filter_limited_accounts_title": "Moderigitaj kontoj",
+  "notifications.policy.filter_limited_accounts_hint": "Limigita de servilaj reguligistoj",
+  "notifications.policy.filter_limited_accounts_title": "Reguligitaj kontoj",
   "notifications.policy.filter_new_accounts.hint": "Kreite en la {days, plural, one {lasta tago} other {# lastaj tagoj}}",
   "notifications.policy.filter_new_accounts_title": "Novaj kontoj",
   "notifications.policy.filter_not_followers_hint": "Inkluzive de homoj, kiuj sekvis vin malpli ol {days, plural, one {unu tago} other {# tagoj}}",
@@ -768,7 +781,7 @@
   "search.quick_action.go_to_account": "Iri al profilo {x}",
   "search.quick_action.go_to_hashtag": "Iri al kradvorto {x}",
   "search.quick_action.open_url": "Malfermi URL en Mastodono",
-  "search.quick_action.status_search": "Afiŝoj kiuj kongruas kun {x}",
+  "search.quick_action.status_search": "Afiŝoj kiuj konformas kun {x}",
   "search.search_or_paste": "Serĉu aŭ algluu URL-on",
   "search_popout.full_text_search_disabled_message": "Ne havebla sur {domain}.",
   "search_popout.full_text_search_logged_out_message": "Disponebla nur kiam ensalutinte.",
@@ -783,7 +796,7 @@
   "search_results.hashtags": "Kradvortoj",
   "search_results.no_results": "Ne estas rezultoj.",
   "search_results.no_search_yet": "Provu serĉi afiŝojn, profilojn aŭ kradvortojn.",
-  "search_results.see_all": "Vidu ĉiujn",
+  "search_results.see_all": "Vidi ĉiujn",
   "search_results.statuses": "Afiŝoj",
   "search_results.title": "Serĉu \"{q}\"",
   "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
@@ -796,9 +809,9 @@
   "sign_in_banner.mastodon_is": "Mastodon estas la plej bona maniero resti ĝisdata pri aktualaĵoj.",
   "sign_in_banner.sign_in": "Ensaluti",
   "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
-  "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
-  "status.admin_domain": "Malfermu moderigan interfacon por {domain}",
-  "status.admin_status": "Malfermi ĉi tiun afiŝon en la kontrola interfaco",
+  "status.admin_account": "Malfermi fasadon de la reguligado por @{name}",
+  "status.admin_domain": "Malfermi fasadon de la reguligado por {domain}",
+  "status.admin_status": "Malfermi ĉi tiun afiŝon en la fasado de la reguligado",
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",
   "status.cancel_reblog_private": "Ne plu diskonigi",
@@ -821,7 +834,7 @@
   "status.load_more": "Ŝargi pli",
   "status.media.open": "Alklaki por malfermi",
   "status.media.show": "Alklaki por montri",
-  "status.media_hidden": "Plurmedio kaŝita",
+  "status.media_hidden": "Vidaŭdaĵo kaŝita",
   "status.mention": "Mencii @{name}",
   "status.more": "Pli",
   "status.mute": "Silentigi @{name}",
@@ -875,26 +888,12 @@
   "upload_button.label": "Aldonu bildojn, filmeton aŭ sondosieron",
   "upload_error.limit": "Limo de dosiera alŝutado transpasita.",
   "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.drag_and_drop.instructions": "Por preni amaskomunikilaron aldonaĵon, premu spacoklavon aŭ enen-klavon. Dum trenado, uzu la sagoklavojn por movi la amaskomunikilaron aldonaĵon en iu ajn direkto. Premu spacoklavon aŭ enen-klavon denove por faligi la amaskomunikilaron aldonaĵon en ĝia nova pozicio, aŭ premu eskapan klavon por nuligi.",
   "upload_form.drag_and_drop.on_drag_cancel": "Trenado estis nuligita. Amaskomunikila aldonaĵo {item} estis forigita.",
   "upload_form.drag_and_drop.on_drag_end": "Amaskomunikila aldonaĵo {item} estis forigita.",
   "upload_form.drag_and_drop.on_drag_over": "Amaskomunikila aldonaĵo {item} estis movita.",
   "upload_form.drag_and_drop.on_drag_start": "Prenis amaskomunikilan aldonaĵon {item}.",
   "upload_form.edit": "Redakti",
-  "upload_form.thumbnail": "Ŝanĝi etigita bildo",
-  "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
-  "upload_modal.analyzing_picture": "Bilda analizado…",
-  "upload_modal.apply": "Apliki",
-  "upload_modal.applying": "Apliki…",
-  "upload_modal.choose_image": "Elekti bildon",
-  "upload_modal.description_placeholder": "Laŭ Ludoviko Zamenhof bongustas freŝa ĉeĥa manĝaĵo kun spicoj",
-  "upload_modal.detect_text": "Detekti tekston de la bildo",
-  "upload_modal.edit_media": "Redakti la plurmedion",
-  "upload_modal.hint": "Klaku aŭ trenu la cirklon en la antaŭvidilo por elekti la fokuspunkton kiu ĉiam videblos en ĉiuj etigitaj bildoj.",
-  "upload_modal.preparing_ocr": "Preparante OSR…",
-  "upload_modal.preview_label": "Antaŭvido ({ratio})",
   "upload_progress.label": "Alŝutante...",
   "upload_progress.processing": "Traktante…",
   "username.taken": "La uzantnomo estas jam posedita. Provu alion",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 721e47c271..d39b778f27 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ocurrió un error.",
   "alert.unexpected.title": "¡Epa!",
   "alt_text_badge.title": "Texto alternativo",
+  "alt_text_modal.add_alt_text": "Agregar texto alternativo",
+  "alt_text_modal.add_text_from_image": "Agregar texto a partir de la imagen",
+  "alt_text_modal.cancel": "Cancelar",
+  "alt_text_modal.change_thumbnail": "Cambiar miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describí esto para personas con dificultades auditivas…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describí esto para personas con dificultades visuales…",
+  "alt_text_modal.done": "Listo",
   "announcement.announcement": "Anuncio",
   "annual_report.summary.archetype.booster": "Corrió la voz",
   "annual_report.summary.archetype.lurker": "El acechador",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
   "confirmations.logout.title": "¿Cerrar sesión?",
+  "confirmations.missing_alt_text.confirm": "Agregar texto alternativo",
+  "confirmations.missing_alt_text.message": "Tu mensaje contiene medios sin texto alternativo. Agregar descripciones ayuda a que tu contenido sea accesible para más personas.",
+  "confirmations.missing_alt_text.secondary": "Enviar de todos modos",
+  "confirmations.missing_alt_text.title": "¿Agregar texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de cuentas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de cuentas a las que no seguís?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
+  "info_button.label": "Ayuda",
+  "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo proporciona descripciones de las imágenes para personas con dificultades visuales, conexiones con escaso ancho de banda o que buscan un contexto adicional.</p> <p>Podés mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.</p> <ul><li>Captura los elementos importantes.</li><li>Resumí el texto en imágenes.</li><li>Usá una estructura de frases normal.</li><li>Evitá la información redundante.</li><li>Focalizate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).</li></ul>",
   "interaction_modal.action.favourite": "Para continuar, tenés que marcar como favorito desde tu cuenta.",
   "interaction_modal.action.follow": "Para continuar, tenés que seguir desde tu cuenta.",
   "interaction_modal.action.reblog": "Para continuar, tenés que adherir desde tu cuenta.",
@@ -814,7 +827,7 @@
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Obtener código para insertar",
   "status.favourite": "Marcar como favorito",
-  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
+  "status.favourites": "{count, plural, one {# vez marcado como favorito} other {# veces marcado como favorito}}",
   "status.filter": "Filtrar este mensaje",
   "status.history.created": "Creado por {name}, {date}",
   "status.history.edited": "Editado por {name}, {date}",
@@ -875,26 +888,12 @@
   "upload_button.label": "Agregá imágenes, o un archivo de audio o video",
   "upload_error.limit": "Se excedió el límite de subida de archivos.",
   "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.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
   "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Cambiar miniatura",
-  "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",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Elegir imagen",
-  "upload_modal.description_placeholder": "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el saxofón detrás del palenque de paja.",
-  "upload_modal.detect_text": "Detectar texto de la imagen",
-  "upload_modal.edit_media": "Editar medio",
-  "upload_modal.hint": "Hacé clic o arrastrá el círculo en la previsualización para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Previsualización ({ratio})",
   "upload_progress.label": "Subiendo...",
   "upload_progress.processing": "Procesando…",
   "username.taken": "Ese nombre de usuario está ocupado. Probá con otro",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 5324d3d3fc..1f4d4546e9 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -28,7 +28,7 @@
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
-  "account.featured_tags.last_status_never": "No hay publicaciones",
+  "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
   "alt_text_badge.title": "Texto alternativo",
+  "alt_text_modal.add_alt_text": "Añadir texto alternativo",
+  "alt_text_modal.add_text_from_image": "Añadir texto de la imagen",
+  "alt_text_modal.cancel": "Cancelar",
+  "alt_text_modal.change_thumbnail": "Cambiar miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describe esto para personas con discapacidad auditiva…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describe esto para personas con discapacidad visual…",
+  "alt_text_modal.done": "Hecho",
   "announcement.announcement": "Anuncio",
   "annual_report.summary.archetype.booster": "El cazador de tendencias",
   "annual_report.summary.archetype.lurker": "El merodeador",
@@ -139,7 +146,7 @@
   "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.community": "Línea de tiempo local",
+  "column.community": "Cronología local",
   "column.create_list": "Crear lista",
   "column.direct": "Menciones privadas",
   "column.directory": "Buscar perfiles",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de que quieres cerrar la sesión?",
   "confirmations.logout.title": "¿Deseas cerrar sesión?",
+  "confirmations.missing_alt_text.confirm": "Añadir texto alternativo",
+  "confirmations.missing_alt_text.message": "Tu publicación contiene contenido multimedia sin texto alternativo. Agregar descripciones ayuda a que tu contenido sea accesible para más personas.",
+  "confirmations.missing_alt_text.secondary": "Publicar de todas maneras",
+  "confirmations.missing_alt_text.title": "¿Añadir texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
+  "info_button.label": "Ayuda",
+  "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo ofrece descripciones de las imágenes para individuos con dificultades visuales, conexiones de bajo ancho de banda o que buscan un contexto adicional.</p> <p>Puedes mejorar la accesibilidad y la comprensión para todos redactando un texto alternativo claro, breve y objetivo.</p> <ul><li>Captura los elementos clave.</li><li>Resume el texto en imágenes.</li><li>Utiliza una estructura de oraciones estándar.</li><li>Evita la información repetitiva.</li><li>Enfócate en las tendencias y conclusiones principales de los elementos visuales complejos (como gráficos o mapas).</li></ul>",
   "interaction_modal.action.favourite": "Para continuar, debes marcar como favorito desde tu cuenta.",
   "interaction_modal.action.follow": "Para continuar, debes seguir desde tu cuenta.",
   "interaction_modal.action.reblog": "Para continuar, debes impulsar desde tu cuenta.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Límite de subida de archivos excedido.",
   "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.drag_and_drop.instructions": "Para recoger un archivo adjunto, pulsa la barra espaciadora o la tecla Intro. Mientras arrastras, usa las teclas de flecha para mover el archivo adjunto en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Intro para soltar el archivo adjunto en su nueva posición, o pulsa la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Arrastre cancelado. El archivo adjunto {item} fue eliminado.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue eliminado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
   "upload_form.drag_and_drop.on_drag_start": "Recogidos los archivos adjuntos {item}.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
-  "upload_modal.analyzing_picture": "Analizando imagen…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Elegir imagen",
-  "upload_modal.description_placeholder": "Un rápido zorro marrón salta sobre el perro perezoso",
-  "upload_modal.detect_text": "Detectar texto de la imagen",
-  "upload_modal.edit_media": "Editar multimedia",
-  "upload_modal.hint": "Haga clic o arrastre el círculo en la vista previa para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Subiendo…",
   "upload_progress.processing": "Procesando…",
   "username.taken": "Ese nombre de usuario está ocupado. Prueba con otro",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index f580822cd7..ddd08c44b3 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
   "alt_text_badge.title": "Texto alternativo",
+  "alt_text_modal.add_alt_text": "Añadir texto alternativo",
+  "alt_text_modal.add_text_from_image": "Añadir texto a partir de la imagen",
+  "alt_text_modal.cancel": "Cancelar",
+  "alt_text_modal.change_thumbnail": "Cambiar miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descríbelo para personas con deficiencias auditivas…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Descríbelo para personas con discapacidad visual…",
+  "alt_text_modal.done": "Hecho",
   "announcement.announcement": "Anuncio",
   "annual_report.summary.archetype.booster": "El cazador de tendencias",
   "annual_report.summary.archetype.lurker": "El acechador",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.logout.title": "¿Cerrar sesión?",
+  "confirmations.missing_alt_text.confirm": "Añadir texto alternativo",
+  "confirmations.missing_alt_text.message": "Tu publicación contiene medios sin texto alternativo. Añadir descripciones ayuda a que tu contenido sea accesible para más personas.",
+  "confirmations.missing_alt_text.secondary": "Publicar de todos modos",
+  "confirmations.missing_alt_text.title": "¿Deseas añadir texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
+  "info_button.label": "Ayuda",
+  "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo proporciona descripciones de las imágenes para personas con problemas de visión, conexiones con poco ancho de banda o que buscan un contexto adicional.</p> <p>Puedes mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.</p> <ul><li>Captura los elementos importantes.</li><li>Resume el texto en imágenes.</li><li>Usa una estructura de frases normal.</li><li>Evita la información redundante.</li><li>Céntrate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).</li></ul>",
   "interaction_modal.action.favourite": "Para continuar, tienes que marcar como favorito desde tu cuenta.",
   "interaction_modal.action.follow": "Para continuar, tienes que seguir desde tu cuenta.",
   "interaction_modal.action.reblog": "Para continuar, tienes que impulsar desde tu cuenta.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Límite de subida de archivos excedido.",
   "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.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsa la barra espaciadora o la tecla Enter. Mientras arrastras, utiliza las teclas de flecha para mover el archivo multimedia en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsa Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} se ha movido.",
   "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
-  "upload_modal.analyzing_picture": "Analizando imagen…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Elegir imagen",
-  "upload_modal.description_placeholder": "Un rápido zorro marrón salta sobre el perro perezoso",
-  "upload_modal.detect_text": "Detectar texto de la imagen",
-  "upload_modal.edit_media": "Editar multimedia",
-  "upload_modal.hint": "Haga clic o arrastre el círculo en la vista previa para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Subiendo…",
   "upload_progress.processing": "Procesando…",
   "username.taken": "Ese nombre de usuario ya está en uso. Prueba con otro",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index fb97f55374..bd86e984aa 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Tekkis ootamatu viga.",
   "alert.unexpected.title": "Oih!",
   "alt_text_badge.title": "Alternatiivtekst",
+  "alt_text_modal.add_alt_text": "Lisa alt-tekst",
+  "alt_text_modal.add_text_from_image": "Lisa tekst pildilt",
+  "alt_text_modal.cancel": "Tühista",
+  "alt_text_modal.change_thumbnail": "Muuda pisipilti",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Kirjelda seda kuulmispuudega inimeste jaoks…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Kirjelda seda nägemispuudega inimeste jaoks…",
+  "alt_text_modal.done": "Valmis",
   "announcement.announcement": "Teadaanne",
   "annual_report.summary.archetype.booster": "Ägesisu küttija",
   "annual_report.summary.archetype.lurker": "Hiilija",
@@ -407,6 +414,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignoreeri inimeste teavitusi, kes sind ei jälgi?",
   "ignore_notifications_modal.not_following_title": "Ignoreeri inimeste teavitusi, keda sa ei jälgi?",
   "ignore_notifications_modal.private_mentions_title": "Ignoreeri soovimatute eraviisiliste mainimiste teateid?",
+  "info_button.label": "Abi",
+  "info_button.what_is_alt_text": "<h1>Mis on alt-tekst?</h1> <p>Alt-tekst pakub pildi kirjeldust nägemispuudega inimeste jaoks või neile, kel on aeglane internet või neile, kes otsivad lisaselgitust</p> <p>Saad parandada ligipääsetavust ja mõistmist kõigi jaoks, kirjutades selge, lühida ja objektiivse alt-teksti.</p> <ul> <li>Lisa tähtsad elemendid</li> <li>Tee pildil olevast tekstist kokkuvõte</li> <li>Kasuta reeglipärast lausestruktuuri</li> <li>Väldi ebaolulist infot</li> <li>Keskendu keerukate vaadete puhul (näiteks diagrammid ja kaardid) puhul trendidele ja põhiseostele</li> </ul>",
   "interaction_modal.action.favourite": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
   "interaction_modal.action.follow": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
   "interaction_modal.action.reblog": "Jätkamiseks pead jagama oma konto alt.",
@@ -457,6 +466,7 @@
   "keyboard_shortcuts.toggle_hidden": "Näita/peida teksti hoiatuse taga",
   "keyboard_shortcuts.toggle_sensitivity": "Näita/peida meediat",
   "keyboard_shortcuts.toot": "Alusta uut postitust",
+  "keyboard_shortcuts.translate": "postituse tõlkimiseks",
   "keyboard_shortcuts.unfocus": "Fookus tekstialalt/otsingult ära",
   "keyboard_shortcuts.up": "Liigu loetelus üles",
   "lightbox.close": "Sulge",
@@ -864,26 +874,12 @@
   "upload_button.label": "Lisa meedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Faili üleslaadimise limiit ületatud.",
   "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.drag_and_drop.instructions": "Vajuta tühikut või enterit, et tõsta manus. Lohistamise ajal kasuta nooleklahve, et manust liigutada teatud suunas. Vajuta tühikut või enterit uuesti, et paigutada manus oma uuele kohale, või escape tühistamiseks.",
   "upload_form.drag_and_drop.on_drag_cancel": "Lohistamine tühistati. Manus {item} on asetatud.",
   "upload_form.drag_and_drop.on_drag_end": "Manus {item} on asetatud.",
   "upload_form.drag_and_drop.on_drag_over": "Manus {item} on liigutatud.",
   "upload_form.drag_and_drop.on_drag_start": "Tõstetud on manus {item}.",
   "upload_form.edit": "Muuda",
-  "upload_form.thumbnail": "Muuda pisipilti",
-  "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
-  "upload_modal.analyzing_picture": "Analüüsime pilti…",
-  "upload_modal.apply": "Rakenda",
-  "upload_modal.applying": "Rakendan…",
-  "upload_modal.choose_image": "Vali pilt",
-  "upload_modal.description_placeholder": "Kiire pruun rebane hüppab üle laisa koera",
-  "upload_modal.detect_text": "Tuvasta teksti pildilt",
-  "upload_modal.edit_media": "Muuda meediat",
-  "upload_modal.hint": "Vajuta või tõmba ringi eelvaatel, et valida fookuspunkti, mis on alati nähtaval kõikidel eelvaadetel.",
-  "upload_modal.preparing_ocr": "Valmistan masinlugemist…",
-  "upload_modal.preview_label": "Eelvaade ({ratio})",
   "upload_progress.label": "Laeb üles....",
   "upload_progress.processing": "Töötlen…",
   "username.taken": "See kasutajanimi on juba kasutusel. Proovi teist",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 094b33e220..b26815f2a4 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -86,7 +86,23 @@
   "alert.unexpected.message": "Ustekabeko errore bat gertatu da.",
   "alert.unexpected.title": "Ene!",
   "alt_text_badge.title": "Testu alternatiboa",
+  "alt_text_modal.add_alt_text": "Gehitu ordezko testua",
+  "alt_text_modal.add_text_from_image": "Gehitu testua iruditik",
+  "alt_text_modal.cancel": "Utzi",
+  "alt_text_modal.change_thumbnail": "Aldatu koadro txikia",
+  "alt_text_modal.done": "Egina",
   "announcement.announcement": "Iragarpena",
+  "annual_report.summary.followers.followers": "jarraitzaileak",
+  "annual_report.summary.followers.total": "{count} guztira",
+  "annual_report.summary.highlighted_post.by_favourites": "egindako bidalketa gogokoena",
+  "annual_report.summary.highlighted_post.by_reblogs": "egindako bidalketa zabalduena",
+  "annual_report.summary.highlighted_post.by_replies": "erantzun gehien izan dituen bidalketa",
+  "annual_report.summary.highlighted_post.possessive": "{name}-(r)ena",
+  "annual_report.summary.most_used_app.most_used_app": "app erabiliena",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "traola erabiliena",
+  "annual_report.summary.most_used_hashtag.none": "Bat ere ez",
+  "annual_report.summary.new_posts.new_posts": "bidalketa berriak",
+  "annual_report.summary.thanks": "Eskerrik asko Mastodonen parte izateagatik!",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
   "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.",
@@ -110,6 +126,7 @@
   "bundle_column_error.routing.body": "Eskatutako orria ezin izan da aurkitu. Ziur helbide-barrako URLa zuzena dela?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Itxi",
+  "bundle_modal_error.message": "Zerbait okerra gertatu da pantaila hau kargatzean.",
   "bundle_modal_error.retry": "Saiatu berriro",
   "closed_registrations.other_server_instructions": "Mastodon deszentralizatua denez, beste kontu bat sortu dezakezu beste zerbitzari batean eta honekin komunikatu.",
   "closed_registrations_modal.description": "Une honetan ezin da konturik sortu {domain} zerbitzarian, baina kontuan izan Mastodon erabiltzeko ez duzula zertan konturik izan zehazki {domain} zerbitzarian.",
@@ -120,13 +137,16 @@
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Laster-markak",
   "column.community": "Denbora-lerro lokala",
+  "column.create_list": "Sortu zerrenda",
   "column.direct": "Aipamen pribatuak",
   "column.directory": "Arakatu profilak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
+  "column.edit_list": "Editatu zerrenda",
   "column.favourites": "Gogokoak",
   "column.firehose": "Zuzeneko jarioak",
   "column.follow_requests": "Jarraitzeko eskaerak",
   "column.home": "Hasiera",
+  "column.list_members": "Kudeatu zerrrendako partaideak",
   "column.lists": "Zerrendak",
   "column.mutes": "Mutututako erabiltzaileak",
   "column.notifications": "Jakinarazpenak",
@@ -139,6 +159,7 @@
   "column_header.pin": "Finkatu",
   "column_header.show_settings": "Erakutsi ezarpenak",
   "column_header.unpin": "Desfinkatu",
+  "column_search.cancel": "Utzi",
   "column_subheading.settings": "Ezarpenak",
   "community.column_settings.local_only": "Lokala soilik",
   "community.column_settings.media_only": "Edukiak soilik",
@@ -157,6 +178,7 @@
   "compose_form.poll.duration": "Inkestaren iraupena",
   "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
+  "compose_form.poll.single": "Aukera bakarra",
   "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",
@@ -186,6 +208,9 @@
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.logout.title": "Itxi saioa?",
+  "confirmations.missing_alt_text.confirm": "Gehitu testu alternatiboa",
+  "confirmations.missing_alt_text.secondary": "Bidali edonola ere",
+  "confirmations.missing_alt_text.title": "Testu alternatiboa gehitu?",
   "confirmations.mute.confirm": "Mututu",
   "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.",
@@ -198,6 +223,7 @@
   "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
   "content_warning.hide": "Tuta ezkutatu",
   "content_warning.show": "Erakutsi hala ere",
+  "content_warning.show_more": "Erakutsi gehiago",
   "conversation.delete": "Ezabatu elkarrizketa",
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
@@ -298,6 +324,7 @@
   "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",
+  "filter_warning.matches_filter": "“<span>{title}</span>” iragazkiarekin bat dator",
   "filtered_notifications_banner.pending_requests": "Ezagutu dezakezun {count, plural, =0 {inoren} one {pertsona baten} other {# pertsonen}}",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
@@ -329,8 +356,10 @@
   "footer.privacy_policy": "Pribatutasun politika",
   "footer.source_code": "Ikusi iturburu kodea",
   "footer.status": "Egoera",
+  "footer.terms_of_service": "Erabilera baldintzak",
   "generic.saved": "Gordea",
   "getting_started.heading": "Menua",
+  "hashtag.admin_moderation": "#{name}-(r)en moderazio-interfazea ireki",
   "hashtag.column_header.tag_mode.all": "eta {osagarria}",
   "hashtag.column_header.tag_mode.any": "edo {osagarria}",
   "hashtag.column_header.tag_mode.none": "gabe {osagarria}",
@@ -372,12 +401,15 @@
   "ignore_notifications_modal.not_followers_title": "Jarraitzen ez zaituzten pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.not_following_title": "Jarraitzen ez dituzun pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.private_mentions_title": "Eskatu gabeko aipamen pribatuen jakinarazpenei ez ikusiarena egin?",
+  "interaction_modal.go": "Joan",
+  "interaction_modal.no_account_yet": "Ez al duzu konturik oraindik?",
   "interaction_modal.on_another_server": "Beste zerbitzari batean",
   "interaction_modal.on_this_server": "Zerbitzari honetan",
   "interaction_modal.title.favourite": "Egin gogoko {name}(r)en bidalketa",
   "interaction_modal.title.follow": "Jarraitu {name}(r)i",
   "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa",
   "interaction_modal.title.reply": "Erantzun {name}(r)en bidalketari",
+  "interaction_modal.username_prompt": "Adib. {example}",
   "intervals.full.days": "{number, plural, one {egun #} other {# egun}}",
   "intervals.full.hours": "{number, plural, one {ordu #} other {# ordu}}",
   "intervals.full.minutes": "{number, plural, one {minutu #} other {# minutu}}",
@@ -423,7 +455,13 @@
   "link_preview.author": "Egilea: {name}",
   "link_preview.more_from_author": "{name} erabiltzaileaz gehiago jakin",
   "link_preview.shares": "{count, plural, one {{counter} bidalketa} other {{counter} bidalketa}}",
+  "lists.add_member": "Gehitu",
+  "lists.add_to_list": "Gehitu zerrendara",
+  "lists.add_to_lists": "Gehitu {name} zerrendetara",
+  "lists.create": "Sortu",
+  "lists.create_list": "Sortu zerrenda",
   "lists.delete": "Ezabatu zerrenda",
+  "lists.done": "Egina",
   "lists.edit": "Editatu zerrenda",
   "lists.replies_policy.followed": "Jarraitutako edozein erabiltzaile",
   "lists.replies_policy.list": "Zerrendako kideak",
@@ -576,7 +614,11 @@
   "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",
+  "onboarding.follows.back": "Atzera",
+  "onboarding.follows.done": "Egina",
   "onboarding.follows.empty": "Zoritxarrez, ezin da emaitzik erakutsi orain. Bilaketa erabil dezakezu edo Arakatu orrian jendea bilatu jarraitzeko, edo saiatu geroago.",
+  "onboarding.follows.search": "Bilatu",
+  "onboarding.follows.title": "Jarraitu jendea hasteko",
   "onboarding.profile.discoverable": "Profila aurkitzeko moduan jarri",
   "onboarding.profile.discoverable_hint": "Mastodon zure profila aurkitzeko moduan duzunean, zure mezuak bilaketa-emaitzetan eta jarraipenetan ager daitezke, eta zure profila antzeko interesa duen jendeari iradoki ahal zaio.",
   "onboarding.profile.display_name": "Bistaratzeko izena",
@@ -615,6 +657,7 @@
   "recommended": "Gomendatua",
   "refresh": "Berritu",
   "regeneration_indicator.please_stand_by": "Itxaron, mesedez.",
+  "regeneration_indicator.preparing_your_home_feed": "Zure hasierako jarioa prestatzen…",
   "relative_time.days": "{number}e",
   "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}",
   "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}",
@@ -698,6 +741,7 @@
   "search_results.accounts": "Profilak",
   "search_results.all": "Guztiak",
   "search_results.hashtags": "Traolak",
+  "search_results.no_results": "Emaitzarik ez.",
   "search_results.see_all": "Ikusi guztiak",
   "search_results.statuses": "Bidalketak",
   "server_banner.about_active_users": "Azken 30 egunetan zerbitzari hau erabili duen jendea (hilabeteko erabiltzaile aktiboak)",
@@ -787,21 +831,7 @@
   "upload_button.label": "Gehitu multimedia  (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Fitxategi igoera muga gaindituta.",
   "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.edit": "Editatu",
-  "upload_form.thumbnail": "Aldatu koadro txikia",
-  "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
-  "upload_modal.analyzing_picture": "Irudia aztertzen…",
-  "upload_modal.apply": "Aplikatu",
-  "upload_modal.applying": "Aplikatzen…",
-  "upload_modal.choose_image": "Aukeratu irudia",
-  "upload_modal.description_placeholder": "Vaudeville itxurako filmean yogi ñaño bat jipoitzen dute Quebec-en whiski truk",
-  "upload_modal.detect_text": "Antzeman testua iruditik",
-  "upload_modal.edit_media": "Editatu media",
-  "upload_modal.hint": "Sakatu eta jaregin aurrebistako zirkulua iruditxoetan beti ikusgai egongo den puntu fokala hautatzeko.",
-  "upload_modal.preparing_ocr": "OCR prestatzen…",
-  "upload_modal.preview_label": "Aurreikusi ({ratio})",
   "upload_progress.label": "Igotzen...",
   "upload_progress.processing": "Prozesatzen…",
   "username.taken": "Erabiltzailea hartuta dago. Saiatu beste batekin",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 29cc743879..625acc01a9 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "خطایی غیرمنتظره رخ داد.",
   "alert.unexpected.title": "ای وای!",
   "alt_text_badge.title": "متن جایگزین",
+  "alt_text_modal.add_alt_text": "افزودن متن جایگزین",
+  "alt_text_modal.add_text_from_image": "افزودن متن از عکس",
+  "alt_text_modal.cancel": "لغو",
+  "alt_text_modal.change_thumbnail": "تغییر بندانگشتی",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "شرح برای افرادی با مشکلات شنوایی…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "شرح برای افرادی با مشکلات بینایی…",
+  "alt_text_modal.done": "انجام شد",
   "announcement.announcement": "اعلامیه",
   "annual_report.summary.archetype.booster": "باحال‌یاب",
   "annual_report.summary.archetype.lurker": "کم‌پیدا",
@@ -94,10 +101,11 @@
   "annual_report.summary.archetype.replier": "پاسخگو",
   "annual_report.summary.followers.followers": "دنبال کننده",
   "annual_report.summary.followers.total": "در مجموع {count}",
-  "annual_report.summary.here_it_is": "بازبینی {year}تان:",
+  "annual_report.summary.here_it_is": "بازبینی {year} تان:",
   "annual_report.summary.highlighted_post.by_favourites": "پرپسندترین فرسته",
   "annual_report.summary.highlighted_post.by_reblogs": "پرتقویت‌ترین فرسته",
   "annual_report.summary.highlighted_post.by_replies": "پرپاسخ‌ترین فرسته",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
   "annual_report.summary.most_used_app.most_used_app": "پراستفاده‌ترین کاره",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "پراستفاده‌ترین برچسب",
   "annual_report.summary.most_used_hashtag.none": "هیچ‌کدام",
@@ -167,7 +175,7 @@
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
   "compose.language.change": "تغییر زبان",
-  "compose.language.search": "جست‌وجوی زبان‌ها…",
+  "compose.language.search": "جست‌وجوی زبان‌ها...",
   "compose.published.body": "فرسته منتشر شد.",
   "compose.published.open": "گشودن",
   "compose.saved.body": "فرسته ذخیره شد.",
@@ -248,7 +256,7 @@
   "domain_block_modal.they_cant_follow": "هیچ‌کسی از این کارساز نمی‌تواند پیتان بگیرد.",
   "domain_block_modal.they_wont_know": "نخواهند دانست که مسدود شده‌اند.",
   "domain_block_modal.title": "انسداد دامنه؟",
-  "domain_block_modal.you_will_lose_num_followers": "تعداد {followersCount, plural,other {{followersCount}}} پی‌گیرنده و {followingCount, plural,other {{followingCount}}} شخص پی‌گرفته شده را از دست خواهید داد.",
+  "domain_block_modal.you_will_lose_num_followers": "شما {followersCount, plural, one {{followersCountDisplay} پی‌گیرنده} other {{followersCountDisplay} پی‌گیرنده}} و {followingCount, plural, one {{followingCountDisplay} فرد پی‌گرفته‌شده} other {{followingCountDisplay} فرد پی‌گرفته‌شده}} را از دست خواهید داد.",
   "domain_block_modal.you_will_lose_relationships": "شما تمام پیگیرکنندگان و افرادی که از این کارساز پیگیری می‌کنید را از دست خواهید داد.",
   "domain_block_modal.you_wont_see_posts": "فرسته‌ها یا آگاهی‌ها از کاربران روی این کارساز را نخواهید دید.",
   "domain_pill.activitypub_lets_connect": "این به شما اجازه می‌دهد تا نه تنها در ماستودون، بلکه در برنامه‌های اجتماعی مختلف نیز با افراد ارتباط برقرار کرده و تعامل داشته باشید.",
@@ -296,7 +304,7 @@
   "empty_column.follow_requests": "شما هنوز هیچ درخواست پی‌گیری‌ای ندارید. هنگامی که چنین درخواستی بگیرید، این‌جا نشان داده خواهد شد.",
   "empty_column.followed_tags": "شما هیچ برچسبی را پی‌نگرفتید. هنگامی که برچسبی را پی‌گیری کنید اینجا نمایان می‌شوند.",
   "empty_column.hashtag": "هنوز هیچ چیزی در این برچسب نیست.",
-  "empty_column.home": "خط زمانی خانگیتان خالی است! برای پر کردنش، افراد بیشتری را پی بگیرید. {suggestions}",
+  "empty_column.home": "خط زمانی خانگیتان خالی است! برای پر کردنش، افراد بیشتری را پی بگیرید.",
   "empty_column.list": "هنوز چیزی در این سیاهه نیست. هنگامی که اعضایش فرسته‌های جدیدی بفرستند، این‌جا ظاهر خواهند شد.",
   "empty_column.mutes": "هنوز هیچ کاربری را خموش نکرده‌اید.",
   "empty_column.notification_requests": "همه چیز تمیز است! هیچ‌چیزی این‌جا نیست. هنگامی که آگاهی‌های جدیدی دریافت کنید، بسته به تنظیماتتان این‌جا ظاهر خواهند شد.",
@@ -406,6 +414,8 @@
   "ignore_notifications_modal.not_followers_title": "چشم‌پوشی از آگاهی‌های افرادی که پیتان نمی‌گیرند؟",
   "ignore_notifications_modal.not_following_title": "چشم‌پوشی از آگاهی‌های افرادی که پیشان نمی‌گیرید؟",
   "ignore_notifications_modal.private_mentions_title": "چشم‌پوشی از نام‌بری‌های خصوصی ناخواسته؟",
+  "info_button.label": "راهنما",
+  "info_button.what_is_alt_text": "<h1>متن جایگزین چیست؟</h1> <p>متن جایگزین توضیحات تصویری را برای افراد دارای اختلالات بینایی، اتصالات با پهنای باند کم یا کسانی که به دنبال زمینه اضافی هستند ارائه می دهد.</p> <p>با نوشتن متن جایگزین واضح، مختصر و عینی می توانید دسترسی و درک را برای همه بهبود بخشید.</p> <ul> <li>عناصر مهم را ضبط کنید</li> <li>متن را در تصاویر خلاصه کنید</li> <li>از ساختار جمله منظم استفاده کنید</li> <li>از اطلاعات اضافی خودداری کنید</li> <li>روی روندها و یافته های کلیدی در تصاویر پیچیده (مانند نمودارها یا نقشه ها) تمرکز کنید.</li> </ul>",
   "interaction_modal.action.favourite": "برای ادامه، باید از حساب خود به دلخواه انتخاب کنید.",
   "interaction_modal.action.follow": "برای ادامه، باید از حساب کاربری خود دنبال کنید.",
   "interaction_modal.action.reblog": "برای ادامه، باید از حساب خود مجددا بلاگ کنید.",
@@ -456,6 +466,7 @@
   "keyboard_shortcuts.toggle_hidden": "نمایش/نهفتن نوشتهٔ پشت هشدار محتوا",
   "keyboard_shortcuts.toggle_sensitivity": "نمایش/نهفتن رسانه",
   "keyboard_shortcuts.toot": "شروع یک فرستهٔ جدید",
+  "keyboard_shortcuts.translate": "برای ترجمه یک پست",
   "keyboard_shortcuts.unfocus": "برداشتن تمرکز از ناحیهٔ نوشتن یا جست‌وجو",
   "keyboard_shortcuts.up": "بالا بردن در سیاهه",
   "lightbox.close": "بستن",
@@ -536,14 +547,18 @@
   "navigation_bar.security": "امنیت",
   "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
   "notification.admin.report": "{name}، {target} را گزارش داد",
+  "notification.admin.report_account": "{name} {count, plural, one {یک پست} other {پست}} از {target} برای {category} را گزارش داد",
+  "notification.admin.report_account_other": "{name} {count, plural, one {یک پست} other {پست}} از {target} را گزارش داد",
+  "notification.admin.report_statuses": "{name} {target} برای {category} را گزارش داد",
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
   "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
-  "notification.annual_report.message": "آمار ‪#Wrapstodon‬ ‏{year}تان منتظر است! لحظه‌های به یاد ماندنی و نقاط پررنگ سال را روی ماستودون رونمایی کنید!",
+  "notification.annual_report.message": "آمار ‪#Wrapstodon‬ ‏{year} تان منتظر است! لحظه‌های به یاد ماندنی و نقاط پررنگ سال را روی ماستودون رونمایی کنید!",
   "notification.annual_report.view": "دیدن ‪#Wrapstodon‬",
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.favourite_pm": "{name} ذکر خصوصی شما را مورد علاقه قرار داد",
+  "notification.favourite_pm.name_and_others_with_link": "{name} و <a>{count, plural, one {دیگری} other {دیگران}}</a> ذکر خصوصی شما را مورد علاقه قرار دادند",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
   "notification.follow.name_and_others": "{name} و <a>{count, plural, other {#}} نفر دیگر</a> پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
@@ -569,16 +584,21 @@
   "notification.reblog.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را تقویت کردند",
   "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.accept_multiple": "{count, plural, one {پذیرش درخواست…} other {پذیرش درخواست‌ها…}}",
   "notification_requests.confirm_accept_multiple.button": "پذیرش {count, plural,one {درخواست} other {درخواست‌ها}}",
   "notification_requests.confirm_accept_multiple.message": "در حال پذیرش {count, plural,one {یک}other {#}} درخواست آگاهی هستید. مطمئنید که می‌خواهید ادامه دهید؟",
   "notification_requests.confirm_accept_multiple.title": "پذیرش درخواست‌های آگاهی؟",
   "notification_requests.confirm_dismiss_multiple.button": "رد {count, plural,one {درخواست} other {درخواست‌ها}}",
+  "notification_requests.confirm_dismiss_multiple.message": "شما در شرف رد کردن {count, plural, one {یک درخواست آگاهی} other {درخواست آگاهی}} هستید. دیگر نمی توانید به راحتی به {count, plural, one {آن} other {آن‌ها}} دسترسی پیدا کنید. آیا مطمئن هستید که می خواهید ادامه دهید؟",
   "notification_requests.confirm_dismiss_multiple.title": "رد کردن درخواست‌های آگاهی؟",
   "notification_requests.dismiss": "دورانداختن",
+  "notification_requests.dismiss_multiple": "{count, plural, one {دورانداختن درخواست…} other {دورانداختن درخواست‌ها…}}",
   "notification_requests.edit_selection": "ویرایش",
   "notification_requests.exit_selection": "انجام شد",
   "notification_requests.explainer_for_limited_account": "اعلان‌های این حساب فیلتر شده‌اند زیرا حساب توسط یک ناظر محدود شده است.",
@@ -686,6 +706,7 @@
   "recommended": "پیشنهادشده",
   "refresh": "نوسازی",
   "regeneration_indicator.please_stand_by": "لطفا منتظر باشید.",
+  "regeneration_indicator.preparing_your_home_feed": "در حال آماده کردن خوراک خانگی شما…",
   "relative_time.days": "{number} روز",
   "relative_time.full.days": "{number, plural, one {# روز} other {# روز}} پیش",
   "relative_time.full.hours": "{number, plural, one {# ساعت} other {# ساعت}} پیش",
@@ -780,7 +801,7 @@
   "server_banner.is_one_of_many": "{domain} یکی از بسیاری از سرورهای مستقل ماستودون است که می توانید از آن برای شرکت در fediverse استفاده کنید.",
   "server_banner.server_stats": "آمار کارساز:",
   "sign_in_banner.create_account": "ایجاد حساب",
-  "sign_in_banner.follow_anyone": "هر کسی را در سراسر fediverse دنبال کنید و همه را به ترتیب زمانی ببینید. هیچ الگوریتم، تبلیغات یا طعمه کلیکی در چشم نیست.",
+  "sign_in_banner.follow_anyone": "هر کسی را در سراسر فدیورس دنبال کنید و همه را به ترتیب زمانی ببینید. هیچ الگوریتم، تبلیغات یا طعمه کلیکی در چشم نیست.",
   "sign_in_banner.mastodon_is": "ماستودون بهترین راه برای پیگیری اتفاقات است.",
   "sign_in_banner.sign_in": "ورود",
   "sign_in_banner.sso_redirect": "ورود یا ثبت نام",
@@ -825,6 +846,7 @@
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
   "status.redraft": "حذف و بازنویسی",
   "status.remove_bookmark": "برداشتن نشانک",
+  "status.remove_favourite": "حذف از موارد دلخواه",
   "status.replied_in_thread": "در رشته پاسخ داده",
   "status.replied_to": "به {name} پاسخ داد",
   "status.reply": "پاسخ",
@@ -862,27 +884,13 @@
   "upload_button.label": "افزودن تصاویر، ویدیو یا یک پروندهٔ صوتی",
   "upload_error.limit": "از حد مجاز بارگذاری پرونده فراتر رفتید.",
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
-  "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
-  "upload_form.description": "برای کم‌بینایان توصیفش کنید",
   "upload_form.drag_and_drop.instructions": "برای دریافت پیوست رسانه، space را فشار دهید یا وارد کنید. در حین کشیدن، از کلیدهای جهت دار برای حرکت دادن پیوست رسانه در هر جهت معین استفاده کنید. برای رها کردن ضمیمه رسانه در موقعیت جدید خود، مجدداً space یا enter را فشار دهید، یا برای لغو، escape را فشار دهید.",
   "upload_form.drag_and_drop.on_drag_cancel": "کشیدن لغو شد. پیوست رسانه {item} حذف شد.",
   "upload_form.drag_and_drop.on_drag_end": "پیوست رسانه {item} حذف شد.",
   "upload_form.drag_and_drop.on_drag_over": "پیوست رسانه {item} منتقل شد.",
   "upload_form.drag_and_drop.on_drag_start": "پیوست رسانه {item} برداشته شد.",
   "upload_form.edit": "ویرایش",
-  "upload_form.thumbnail": "تغییر بندانگشتی",
-  "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
-  "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
-  "upload_modal.apply": "اعمال",
-  "upload_modal.applying": "اعمال کردن…",
-  "upload_modal.choose_image": "گزینش تصویر",
-  "upload_modal.description_placeholder": "الا یا ایّها الساقی، ادر کأساً و ناولها",
-  "upload_modal.detect_text": "تشخیص متن درون عکس",
-  "upload_modal.edit_media": "ویرایش رسانه",
-  "upload_modal.hint": "حتی اگر تصویر بریده یا کوچک شود، نقطهٔ کانونی آن همیشه دیده خواهد شد. نقطهٔ کانونی را با کلیک یا جابه‌جا کردن آن تنظیم کنید.",
-  "upload_modal.preparing_ocr": "در حال آماده سازی OCR…",
-  "upload_modal.preview_label": "پیش‌نمایش ({ratio})",
-  "upload_progress.label": "در حال بارگذاری…",
+  "upload_progress.label": "در حال بارگذاری...",
   "upload_progress.processing": "در حال پردازش…",
   "username.taken": "این نام کاربری گرفته شده. نام دیگری امتحان کنید",
   "video.close": "بستن ویدیو",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9abeeea9bf..fab5775e90 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
   "alt_text_badge.title": "Vaihtoehtoinen teksti",
+  "alt_text_modal.add_alt_text": "Lisää vaihtoehtoinen teksti",
+  "alt_text_modal.add_text_from_image": "Lisää teksti kuvasta",
+  "alt_text_modal.cancel": "Peruuta",
+  "alt_text_modal.change_thumbnail": "Vaihda pikkukuva",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Kuvaile tätä kuulovammallisille ihmisille…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Kuvaile tätä näkövammallisille ihmisille…",
+  "alt_text_modal.done": "Valmis",
   "announcement.announcement": "Tiedote",
   "annual_report.summary.archetype.booster": "Tehostaja",
   "annual_report.summary.archetype.lurker": "Lymyilijä",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
   "confirmations.logout.title": "Kirjaudutaanko ulos?",
+  "confirmations.missing_alt_text.confirm": "Lisää vaihtoehtoinen teksti",
+  "confirmations.missing_alt_text.message": "Julkaisussasi on mediaa ilman vaihtoehtoista tekstiä. Kuvausten lisääminen auttaa tekemään sisällöstäsi saavutettavamman useammille ihmisille.",
+  "confirmations.missing_alt_text.secondary": "Julkaise silti",
+  "confirmations.missing_alt_text.title": "Lisätäänkö vaihtoehtoinen teksti?",
   "confirmations.mute.confirm": "Mykistä",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Sivuutetaanko ilmoitukset käyttäjiltä, jotka eivät seuraa sinua?",
   "ignore_notifications_modal.not_following_title": "Sivuutetaanko ilmoitukset käyttäjiltä, joita et seuraa?",
   "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset pyytämättömistä yksityismaininnoista?",
+  "info_button.label": "Ohje",
+  "info_button.what_is_alt_text": "<h1>Mikä vaihtoehtoinen teksti on?</h1> <p>Vaihtoehtoinen teksti tarjoaa kuvauksen kuvista ihmisille, joilla on näkövamma tai matalan kaistanleveyden yhteys tai jotka kaipaavat lisäkontekstia.</p> <p>Voit parantaa saavutettavuutta ja ymmärrettävyyttä kaikkien näkökulmasta kirjoittamalla selkeän, tiiviin ja objektiivisen vaihtoehtoisen tekstin.</p> <ul> <li>Ota mukaan tärkeät elementit</li> <li>Tiivistä kuvissa oleva teksti</li> <li>Käytä tavallisia lauserakenteita</li> <li>Vältä turhaa tietoa</li> <li>Keskity trendeihin ja keskeisiin tuloksiin monimutkaisissa visuaalisissa esityksissä (kuten kaavioissa tai kartoissa)</li> </ul>",
   "interaction_modal.action.favourite": "Jotta voit jatkaa, sinun tulee lisätä julkaisu suosikiksesi omalta tililtäsi.",
   "interaction_modal.action.follow": "Jotta voit jatkaa, sinun tulee seurata käyttäjää omalta tililtäsi.",
   "interaction_modal.action.reblog": "Jotta voit jatkaa, sinun tulee uudelleenjulkaista omalta tililtäsi.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",
   "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
-  "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
-  "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
   "upload_form.drag_and_drop.instructions": "Valitse medialiite painamalla välilyöntiä tai enteriä. Vetäessäsi käytä nuolinäppäimiä siirtääksesi medialiitettä vastaavaan suuntaan. Paina välilyöntiä tai enteriä uudelleen pudottaaksesi medialiitteen uuteen kohtaansa, tai peru siirto painamalla escape-näppäintä.",
   "upload_form.drag_and_drop.on_drag_cancel": "Veto peruttiin. Medialiitettä {item} ei siirretty.",
   "upload_form.drag_and_drop.on_drag_end": "Medialiite {item} pudotettiin.",
   "upload_form.drag_and_drop.on_drag_over": "Medialiitettä {item} siirrettiin.",
   "upload_form.drag_and_drop.on_drag_start": "Valittiin medialiite {item}.",
   "upload_form.edit": "Muokkaa",
-  "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": "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": "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": "Lähetetään…",
   "upload_progress.processing": "Käsitellään…",
   "username.taken": "Tämä käyttäjänimi on jo käytössä. Kokeile toista",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 492ad38bac..4c33ac01a1 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -378,8 +378,5 @@
   "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",
-  "upload_modal.apply": "Ilapat",
-  "upload_modal.applying": "Nilalapat…",
-  "upload_modal.choose_image": "Pumili ng larawan"
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira"
 }
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 91acfb0e15..00499b3c24 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ein óvæntaður feilur kom fyri.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Annar tekstur",
+  "alt_text_modal.add_alt_text": "Legg alternativan tekst afturat",
+  "alt_text_modal.add_text_from_image": "Legg tekst frá mynd afturat",
+  "alt_text_modal.cancel": "Angra",
+  "alt_text_modal.change_thumbnail": "Broyt smámynd",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Lýs hetta fyri fólk við tey, ið hava niðursetta hoyrn…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Lýs hetta fyri fólk við tey, ið hava avmarkaða sjón…",
+  "alt_text_modal.done": "Liðugt",
   "announcement.announcement": "Kunngerð",
   "annual_report.summary.archetype.booster": "Kuli jagarin",
   "annual_report.summary.archetype.lurker": "Lúrarin",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Rita út",
   "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
   "confirmations.logout.title": "Rita út?",
+  "confirmations.missing_alt_text.confirm": "Legg alternativan tekst afturat",
+  "confirmations.missing_alt_text.message": "Posturin hjá tær inniheldur miðlar uttan alternativan tekst. Leggur tú lýsingar afturat verður tilfarið hjá tær atkomuligt hjá fleiri.",
+  "confirmations.missing_alt_text.secondary": "Posta allíkavæl",
+  "confirmations.missing_alt_text.title": "Legg alternativan tekst afturat?",
   "confirmations.mute.confirm": "Doyv",
   "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ð.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum ikki fylgja tær?",
   "ignore_notifications_modal.not_following_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum tú ikki fylgir?",
   "ignore_notifications_modal.private_mentions_title": "Lat sum um tú ikki sær fráboðanir frá óbiðnum privatum umrøðum?",
+  "info_button.label": "Hjálp",
+  "info_button.what_is_alt_text": "<h1>Hvat er alt tekstur?</h1> <p>Alt tekstur lýsir myndir fyri fólki, sum síggja illa, ella sum hava ringt net samband ella tey, sum vilja vita meira um samanhangin.</p> <p>Tú kanst bøta um atkomuna og fatanina hjá øllum við at skriva kláran, stuttan og objektivan alt tekst.</p> <ul> <li>Fanga týdningarmikil element</li> <li>Samanfata tekst í myndum</li> <li>Brúka reglubundnan setningsbygnað</li> <li>Lat vera við at siga ting upp í saman</li> <li>Fokusera á rák og høvuðsúrslit í kompleksum myndum (sosum diagrammir og kort)</li> </ul>",
   "interaction_modal.action.favourite": "Fyri at halda fram, so mást tú yndismerkja frá tínari kontu.",
   "interaction_modal.action.follow": "Fyri at halda fram, mást tú fylgja frá tínari kontu.",
   "interaction_modal.action.reblog": "Fyri at halda fram, mást tú endurblogga frá tínari kontu.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Legg myndir, sjónfílu ella ljóðfílu afturat",
   "upload_error.limit": "Farið er um markið fyri fíluuppsending.",
   "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.drag_and_drop.instructions": "Fyri at heinta eitt miðlaviðfesti, trýst á millumrúm ella returknapp. Meðan tú dregur, brúka pílarnar fyri at flyta miðaviðfesti í einhvønn rætning. Trýst á millumrúm ella returknapp aftur fyri at sleppa miðlaviðfestinum í nýggja staðnum ella trýst á esc-knappin fyri at angra.",
   "upload_form.drag_and_drop.on_drag_cancel": "Draging varð steðgað. Miðlaviðfestið {item} varð slept.",
   "upload_form.drag_and_drop.on_drag_end": "Miðlaviðfestið {item} var slept.",
   "upload_form.drag_and_drop.on_drag_over": "Miðlaviðfestið {item} var flutt.",
   "upload_form.drag_and_drop.on_drag_start": "Heintaði miðlaviðfestið {item}.",
   "upload_form.edit": "Rætta",
-  "upload_form.thumbnail": "Broyt smámynd",
-  "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ð",
-  "upload_modal.applying": "Geri virkið…",
-  "upload_modal.choose_image": "Vel mynd",
-  "upload_modal.description_placeholder": "Ein skjótur brúnur revur loypur uppum dovna hundin",
-  "upload_modal.detect_text": "Finn text á mynd",
-  "upload_modal.edit_media": "Broyt miðil",
-  "upload_modal.hint": "Klikk ella drag sirkulin á undanvísingini fyri at velja brennidepilspunktið, sum altíð fer at vera sjónligt á øllum smámyndum.",
-  "upload_modal.preparing_ocr": "Fyrireiki OCR…",
-  "upload_modal.preview_label": "Undanvísing ({ratio})",
   "upload_progress.label": "Leggi upp...",
   "upload_progress.processing": "Viðgeri…",
   "username.taken": "Brúkaranavnið er tikið. Royn eitt annað",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index d73e9dcf5d..5f6445985c 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups!",
   "alt_text_badge.title": "Texte alternatif",
+  "alt_text_modal.add_alt_text": "Ajouter un texte alternatif",
+  "alt_text_modal.add_text_from_image": "Ajouter le texte provenant de l'image",
+  "alt_text_modal.cancel": "Annuler",
+  "alt_text_modal.change_thumbnail": "Changer la vignette",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Décrire pour les personnes ayant des difficultés d’audition…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Décrire pour les personnes ayant des problèmes de vue…",
+  "alt_text_modal.done": "Terminé",
   "announcement.announcement": "Annonce",
   "annual_report.summary.archetype.booster": "Le chasseur de sang-froid",
   "annual_report.summary.archetype.lurker": "Le faucheur",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
   "confirmations.logout.title": "Se déconnecter ?",
+  "confirmations.missing_alt_text.confirm": "Ajouter un texte alternatif",
+  "confirmations.missing_alt_text.message": "Votre post contient des médias sans texte alternatif. Ajouter des descriptions rend votre contenu accessible à un plus grand nombre de personnes.",
+  "confirmations.missing_alt_text.secondary": "Publier quand-même",
+  "confirmations.missing_alt_text.title": "Ajouter un texte alternatif?",
   "confirmations.mute.confirm": "Masquer",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
   "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
+  "info_button.label": "Aide",
+  "info_button.what_is_alt_text": "<h1>Qu'est-ce que le texte alternatif ?</h1> <p>Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.</p> <p>Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.</p> <ul> <li>Identifiez les éléments importants</li> <li>Résumez le texte présent à l'image</li> <li>Utilisez une structure de phrase normale</li> <li>Évitez les informations redondantes</li> <li>Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés</li> </ul>",
   "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
   "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
   "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
   "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
   "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.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
   "upload_form.edit": "Modifier",
-  "upload_form.thumbnail": "Changer la vignette",
-  "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",
-  "upload_modal.applying": "Application en cours…",
-  "upload_modal.choose_image": "Choisir une image",
-  "upload_modal.description_placeholder": "Buvez de ce whisky que le patron juge fameux",
-  "upload_modal.detect_text": "Détecter le texte de l’image",
-  "upload_modal.edit_media": "Modifier le média",
-  "upload_modal.hint": "Cliquez ou faites glisser le cercle sur l’aperçu pour choisir le point focal qui sera toujours visible sur toutes les miniatures.",
-  "upload_modal.preparing_ocr": "Préparation de la ROC…",
-  "upload_modal.preview_label": "Aperçu ({ratio})",
   "upload_progress.label": "Envoi en cours...",
   "upload_progress.processing": "Traitement en cours…",
   "username.taken": "Ce nom d'utilisateur est déjà pris. Essayez-en en autre",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index f6c45ad706..aeca0aaeab 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
   "alt_text_badge.title": "Texte alternatif",
+  "alt_text_modal.add_alt_text": "Ajouter un texte alternatif",
+  "alt_text_modal.add_text_from_image": "Ajouter le texte provenant de l'image",
+  "alt_text_modal.cancel": "Annuler",
+  "alt_text_modal.change_thumbnail": "Changer la vignette",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Décrire pour les personnes ayant des difficultés d’audition…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Décrire pour les personnes ayant des problèmes de vue…",
+  "alt_text_modal.done": "Terminé",
   "announcement.announcement": "Annonce",
   "annual_report.summary.archetype.booster": "Le chasseur de sang-froid",
   "annual_report.summary.archetype.lurker": "Le faucheur",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.logout.title": "Se déconnecter ?",
+  "confirmations.missing_alt_text.confirm": "Ajouter un texte alternatif",
+  "confirmations.missing_alt_text.message": "Votre post contient des médias sans texte alternatif. Ajouter des descriptions rend votre contenu accessible à un plus grand nombre de personnes.",
+  "confirmations.missing_alt_text.secondary": "Publier quand-même",
+  "confirmations.missing_alt_text.title": "Ajouter un texte alternatif?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Voulez-vous vraiment supprimer le message pour le réécrire ? Ses partages ainsi que ses mises en favori seront perdues, et ses réponses seront orphelines.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
   "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
+  "info_button.label": "Aide",
+  "info_button.what_is_alt_text": "<h1>Qu'est-ce que le texte alternatif ?</h1> <p>Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.</p> <p>Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.</p> <ul> <li>Identifiez les éléments importants</li> <li>Résumez le texte présent à l'image</li> <li>Utilisez une structure de phrase normale</li> <li>Évitez les informations redondantes</li> <li>Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés</li> </ul>",
   "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
   "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
   "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
@@ -542,7 +555,7 @@
   "notification.admin.report_account_other": "{name} a signalé {count, plural, one {un message} other {# messages}} depuis {target}",
   "notification.admin.report_statuses": "{name} a signalé {target} pour {category}",
   "notification.admin.report_statuses_other": "{name} a signalé {target}",
-  "notification.admin.sign_up": "{name} s'est inscrit",
+  "notification.admin.sign_up": "{name} s'est inscrit·e",
   "notification.admin.sign_up.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont inscrit",
   "notification.annual_report.message": "Votre {year} #Wrapstodon attend ! Dévoilez les moments forts et mémorables de votre année sur Mastodon !",
   "notification.annual_report.view": "Voir #Wrapstodon",
@@ -875,26 +888,12 @@
   "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
   "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
   "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.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
   "upload_form.edit": "Modifier",
-  "upload_form.thumbnail": "Changer la vignette",
-  "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",
-  "upload_modal.applying": "Application en cours…",
-  "upload_modal.choose_image": "Choisir une image",
-  "upload_modal.description_placeholder": "Buvez de ce whisky que le patron juge fameux",
-  "upload_modal.detect_text": "Détecter le texte de l’image",
-  "upload_modal.edit_media": "Modifier le média",
-  "upload_modal.hint": "Cliquez ou faites glisser le cercle sur l’aperçu pour choisir le point focal qui sera toujours visible sur toutes les miniatures.",
-  "upload_modal.preparing_ocr": "Préparation de l’OCR…",
-  "upload_modal.preview_label": "Aperçu ({ratio})",
   "upload_progress.label": "Envoi en cours…",
   "upload_progress.processing": "En cours…",
   "username.taken": "Ce nom d'utilisateur est déjà pris. Essayez d'en prendre un autre",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 1664ccd864..aafef2a41d 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -86,14 +86,33 @@
   "alert.unexpected.message": "Der is in ûnferwachte flater bard.",
   "alert.unexpected.title": "Oepsy!",
   "alt_text_badge.title": "Alternative tekst",
+  "alt_text_modal.add_alt_text": "Alt-tekst tafoegje",
+  "alt_text_modal.add_text_from_image": "Tekst fan ôfbylding tafoegje",
+  "alt_text_modal.cancel": "Annulearje",
+  "alt_text_modal.change_thumbnail": "Miniatuerôfbylding wizigje",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beskriuw dit foar dôven en hurdhearrige…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beskriuw dit foar blinen en fisueel beheinde…",
+  "alt_text_modal.done": "Klear",
   "announcement.announcement": "Oankundiging",
   "annual_report.summary.archetype.booster": "De cool-hunter",
+  "annual_report.summary.archetype.lurker": "De lurker",
   "annual_report.summary.archetype.oracle": "It orakel",
   "annual_report.summary.archetype.pollster": "De opinypeiler",
   "annual_report.summary.archetype.replier": "De sosjale flinter",
   "annual_report.summary.followers.followers": "folgers",
   "annual_report.summary.followers.total": "totaal {count}",
   "annual_report.summary.here_it_is": "Jo jieroersjoch foar {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "berjocht mei de measte favoriten",
+  "annual_report.summary.highlighted_post.by_reblogs": "berjocht mei de measte boosts",
+  "annual_report.summary.highlighted_post.by_replies": "berjocht mei de measte reaksjes",
+  "annual_report.summary.highlighted_post.possessive": "{name}’s",
+  "annual_report.summary.most_used_app.most_used_app": "meast brûkte app",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "meast brûkte hashtag",
+  "annual_report.summary.most_used_hashtag.none": "Gjin",
+  "annual_report.summary.new_posts.new_posts": "nije berjochten",
+  "annual_report.summary.percentile.text": "<topLabel>Hjirmei hearre jo ta de top</topLabel><percentage></percentage><bottomLabel> fan {domain}.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Wy sille Bernie neat fertelle.",
+  "annual_report.summary.thanks": "Tank dat jo part binne fan Mastodon!",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
   "block_modal.remote_users_caveat": "Wy freegje de server {domain} om jo beslút te respektearjen. It neilibben hjirfan is echter net garandearre, omdat guon servers blokkaden oars ynterpretearje kinne. Iepenbiere berjochten binne mooglik noch hieltyd sichtber foar net-oanmelde brûkers.",
@@ -117,6 +136,7 @@
   "bundle_column_error.routing.body": "De opfrege side kin net fûn wurde. Binne jo wis dat de URL yn de adresbalke goed is?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Slute",
+  "bundle_modal_error.message": "Der gie wat mis by it laden fan dit skerm.",
   "bundle_modal_error.retry": "Opnij probearje",
   "closed_registrations.other_server_instructions": "Omdat Mastodon desintralisearre is, kinne jo in account meitsje op in oare server en noch hieltyd ynteraksje hawwe mei dizze.",
   "closed_registrations_modal.description": "It oanmeitsjen fan in account op {domain} is op dit stuit net mooglik, mar hâld asjebleaft yn gedachten dat jo gjin account spesifyk op {domain} nedich hawwe om Mastodon te brûken.",
@@ -127,13 +147,16 @@
   "column.blocks": "Blokkearre brûkers",
   "column.bookmarks": "Blêdwizers",
   "column.community": "Lokale tiidline",
+  "column.create_list": "List oanmeitsje",
   "column.direct": "Priveefermeldingen",
   "column.directory": "Profilen trochsykje",
   "column.domain_blocks": "Blokkearre domeinen",
+  "column.edit_list": "List bewurkje",
   "column.favourites": "Favoriten",
   "column.firehose": "Live feeds",
   "column.follow_requests": "Folchfersiken",
   "column.home": "Startside",
+  "column.list_members": "Listleden beheare",
   "column.lists": "Listen",
   "column.mutes": "Negearre brûkers",
   "column.notifications": "Meldingen",
@@ -146,6 +169,7 @@
   "column_header.pin": "Fêstsette",
   "column_header.show_settings": "Ynstellingen toane",
   "column_header.unpin": "Losmeitsje",
+  "column_search.cancel": "Annulearje",
   "column_subheading.settings": "Ynstellingen",
   "community.column_settings.local_only": "Allinnich lokaal",
   "community.column_settings.media_only": "Allinnich media",
@@ -188,6 +212,9 @@
   "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.edit.title": "Berjocht oerskriuwe?",
+  "confirmations.follow_to_list.confirm": "Folgje en tafoegje oan de list",
+  "confirmations.follow_to_list.message": "Jo moatte {name} folgje om se ta te foegjen oan in list.",
+  "confirmations.follow_to_list.title": "Brûker folgje?",
   "confirmations.logout.confirm": "Ofmelde",
   "confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
   "confirmations.logout.title": "Ofmelde?",
@@ -219,6 +246,7 @@
   "disabled_account_banner.text": "Jo account {disabledAccount} is op dit stuit útskeakele.",
   "dismissable_banner.community_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op {domain}.",
   "dismissable_banner.dismiss": "Slute",
+  "dismissable_banner.explore_links": "Dizze nijsartikelen wurde hjoed de dei it meast dield op de fediverse. Nijere artikelen dy’t troch mear ferskate minsken pleatst binne, wurde heger rangskikt.",
   "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.",
@@ -381,6 +409,9 @@
   "ignore_notifications_modal.not_followers_title": "Meldingen negearje fan minsken dy’t jo net folgje?",
   "ignore_notifications_modal.not_following_title": "Meldingen negearje fan minsken dy’t josels net folgje?",
   "ignore_notifications_modal.private_mentions_title": "Meldingen negearje fan net frege priveeberjochten?",
+  "info_button.label": "Help",
+  "interaction_modal.go": "Gean",
+  "interaction_modal.no_account_yet": "Hawwe jo noch gjin account?",
   "interaction_modal.on_another_server": "Op een oare server",
   "interaction_modal.on_this_server": "Op dizze server",
   "interaction_modal.title.favourite": "Berjocht fan {name} as favoryt markearje",
@@ -388,6 +419,7 @@
   "interaction_modal.title.reblog": "Berjocht fan {name} booste",
   "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje",
   "interaction_modal.title.vote": "Stimme yn {name}’s peiling",
+  "interaction_modal.username_prompt": "Byg. {example}",
   "intervals.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
   "intervals.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
   "intervals.full.minutes": "{number, plural, one {# minút} other {# minuten}} lyn",
@@ -423,6 +455,7 @@
   "keyboard_shortcuts.toggle_hidden": "Tekst efter CW-fjild ferstopje/toane",
   "keyboard_shortcuts.toggle_sensitivity": "Media ferstopje/toane",
   "keyboard_shortcuts.toot": "Nij berjocht skriuwe",
+  "keyboard_shortcuts.translate": "om in berjocht oer te setten",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "Nei boppe yn list ferpleatse",
   "lightbox.close": "Slute",
@@ -435,11 +468,32 @@
   "link_preview.author": "Troch {name}",
   "link_preview.more_from_author": "Mear fan {name}",
   "link_preview.shares": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}",
+  "lists.add_member": "Tafoegje",
+  "lists.add_to_list": "Oan list tafoegje",
+  "lists.add_to_lists": "{name} oan listen tafoegje",
+  "lists.create": "Oanmeitsje",
+  "lists.create_a_list_to_organize": "Meitsje in nije list oan om jo starttiidline te organisearjen",
+  "lists.create_list": "List oanmeitsje",
   "lists.delete": "List fuortsmite",
+  "lists.done": "Klear",
   "lists.edit": "List bewurkje",
+  "lists.exclusive": "Leden op jo Startside ferstopje",
+  "lists.exclusive_hint": "As ien op dizze list stiet, ferstopje dizze persoan dan op jo starttiidline om foar te kommen dat harren berjochten twa kear toand wurde.",
+  "lists.find_users_to_add": "Fyn brûkers om ta te foegjen",
+  "lists.list_members": "Listleden",
+  "lists.list_members_count": "{count, plural, one{# lid} other{# leden}}",
+  "lists.list_name": "Listnamme",
+  "lists.new_list_name": "Nije listnamme",
+  "lists.no_lists_yet": "Noch gjin listen.",
+  "lists.no_members_yet": "Noch gjin leden.",
+  "lists.no_results_found": "Gjin resultaten fûn.",
+  "lists.remove_member": "Fuortsmite",
   "lists.replies_policy.followed": "Elke folge brûker",
   "lists.replies_policy.list": "Leden fan de list",
   "lists.replies_policy.none": "Net ien",
+  "lists.save": "Bewarje",
+  "lists.search": "Sykje",
+  "lists.show_replies_to": "Foegje antwurden fan listleden ta oan",
   "load_pending": "{count, plural, one {# nij item} other {# nije items}}",
   "loading_indicator.label": "Lade…",
   "media_gallery.hide": "Ferstopje",
@@ -488,8 +542,12 @@
   "notification.admin.report_statuses_other": "{name} hat {target} rapportearre",
   "notification.admin.sign_up": "{name} hat harren registrearre",
   "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe harren registrearre",
+  "notification.annual_report.message": "Jo {year} #Wrapstodon stiet klear! Lit de hichtepunten en memorabele mominten fan jo jier sjen op Mastodon!",
+  "notification.annual_report.view": "#Wrapstodon besjen",
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
   "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht as favoryt markearre",
+  "notification.favourite_pm": "{name} hat jo priveeberjocht as favoryt markearre",
+  "notification.favourite_pm.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo priveeberjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
   "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# oar persoan} other {# oare persoanen}}</a> folgje jo no",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
@@ -594,7 +652,11 @@
   "notifications_permission_banner.enable": "Desktopmeldingen ynskeakelje",
   "notifications_permission_banner.how_to_control": "Om meldingen te ûntfangen wannear’t Mastodon net iepen stiet. Jo kinne krekt bepale hokker soarte fan ynteraksjes wol of gjin desktopmeldingen jouwe fia de boppesteande {icon} knop.",
   "notifications_permission_banner.title": "Mis neat",
+  "onboarding.follows.back": "Tebek",
+  "onboarding.follows.done": "Klear",
   "onboarding.follows.empty": "Spitigernôch kinne op dit stuit gjin resultaten toand wurde. Jo kinne probearje te sykjen of te blêdzjen troch de ferkenningsside om minsken te finen dy’t jo folgje kinne, of probearje it letter opnij.",
+  "onboarding.follows.search": "Sykje",
+  "onboarding.follows.title": "Folgje minsken om te begjinnen",
   "onboarding.profile.discoverable": "Meitsje myn profyl te finen",
   "onboarding.profile.discoverable_hint": "Wannear’t jo akkoard gean mei it te finen wêzen op Mastodon, ferskine jo berjochten yn sykresultaten en kinne se trending wurde, en jo profyl kin oan oare minsken oanrekommandearre wurde wannear’t se fergelykbere ynteressen hawwe.",
   "onboarding.profile.display_name": "Werjeftenamme",
@@ -632,6 +694,8 @@
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
   "refresh": "Ferfarskje",
+  "regeneration_indicator.please_stand_by": "In amerijke.",
+  "regeneration_indicator.preparing_your_home_feed": "Tarieden fan jo starttiidline…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
   "relative_time.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
@@ -715,8 +779,11 @@
   "search_results.accounts": "Profilen",
   "search_results.all": "Alles",
   "search_results.hashtags": "Hashtags",
+  "search_results.no_results": "Gjin resultaten.",
+  "search_results.no_search_yet": "Probearje te sykjen nei berjochten, profilen of hashtags.",
   "search_results.see_all": "Alles besjen",
   "search_results.statuses": "Berjochten",
+  "search_results.title": "Sykje nei ‘{q}’",
   "server_banner.about_active_users": "Oantal brûkers yn de ôfrûne 30 dagen (MAU)",
   "server_banner.active_users": "warbere brûkers",
   "server_banner.administered_by": "Beheard troch:",
@@ -768,6 +835,7 @@
   "status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
   "status.redraft": "Fuortsmite en opnij opstelle",
   "status.remove_bookmark": "Blêdwizer fuortsmite",
+  "status.remove_favourite": "Ut favoriten fuortsmite",
   "status.replied_in_thread": "Antwurde yn petear",
   "status.replied_to": "Antwurde op {name}",
   "status.reply": "Beäntwurdzje",
@@ -789,6 +857,7 @@
   "subscribed_languages.target": "Toande talen foar {target} wizigje",
   "tabs_bar.home": "Startside",
   "tabs_bar.notifications": "Meldingen",
+  "terms_of_service.title": "Gebrûksbetingsten",
   "time_remaining.days": "{number, plural, one {# dei} other {# dagen}} te gean",
   "time_remaining.hours": "{number, plural, one {# oere} other {# oeren}} te gean",
   "time_remaining.minutes": "{number, plural, one {# minút} other {# minuten}} te gean",
@@ -804,26 +873,12 @@
   "upload_button.label": "Ofbyldingen, in fideo- of in lûdsbestân tafoegje",
   "upload_error.limit": "Oer de oplaadlimyt fan bestân.",
   "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.drag_and_drop.instructions": "Druk op spaasje of Enter om in mediabylage op te pakken. Bruk de pylktoetsen om de bylage yn in bepaalde rjochting te ferpleatsen. Druk opnij op de spaasjebalke of Enter om de mediabylage op de nije posysje te pleatsen, of druk op Esc om te annulearjen.",
   "upload_form.drag_and_drop.on_drag_cancel": "Slepen is annulearre. Mediabylage {item} is net ferpleatst.",
   "upload_form.drag_and_drop.on_drag_end": "Mediabylage {item} is net ferpleatst.",
   "upload_form.drag_and_drop.on_drag_over": "Mediabylage {item} is ferpleatst.",
   "upload_form.drag_and_drop.on_drag_start": "Mediabylage {item} is oppakt.",
   "upload_form.edit": "Bewurkje",
-  "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Ofbylding analysearje…",
-  "upload_modal.apply": "Tapasse",
-  "upload_modal.applying": "Oan it tapassen…",
-  "upload_modal.choose_image": "Kies in ôfbylding",
-  "upload_modal.description_placeholder": "Heit syn wize foks ljept tûk oar de loaie hûn",
-  "upload_modal.detect_text": "Tekst yn in ôfbylding detektearje",
-  "upload_modal.edit_media": "Media bewurkje",
-  "upload_modal.hint": "Klik of sleep de sirkel yn de foarfertoaning nei in sintraal fokuspunt dat op elke thumbnail sichtber bliuwe moat.",
-  "upload_modal.preparing_ocr": "OCR tariede…",
-  "upload_modal.preview_label": "Foarfertoaning ({ratio})",
   "upload_progress.label": "Uploading…",
   "upload_progress.processing": "Dwaande…",
   "username.taken": "Dy brûkersnamme is al yn gebrûk. Probearje in oare",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index d533e99906..54bc7fd380 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Tharla earráid gan choinne.",
   "alert.unexpected.title": "Hiúps!",
   "alt_text_badge.title": "Téacs alt",
+  "alt_text_modal.add_alt_text": "Cuir téacs alt leis",
+  "alt_text_modal.add_text_from_image": "Cuir téacs ón íomhá leis",
+  "alt_text_modal.cancel": "Cealaigh",
+  "alt_text_modal.change_thumbnail": "Athraigh mionsamhail",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Déan cur síos air seo do dhaoine le lagú éisteachta…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Déan cur síos air seo do dhaoine a bhfuil lagú amhairc orthu…",
+  "alt_text_modal.done": "Déanta",
   "announcement.announcement": "Fógra",
   "annual_report.summary.archetype.booster": "An sealgair fionnuar",
   "annual_report.summary.archetype.lurker": "An lurker",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
   "confirmations.logout.title": "Logáil Amach?",
+  "confirmations.missing_alt_text.confirm": "Cuir téacs alt leis",
+  "confirmations.missing_alt_text.message": "Tá meáin gan alt téacs i do phostáil. Má chuirtear tuairiscí leis, cabhraíonn sé seo leat d’inneachar a rochtain do níos mó daoine.",
+  "confirmations.missing_alt_text.secondary": "Post ar aon nós",
+  "confirmations.missing_alt_text.title": "Cuir téacs alt leis?",
   "confirmations.mute.confirm": "Balbhaigh",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an postáil seo a scriosadh agus é a athdhréachtú? Caillfear ceanáin agus treisithe, agus dílleachtaí freagraí ar an mbunphostála.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "An dtugann tú aird ar fhógraí ó dhaoine nach leanann tú?",
   "ignore_notifications_modal.not_following_title": "An ndéanann tú neamhaird de fhógraí ó dhaoine nach leanann tú?",
   "ignore_notifications_modal.private_mentions_title": "An dtugann tú aird ar fhógraí ó Luaintí Príobháideacha gan iarraidh?",
+  "info_button.label": "Cabhrú",
+  "info_button.what_is_alt_text": "<h1>Cad is téacs altach ann?</h1> <p>Soláthraíonn téacs Alt cur síos ar íomhánna do dhaoine le lagú radhairc, naisc íseal-bandaleithead, nó daoine atá ag lorg comhthéacs breise.</p> <p>Is féidir leat inrochtaineacht agus tuiscint a fheabhsú do chách trí théacs alt soiléir, gonta, oibiachtúil a scríobh.</p> <ul> <li>Glac gnéithe tábhachtacha</li> <li>Déan achoimre ar théacs in íomhánna</li> <li>Úsáid struchtúr abairtí rialta</li> li> <li>Seachain faisnéis iomarcach</li> <li>Fócas ar threochtaí agus ar phríomhthorthaí i bhfíseanna casta (amhail léaráidí nó léarscáileanna)</li> </ul>",
   "interaction_modal.action.favourite": "Chun leanúint ar aghaidh, ní mór duit an ceann is fearr leat ó do chuntas.",
   "interaction_modal.action.follow": "Chun leanúint ar aghaidh, ní mór duit leanúint ó do chuntas.",
   "interaction_modal.action.reblog": "Chun leanúint ar aghaidh, ní mór duit athbhlagáil ó do chuntas.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Cuir íomhánna, físeán nó comhad fuaime leis",
   "upload_error.limit": "Sáraíodh an teorainn uaslódála comhaid.",
   "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
-  "upload_form.audio_description": "Déan cur síos ar dhaoine bodhra nó lagéisteachta",
-  "upload_form.description": "Describe for the visually impaired",
   "upload_form.drag_and_drop.instructions": "Chun ceangaltán meán a phiocadh suas, brúigh spás nó cuir isteach. Agus tú ag tarraingt, bain úsáid as na heochracha saigheada chun an ceangaltán meán a bhogadh i dtreo ar bith. Brúigh spás nó cuir isteach arís chun an ceangaltán meán a scaoileadh ina phost nua, nó brúigh éalú chun cealú.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cuireadh an tarraingt ar ceal. Scaoileadh ceangaltán meán {item}.",
   "upload_form.drag_and_drop.on_drag_end": "Scaoileadh ceangaltán meán {item}.",
   "upload_form.drag_and_drop.on_drag_over": "Bogadh ceangaltán meán {item}.",
   "upload_form.drag_and_drop.on_drag_start": "Roghnaíodh ceangaltán meán {item}.",
   "upload_form.edit": "Cuir in eagar",
-  "upload_form.thumbnail": "Athraigh mionsamhail",
-  "upload_form.video_description": "Déan cur síos ar dhaoine atá bodhar, lagéisteachta, dall nó lagamhairc",
-  "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
-  "upload_modal.apply": "Cuir i bhFeidhm",
-  "upload_modal.applying": "Á gcur i bhfeidhm…",
-  "upload_modal.choose_image": "Roghnaigh íomhá",
-  "upload_modal.description_placeholder": "Chuaigh bé mhórsách le dlúthspád fíorfhinn trí hata mo dhea-phorcáin bhig",
-  "upload_modal.detect_text": "Braith téacs ó phictiúr",
-  "upload_modal.edit_media": "Cuir gné in eagar",
-  "upload_modal.hint": "Cliceáil nó tarraing an ciorcal ar an réamhamharc chun an pointe fócasach a roghnú a bheidh le feiceáil i gcónaí ar na mionsamhlacha go léir.",
-  "upload_modal.preparing_ocr": "OCR á ullmhú…",
-  "upload_modal.preview_label": "Réamhamharc ({ratio})",
   "upload_progress.label": "Ag uaslódáil...",
   "upload_progress.processing": "Ag próiseáil…",
   "username.taken": "Glactar leis an ainm úsáideora sin. Bain triail eile as",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 86936b9ccb..b2b6e6f9b3 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -817,26 +817,12 @@
   "upload_button.label": "Cuir ris dealbhan, video no faidhle fuaime",
   "upload_error.limit": "Luchdaich thu suas na tha ceadaichte dhut a dh’fhaidhlichean mu thràth.",
   "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.drag_and_drop.instructions": "Airson ceanglachan meadhain a thogail, brùth air space no enter. Fhad ’ a bhios tu ’ga shlaodadh, cleachd na h-iuchraichean-saighde airson an ceanglachan meadhain a ghluasad gu comhair sam bith. Brùth air space no enter a-rithist airson an ceanglachen meadhain a leigeil às air an ionad ùr aige no brùth air escape airson sgur dheth.",
   "upload_form.drag_and_drop.on_drag_cancel": "Chaidh sgur dhen t-slaodadh. Chaidh an ceanglachan meadhain {item} a leigeil às.",
   "upload_form.drag_and_drop.on_drag_end": "Chaidh an ceanglachan meadhain {item} a leigeil às.",
   "upload_form.drag_and_drop.on_drag_over": "Chaidh an ceanglachan meadhain {item} a ghluasad.",
   "upload_form.drag_and_drop.on_drag_start": "Chaidh an ceanglachan meadhain {item} a thogail.",
   "upload_form.edit": "Deasaich",
-  "upload_form.thumbnail": "Atharraich an dealbhag",
-  "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",
-  "upload_modal.applying": "’Ga chur an sàs…",
-  "upload_modal.choose_image": "Tagh dealbh",
-  "upload_modal.description_placeholder": "Lorg Sìm fiù bò, cè ⁊ neup ’ad àth",
-  "upload_modal.detect_text": "Mothaich dhan teacsa on dealbh",
-  "upload_modal.edit_media": "Deasaich am meadhan",
-  "upload_modal.hint": "Briog no slaod an cearcall air an ro-shealladh airson puing an fhòcais a thaghadh a chithear air gach dealbhag dheth.",
-  "upload_modal.preparing_ocr": "Ag ullachadh OCR…",
-  "upload_modal.preview_label": "Ro-shealladh ({ratio})",
   "upload_progress.label": "’Ga luchdadh suas…",
   "upload_progress.processing": "’Ga phròiseasadh…",
   "username.taken": "Tha an t-ainm-cleachdaiche seo aig cuideigin eile. Feuch fear eile",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 02682335ef..b26e977609 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Aconteceu un fallo non agardado.",
   "alert.unexpected.title": "Vaites!",
   "alt_text_badge.title": "Texto Alt",
+  "alt_text_modal.add_alt_text": "Engadir texto descritivo",
+  "alt_text_modal.add_text_from_image": "Engadir texto desde a imaxe",
+  "alt_text_modal.cancel": "Desbotar",
+  "alt_text_modal.change_thumbnail": "Cambiar a miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describe isto para as persoas con dificultades auditivas…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describe isto para as persoas con dificultades visuais…",
+  "alt_text_modal.done": "Feito",
   "announcement.announcement": "Anuncio",
   "annual_report.summary.archetype.booster": "O Telexornal",
   "annual_report.summary.archetype.lurker": "Volleur",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.logout.title": "Pechar sesión?",
+  "confirmations.missing_alt_text.confirm": "Engadir texto descritivo",
+  "confirmations.missing_alt_text.message": "A publicación contén multimedia sen un texto que o describa. Ao engadir a descrición fas o contido accesible para máis persoas.",
+  "confirmations.missing_alt_text.secondary": "Publicar igualmente",
+  "confirmations.missing_alt_text.title": "Engadir texto descritivo?",
   "confirmations.mute.confirm": "Acalar",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificacións de persoas que non te seguen?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificacións de persoas que non segues?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificacións de Mencións Privadas non solicitadas?",
+  "info_button.label": "Axuda",
+  "info_button.what_is_alt_text": "<h1>Que é o Texto Alternativo?</h1> <p>O Text Alt proporciona a descrición das imaxes para as persoas con deficiencias visuais, conexións a internet de baixa calidade ou para engadir contexto ás mesmas.</p> <p>Podes mellorar a accesibilidade e a comprensión da publicación ao escribir un texto alternativo claro, conciso e obxectivo.</p> <ul> <li>Identifica os elementos importantes</li> <li>Inclúe o texto que apareza nas imaxes</li> <li>Utiliza sintaxe estándar nas frases</li> <li>Evita información redundante</li> <li>Céntrate nos elementos principais cando sexan imaxes complexas (como diagramas ou mapas)</li> </ul>",
   "interaction_modal.action.favourite": "Para continuar, debes favorecer desde a túa conta.",
   "interaction_modal.action.follow": "Para continuar, debes facer seguimento desde a túa conta.",
   "interaction_modal.action.reblog": "Para continuar, debes promover desde a túa conta.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Engadir imaxes, un vídeo ou ficheiro de audio",
   "upload_error.limit": "Límite máximo do ficheiro a subir excedido.",
   "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.drag_and_drop.instructions": "Preme en Espazo ou Enter para escoller un anexo multimedia. Ao arrastrar usa as teclas de frecha para mover o anexo en todas direccións.Preme Espazo ou Enter outra vez para soltalo na súa nova posición, ou preme Escape para desbotar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cancelouse o movemento. O anexo {item} soltouse.",
   "upload_form.drag_and_drop.on_drag_end": "Soltouse o anexo multimedia {item}.",
   "upload_form.drag_and_drop.on_drag_over": "Moveuse o anexo multimedia {item}.",
   "upload_form.drag_and_drop.on_drag_start": "Escolleuse o anexo multimedia {item}.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Cambiar a miniatura",
-  "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",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Elixir imaxe",
-  "upload_modal.description_placeholder": "Un raposo veloz brinca sobre o can preguiceiro",
-  "upload_modal.detect_text": "Detectar texto na imaxe",
-  "upload_modal.edit_media": "Editar multimedia",
-  "upload_modal.hint": "Preme ou arrastra o círculo na vista previa para escoller o punto focal que sempre estará á vista en todas as miniaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Estase a subir...",
   "upload_progress.processing": "Procesando…",
   "username.taken": "O identificador xa está pillado. Inténtao con outro",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 71ced7e0df..2358d7bd2a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.",
   "alert.unexpected.title": "אופס!",
   "alt_text_badge.title": "כיתוב חלופי",
+  "alt_text_modal.add_alt_text": "הוספת מלל חלופי",
+  "alt_text_modal.add_text_from_image": "הוספת מלל מתוך התמונה",
+  "alt_text_modal.cancel": "ביטול",
+  "alt_text_modal.change_thumbnail": "החלפת התמונה הממוזערת",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "תיאור התוכן לכבדי שמיעה…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "תיאור התוכן לפגועי ראיה…",
+  "alt_text_modal.done": "סיום",
   "announcement.announcement": "הכרזה",
   "annual_report.summary.archetype.booster": "ההד-וניסט(ית)",
   "annual_report.summary.archetype.lurker": "השורץ.ת השקט.ה",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.logout.title": "להתנתק?",
+  "confirmations.missing_alt_text.confirm": "הוספת מלל חלופי",
+  "confirmations.missing_alt_text.message": "ההודעה שלך כוללת קבצים גרפיים ללא תיאור (מלל חלופי). הוספת תיאורים עוזרת להנגיש את התוכן ליותר אנשים.",
+  "confirmations.missing_alt_text.secondary": "לפרסם בכל זאת",
+  "confirmations.missing_alt_text.title": "להוסיף מלל חלופי?",
   "confirmations.mute.confirm": "להשתיק",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "להתעלם מהתראות מא.נשים שאינם עוקביך?",
   "ignore_notifications_modal.not_following_title": "להתעלם מהתראות מא.נשים שאינם נעקביך?",
   "ignore_notifications_modal.private_mentions_title": "להתעלם מהתראות מאיזכורים פרטיים?",
+  "info_button.label": "עזרה",
+  "info_button.what_is_alt_text": "<h1>מהו כיתוב חלופי?</h1> <p>כיתוב חלופי משמש תיאור מילולי של תמונות לסובלים ממגבלות ראיה, חיבורי רשת איטיים, או אלו הצריכים הקשר יותר מפורט לתוכן המולטימדיה המצורף.</p> <p>ניתן לשפר את הנגישות והבנת התוכן לכולם ע\"י כתיבת תיאור ברור, תמציתי ונטול פניות.</p> <ul> <li>כיסוי היסודות החשובים</li> <li>סיכום המלל שבתמונות</li> <li>שימוש במבנה משפטים רגיל</li> <li>יש להמנע מחזרה על מידע</li> <li>אם העזרים הויזואליים הם דיאגרמות או מפות, התמקדו במגמות וממצאים מרכזיים.</li> </ul>",
   "interaction_modal.action.favourite": "כדי להמשיך, עליך לחבב מחשבונך.",
   "interaction_modal.action.follow": "כדי להמשיך, עליך לעקוב מחשבונך.",
   "interaction_modal.action.reblog": "כדי להמשיך, עליך להדהד מחשבונך.",
@@ -875,26 +888,12 @@
   "upload_button.label": "הוספת מדיה",
   "upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
-  "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
-  "upload_form.description": "תיאור לכבדי ראיה",
   "upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
   "upload_form.drag_and_drop.on_drag_cancel": "הגרירה בוטלה. קובץ המדיה {item} נעזב.",
   "upload_form.drag_and_drop.on_drag_end": "קובץ המדיה {item} נעזב.",
   "upload_form.drag_and_drop.on_drag_over": "קובץ המדיה {item} הוזז.",
   "upload_form.drag_and_drop.on_drag_start": "קובץ המדיה {item} נבחר.",
   "upload_form.edit": "עריכה",
-  "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
-  "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
-  "upload_modal.analyzing_picture": "מנתח תמונה…",
-  "upload_modal.apply": "החל",
-  "upload_modal.applying": "מחיל…",
-  "upload_modal.choose_image": "בחר/י תמונה",
-  "upload_modal.description_placeholder": "עטלף אבק נס דרך מזגן שהתפוצץ כי חם",
-  "upload_modal.detect_text": "זהה טקסט מתמונה",
-  "upload_modal.edit_media": "עריכת מדיה",
-  "upload_modal.hint": "הקליקי או גררי את המעגל על גבי התצוגה המקדימה על מנת לבחור בנקודת המוקד שתראה תמיד בכל התמונות הממוזערות.",
-  "upload_modal.preparing_ocr": "מכין OCR…",
-  "upload_modal.preview_label": "תצוגה ({ratio})",
   "upload_progress.label": "עולה...",
   "upload_progress.processing": "מעבד…",
   "username.taken": "שם המשתמש הזה תפוס. נסו אחר",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 5d341796c1..10c5356719 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -479,12 +479,7 @@
   "tabs_bar.home": "होम",
   "tabs_bar.notifications": "सूचनाएँ",
   "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.edit": "संशोधन करें",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.apply": "लागू करें",
-  "upload_modal.edit_media": "मीडिया में संशोधन करें",
   "upload_progress.label": "अपलोडिंग...",
   "video.download": "फाइल डाउनलोड करें"
 }
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index e402187491..c4afdec3ab 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -474,20 +474,7 @@
   "upload_button.label": "Dodajte slike, video ili audio datoteku",
   "upload_error.limit": "Ograničenje prijenosa datoteka je prekoračeno.",
   "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.edit": "Uredi",
-  "upload_form.thumbnail": "Promijeni pretpregled",
-  "upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
-  "upload_modal.analyzing_picture": "Analiza slike…",
-  "upload_modal.apply": "Primijeni",
-  "upload_modal.applying": "Primjenjivanje…",
-  "upload_modal.choose_image": "Odaberite sliku",
-  "upload_modal.description_placeholder": "Gojazni đačić s biciklom drži hmelj i finu vatu u džepu nošnje",
-  "upload_modal.detect_text": "Detektiraj tekst sa slike",
-  "upload_modal.edit_media": "Uređivanje medija",
-  "upload_modal.preparing_ocr": "Pripremam OCR…",
-  "upload_modal.preview_label": "Pretpregled ({ratio})",
   "upload_progress.label": "Prenošenje...",
   "upload_progress.processing": "Obrada…",
   "video.close": "Zatvori video",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 847f7871fa..960f6b535b 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Váratlan hiba történt.",
   "alert.unexpected.title": "Hoppá!",
   "alt_text_badge.title": "Helyettesítő szöveg",
+  "alt_text_modal.add_alt_text": "Helyettesítő szöveg hozzáadása",
+  "alt_text_modal.add_text_from_image": "Szöveg hozzáadása a képből",
+  "alt_text_modal.cancel": "Mégse",
+  "alt_text_modal.change_thumbnail": "Bélyegkép megváltoztatása",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Írd le a hallássérültek számára…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Írd le a látássérültek számára…",
+  "alt_text_modal.done": "Kész",
   "announcement.announcement": "Közlemény",
   "annual_report.summary.archetype.booster": "A cool-vadász",
   "annual_report.summary.archetype.lurker": "A settenkedő",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
   "confirmations.logout.title": "Kijelentkezel?",
+  "confirmations.missing_alt_text.confirm": "Helyettesítő szöveg hozzáadása",
+  "confirmations.missing_alt_text.message": "A bejegyzés helyettesítő szöveg nélküli médiát tartalmaz. A leírások hozzáadása segít a tartalom akadálymentesebbé tételében.",
+  "confirmations.missing_alt_text.secondary": "Közzététel mindenképpen",
+  "confirmations.missing_alt_text.title": "Helyettesítő szöveg hozzáadása?",
   "confirmations.mute.confirm": "Némítás",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Nem követőktől érkező értesítések figyelmen kívül hagyása?",
   "ignore_notifications_modal.not_following_title": "Nem követettektől érkező értesítések figyelmen kívül hagyása?",
   "ignore_notifications_modal.private_mentions_title": "Figyelmen kívül hagyod a kéretlen privát említéseket?",
+  "info_button.label": "Súgó",
+  "info_button.what_is_alt_text": "<h1>Mi az alternatív szöveg?</h1> <p>Az alternatív szöveg képleírást biztosít a látássérültek, az alacsony sávszélességű kapcsolatokkal rendelkezők, illetve a bővebb kontextust keresők számára.</p> <p>Az egyértelmű, tömör és objektív alternatív szöveg megírásával mindenki számára akadálymentesebb és könnyebben érthető lesz.</p> <ul> <li>Rögzítsd a fontos elemeket.</li> <li>Foglald össze szövegesen a képeket.</li> <li>Használj szabályos mondatszerkezetet.</li> <li>Kerüld a felesleges információkat.</li> <li>Összetett vizuális ábrákon (például diagramokon vagy térképeken) összpontosíts a trendekre és a legfontosabb megállapításokra.</li> </ul>",
   "interaction_modal.action.favourite": "A folytatáshoz a fiókodból kell kedvencnek jelölnöd.",
   "interaction_modal.action.follow": "A folytatáshoz a fiókodból kell követned.",
   "interaction_modal.action.reblog": "A folytatáshoz a fiókodból kell megosztanod.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Képek, videó vagy audiófájl hozzáadása",
   "upload_error.limit": "A fájlfeltöltési korlát elérésre került.",
   "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.drag_and_drop.instructions": "Egy médiamelléklet kiválasztásához nyomj Szóközt vagy Entert. Húzás közben használd a nyílgombokat a médiamelléklet adott irányba történő mozgatásához. A médiamelléklet új pozícióba helyezéséhez nyomd meg a Szóközt vagy az Entert, vagy a megszakításhoz nyomd meg az Esc gombot.",
   "upload_form.drag_and_drop.on_drag_cancel": "Az áthúzás megszakítva. A(z) {item} médiamelléklet el lett dobva.",
   "upload_form.drag_and_drop.on_drag_end": "A(z) {item} médiamelléklet el lett dobva.",
   "upload_form.drag_and_drop.on_drag_over": "A(z) {item} médiamelléklet át lett helyezve.",
   "upload_form.drag_and_drop.on_drag_start": "A(z) {item} médiamelléklet fel lett véve.",
   "upload_form.edit": "Szerkesztés",
-  "upload_form.thumbnail": "Bélyegkép megváltoztatása",
-  "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",
-  "upload_modal.applying": "Alkalmazás…",
-  "upload_modal.choose_image": "Kép kiválasztása",
-  "upload_modal.description_placeholder": "A gyors, barna róka átugrik a lusta kutya fölött",
-  "upload_modal.detect_text": "Szöveg felismerése a képről",
-  "upload_modal.edit_media": "Média szerkesztése",
-  "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.processing": "Feldolgozás…",
   "username.taken": "Ez a felhasználónév foglalt. Válassz másikat.",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 664c6dd31f..7786e41f6a 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -464,21 +464,7 @@
   "upload_button.label": "Աւելացնել մեդիա",
   "upload_error.limit": "Նիշքի վերբեռնման սահմանաչափը գերազանցուած է։",
   "upload_error.poll": "Հարցումների հետ նիշք կցել հնարաւոր չէ։",
-  "upload_form.audio_description": "Նկարագրիր ձայնագրութեան բովանդակութիւնը լսողական խնդիրներով անձանց համար",
-  "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
-  "upload_form.thumbnail": "Փոխել պատկերակը",
-  "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
-  "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
-  "upload_modal.apply": "Կիրառել",
-  "upload_modal.applying": "Կիրառւում է...",
-  "upload_modal.choose_image": "Ընտրել նկար",
-  "upload_modal.description_placeholder": "Բել դղեակի ձախ ժամն օֆ ազգութեանը ցպահանջ չճշտած վնաս էր եւ փառք։",
-  "upload_modal.detect_text": "Յայտնաբերել տեքստը նկարից",
-  "upload_modal.edit_media": "Խմբագրել մեդիան",
-  "upload_modal.hint": "Սեղմէք եւ տեղաշարժէք նախադիտման շրջանակը՝ որ ընտրէք մանրապատկերում միշտ տեսանելի կէտը։",
-  "upload_modal.preparing_ocr": "Գրաճանաչման նախապատրաստում…",
-  "upload_modal.preview_label": "Նախադիտում ({ratio})",
   "upload_progress.label": "Վերբեռնվում է…",
   "upload_progress.processing": "Մշակուում է...",
   "video.close": "Փակել  տեսագրութիւնը",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9125ce641b..90032b46ad 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Un error inexpectate ha occurrite.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Texto alternative",
+  "alt_text_modal.add_alt_text": "Adder texto alternative",
+  "alt_text_modal.add_text_from_image": "Adder texto ab imagine",
+  "alt_text_modal.cancel": "Cancellar",
+  "alt_text_modal.change_thumbnail": "Cambiar le miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Describe isto pro personas con impedimentos auditive…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Describe isto pro personas con impedimentos visual…",
+  "alt_text_modal.done": "Preste",
   "announcement.announcement": "Annuncio",
   "annual_report.summary.archetype.booster": "Le impulsator",
   "annual_report.summary.archetype.lurker": "Le lector",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.logout.title": "Clauder session?",
+  "confirmations.missing_alt_text.confirm": "Adder texto alternative",
+  "confirmations.missing_alt_text.message": "Tu message contine multimedia sin texto alternative. Adder descriptiones adjuta a render tu contento accessibile a plus personas.",
+  "confirmations.missing_alt_text.secondary": "Publicar totevia",
+  "confirmations.missing_alt_text.title": "Adder texto alternative?",
   "confirmations.mute.confirm": "Silentiar",
   "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.",
@@ -380,7 +391,7 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} hodie",
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Non sequer plus le hashtag",
-  "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
+  "hashtags.and_other": "…e {count, plural, one {un altere} other {# alteres}}",
   "hints.profiles.followers_may_be_missing": "Le sequitores de iste profilo pote mancar.",
   "hints.profiles.follows_may_be_missing": "Le profilos sequite per iste profilo pote mancar.",
   "hints.profiles.posts_may_be_missing": "Alcun messages de iste profilo pote mancar.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificationes de personas qui non te seque?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificationes de personas que tu non seque?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificationes de mentiones private non requestate?",
+  "info_button.label": "Adjuta",
+  "info_button.what_is_alt_text": "<h1>Que es texto alternative?</h1><p>Le texto alternative forni descriptiones de imagines a personas con impedimentos visual, con connexiones lente, o qui cerca contexto additional.</p><p>Tu pote meliorar le accessibilitate e le comprension pro totes scribente un texto alternative clar, concise e objective.</p><ul><li>Captura le elementos importante</li><li>Summarisa texto in imagines</li><li>Usa le structura de phrase normal</li><li>Evita information redundante</li><li>In figuras complexe (como diagrammas o mappas), concentra te sur le tendentias e punctos clave</li></ul>",
   "interaction_modal.action.favourite": "Per favor reveni a tu conto pro marcar isto como favorite.",
   "interaction_modal.action.follow": "Per favor reveni a tu conto pro sequer.",
   "interaction_modal.action.reblog": "Per favor reveni a tu conto pro impulsar.",
@@ -821,7 +834,7 @@
   "status.load_more": "Cargar plus",
   "status.media.open": "Clicca pro aperir",
   "status.media.show": "Clicca pro monstrar",
-  "status.media_hidden": "Medios celate",
+  "status.media_hidden": "Contento multimedial celate",
   "status.mention": "Mentionar @{name}",
   "status.more": "Plus",
   "status.mute": "Silentiar @{name}",
@@ -875,26 +888,12 @@
   "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.drag_and_drop.instructions": "Pro prender un annexo multimedial, preme sur le barra de spatios o Enter. Trahente lo, usa le claves de flecha pro displaciar le annexo multimedial in un certe direction. Preme le barra de spatios o Enter de novo pro deponer le annexo multimedial in su nove position, o preme sur Escape pro cancellar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le displaciamento ha essite cancellate. Le annexo multimedial {item} ha essite deponite.",
   "upload_form.drag_and_drop.on_drag_end": "Le annexo multimedial {item} ha essite deponite.",
   "upload_form.drag_and_drop.on_drag_over": "Le annexo multimedial {item} ha essite displaciate.",
   "upload_form.drag_and_drop.on_drag_start": "Le annexo multimedial {item} ha essite prendite.",
   "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.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
-  "upload_modal.detect_text": "Deteger texto de un imagine",
-  "upload_modal.edit_media": "Modificar multimedia",
-  "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",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 259723777f..beb060eb79 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -601,21 +601,7 @@
   "upload_button.label": "Tambahkan media",
   "upload_error.limit": "Batas unggah berkas terlampaui.",
   "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.edit": "Sunting",
-  "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
-  "upload_modal.analyzing_picture": "Analisis gambar…",
-  "upload_modal.apply": "Terapkan",
-  "upload_modal.applying": "Menerapkan…",
-  "upload_modal.choose_image": "Pilih gambar",
-  "upload_modal.description_placeholder": "Muharjo seorang xenofobia universal yang takut pada warga jazirah, contohnya Qatar",
-  "upload_modal.detect_text": "Deteksi teks pada gambar",
-  "upload_modal.edit_media": "Sunting media",
-  "upload_modal.hint": "Klik atau seret lingkaran pada pratinjau untuk memilih titik fokus yang akan ditampilkan pada semua gambar kecil.",
-  "upload_modal.preparing_ocr": "Menyiapkan OCR…",
-  "upload_modal.preview_label": "Pratinjau ({ratio})",
   "upload_progress.label": "Mengunggah...",
   "upload_progress.processing": "Memproses…",
   "video.close": "Tutup video",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index ae9620ee2f..b04c951de6 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -696,21 +696,7 @@
   "upload_button.label": "Adjunter images, un video o un audio-file",
   "upload_error.limit": "Límite de medie-cargationes transpassat.",
   "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.edit": "Redacter",
-  "upload_form.thumbnail": "Changear previsual image",
-  "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",
-  "upload_modal.applying": "Aplicant…",
-  "upload_modal.choose_image": "Selecter image",
-  "upload_modal.description_placeholder": "Li Europan lingues es membres del sam familie. Lor separat existentie es un mite",
-  "upload_modal.detect_text": "Detecter text del image",
-  "upload_modal.edit_media": "Redacter medie",
-  "upload_modal.hint": "Clicca o trena li circul por selecter li focal punctu quel va esser sempre visibil in omni previse-images.",
-  "upload_modal.preparing_ocr": "Preparant OCR…",
-  "upload_modal.preview_label": "Previse ({ratio})",
   "upload_progress.label": "Cargant...",
   "upload_progress.processing": "Tractant…",
   "username.taken": "Ti usator-nómine es ja prendet. Trova altri",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 6351ca2d52..07110813f9 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -149,9 +149,5 @@
   "tabs_bar.notifications": "Nziọkwà",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "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.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 a87e4bbb2a..c69c5b801a 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -790,26 +790,12 @@
   "upload_button.label": "Adjuntar kontenajo",
   "upload_error.limit": "Failadcharglimito ecesesis.",
   "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.drag_and_drop.instructions": "Por tenar mediatachajo, presez spaco o eniro. Presez spaco o eniro itere por destenar la mediatachajo en olua nova loko, o presez eskapo por anular.",
   "upload_form.drag_and_drop.on_drag_cancel": "Tiro anulesis. Mediatachajo {item} destenesis.",
   "upload_form.drag_and_drop.on_drag_end": "Mediatachajo {item} destenesis.",
   "upload_form.drag_and_drop.on_drag_over": "Mediatachajo {item} movigesis.",
   "upload_form.drag_and_drop.on_drag_start": "Tenis mediatachajo {item}.",
   "upload_form.edit": "Modifikez",
-  "upload_form.thumbnail": "Chanjez imajeto",
-  "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
-  "upload_modal.analyzing_picture": "Analizas imajo…",
-  "upload_modal.apply": "Aplikez",
-  "upload_modal.applying": "Aplikas…",
-  "upload_modal.choose_image": "Selektez imajo",
-  "upload_modal.description_placeholder": "Rapida bruna foxo saltas super la indolenta hundo",
-  "upload_modal.detect_text": "Deskovrez texto de imajo",
-  "upload_modal.edit_media": "Modifikez medii",
-  "upload_modal.hint": "Kliktez o tirez cirklo che prevido por selektar centrala punto quo sempre montresas kun omna imajeti.",
-  "upload_modal.preparing_ocr": "Preparas OCR…",
-  "upload_modal.preview_label": "Previdez ({ratio})",
   "upload_progress.label": "Kargante...",
   "upload_progress.processing": "Traktante…",
   "username.taken": "Ta uzantnomo ja es posedita. Provez altro",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 9a5c287f1c..7feac4b063 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Upp kom óvænt villa.",
   "alert.unexpected.title": "Úbbs!",
   "alt_text_badge.title": "Hjálpartexti mynda",
+  "alt_text_modal.add_alt_text": "Bæta við hjálpartexta",
+  "alt_text_modal.add_text_from_image": "Bæta við texta úr mynd",
+  "alt_text_modal.cancel": "Hætta við",
+  "alt_text_modal.change_thumbnail": "Skipta um smámynd",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Lýstu þessu fyrir fólk með skerta heyrn…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Lýstu þessu fyrir fólk með skerta sjón…",
+  "alt_text_modal.done": "Lokið",
   "announcement.announcement": "Auglýsing",
   "annual_report.summary.archetype.booster": "Svali gaurinn",
   "annual_report.summary.archetype.lurker": "Lurkurinn",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.logout.title": "Skrá út?",
+  "confirmations.missing_alt_text.confirm": "Bæta við hjálpartexta",
+  "confirmations.missing_alt_text.message": "Færslan þín inniheldur myndefni án ALT-hjálpartexta. Ef þú bætir við lýsingu á myndefninu gerir það efnið þitt aðgengilegt fyrir fleira fólk.",
+  "confirmations.missing_alt_text.secondary": "Birta samt",
+  "confirmations.missing_alt_text.title": "Bæta við hjálpartexta?",
   "confirmations.mute.confirm": "Þagga",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Hunsa tilkynningar frá fólki sem fylgist ekki með þér?",
   "ignore_notifications_modal.not_following_title": "Hunsa tilkynningar frá fólki sem þú fylgist ekki með?",
   "ignore_notifications_modal.private_mentions_title": "Hunsa tilkynningar frá óumbeðnum tilvísunum í einkaspjalli?",
+  "info_button.label": "Hjálp",
+  "info_button.what_is_alt_text": "<h1>Hvað er alt-texti?</h1> <p>Hjálpartexti eða ALT-myndatexti inniheldur lýsingu á myndefni fyrir fólk með ýmsar gerðir sjónskerðingar, fyrir tengingar með litla bandbreidd, eða til að gefa nánara samhengi fyrir myndefni.</p><p>Þú getur með þessu bætt almennt aðgengi og aukið skilning á efni sem þú birtir með því að skrifa skýran, skorinortan og hlutlægan alt-texta til vara.</p><ul><li>Lýstu mikilvægum atriðum</li>\\n<li>Hafðu yfirlit með þeim texta sem sést í myndum</li><li>Notaðu eðlilega setningaskipan</li><li>Forðastu óþarfar upplýsingar</li><li>Leggðu áherslu á aðalatriði í flóknu myndefni (eins og línuritum eða landakortum)</li></ul>",
   "interaction_modal.action.favourite": "Til að halda áfram þarftu að setja eitthvað í eftirlæti, verandi inni á aðgangnum þínum.",
   "interaction_modal.action.follow": "Til að halda áfram þarftu að fylgjast með einhverjum, verandi inni á aðgangnum þínum.",
   "interaction_modal.action.reblog": "Til að halda áfram þarftu að endurbirta frá einhverjum, verandi inni á aðgangnum þínum.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Bæta við myndum, myndskeiði eða hljóðskrá",
   "upload_error.limit": "Fór yfir takmörk á innsendingum skráa.",
   "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.drag_and_drop.instructions": "Til að taka í myndefnisviðhengi skaltu ýta á bilslána eða Enter. Til að draga geturðu notað örvalyklana til að færa viðhengið í samsvarandi áttir. Ýttu aftur á bilslána eða Enter til að sleppa viðhenginu á nýja staðinn, eða ýttu á Escape til að hætta við.",
   "upload_form.drag_and_drop.on_drag_cancel": "Hætt var við að draga. Myndefnisviðhenginu {item} var sleppt.",
   "upload_form.drag_and_drop.on_drag_end": "Myndefnisviðhenginu {item} var sleppt.",
   "upload_form.drag_and_drop.on_drag_over": "Myndefnisviðhengið {item} var fært.",
   "upload_form.drag_and_drop.on_drag_start": "Tók í myndefnisviðhengið {item}.",
   "upload_form.edit": "Breyta",
-  "upload_form.thumbnail": "Skipta um smámynd",
-  "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",
-  "upload_modal.applying": "Beiti…",
-  "upload_modal.choose_image": "Veldu mynd",
-  "upload_modal.description_placeholder": "Öllum dýrunum í skóginum þætti bezt að vera vinir",
-  "upload_modal.detect_text": "Skynja texta úr mynd",
-  "upload_modal.edit_media": "Breyta myndskrá",
-  "upload_modal.hint": "Smelltu eða dragðu til hringinn á forskoðuninni til að velja miðpunktinn sem verður alltaf sýnilegastur á öllum smámyndum.",
-  "upload_modal.preparing_ocr": "Undirbý OCR-ljóslestur…",
-  "upload_modal.preview_label": "Forskoðun ({ratio})",
   "upload_progress.label": "Er að senda inn...",
   "upload_progress.processing": "Meðhöndla…",
   "username.taken": "Þetta notandanafn er frátekið. Prófaðu eitthvað annað",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index aa58c34687..67acddb446 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Server moderati",
-  "about.contact": "Contatto:",
+  "about.contact": "Contatti:",
   "about.disclaimer": "Mastodon è un software libero e open-source e un marchio di Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Motivo non disponibile",
   "about.domain_blocks.preamble": "Mastodon, generalmente, ti consente di visualizzare i contenuti e interagire con gli utenti da qualsiasi altro server nel fediverso. Queste sono le eccezioni che sono state fatte su questo particolare server.",
@@ -39,7 +39,7 @@
   "account.following_counter": "{count, plural, one {{counter} segui} other {{counter} segui}}",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.go_to_profile": "Vai al profilo",
-  "account.hide_reblogs": "Nascondi potenziamenti da @{name}",
+  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
   "account.in_memoriam": "In memoria.",
   "account.joined_short": "Iscritto",
   "account.languages": "Modifica le lingue d'iscrizione",
@@ -61,7 +61,7 @@
   "account.requested": "In attesa d'approvazione. Clicca per annullare la richiesta di seguire",
   "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.share": "Condividi il profilo di @{name}",
-  "account.show_reblogs": "Mostra potenziamenti da @{name}",
+  "account.show_reblogs": "Mostra condivisioni da @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} post}}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Sblocca il dominio {domain}",
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Si è verificato un errore imprevisto.",
   "alert.unexpected.title": "Oops!",
   "alt_text_badge.title": "Testo alternativo",
+  "alt_text_modal.add_alt_text": "Aggiungi testo alternativo",
+  "alt_text_modal.add_text_from_image": "Aggiungi testo dall'immagine",
+  "alt_text_modal.cancel": "Annulla",
+  "alt_text_modal.change_thumbnail": "Cambia la miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descrivi questo per le persone con disturbi dell'udito…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Descrivi questo per le persone con disabilità visive…",
+  "alt_text_modal.done": "Fatto",
   "announcement.announcement": "Annuncio",
   "annual_report.summary.archetype.booster": "Cacciatore/trice di tendenze",
   "annual_report.summary.archetype.lurker": "L'osservatore/trice",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.logout.title": "Uscire?",
+  "confirmations.missing_alt_text.confirm": "Aggiungi testo alternativo",
+  "confirmations.missing_alt_text.message": "Il tuo post contiene media senza testo alternativo. L'aggiunta di descrizioni aiuta a rendere i tuoi contenuti accessibili a più persone.",
+  "confirmations.missing_alt_text.secondary": "Pubblica comunque",
+  "confirmations.missing_alt_text.title": "Aggiungere testo alternativo?",
   "confirmations.mute.confirm": "Silenzia",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignorare le notifiche delle persone che non ti seguono?",
   "ignore_notifications_modal.not_following_title": "Ignorare le notifiche delle persone che non segui?",
   "ignore_notifications_modal.private_mentions_title": "Ignorare le notifiche provenienti da menzioni private indesiderate?",
+  "info_button.label": "Aiuto",
+  "info_button.what_is_alt_text": "<h1>Cos'è il testo alternativo?</h1> <p>Il testo alternativo fornisce descrizioni delle immagini per le persone con disturbi della vista, connessioni a bassa larghezza di banda o per coloro che cercano un contesto aggiuntivo.</p> <p>È possibile migliorare l'accessibilità e la comprensione per tutti scrivendo un testo alt chiaro, conciso e obiettivo.</p> <ul> <li>Cattura elementi importanti</li> <li>Riassume il testo nelle immagini</li> <li>Usa la struttura delle frasi regolari</li> <li>Evita le informazioni ridondanti</li> <li>Concentrati sulle tendenze e i risultati chiave in immagini complesse (come diagrammi o mappe)</li> </ul>",
   "interaction_modal.action.favourite": "Per continuare, devi aggiungere ai preferiti il ​​tuo account.",
   "interaction_modal.action.follow": "Per continuare, devi seguire dal tuo account.",
   "interaction_modal.action.reblog": "Per continuare, devi condividere dal tuo account.",
@@ -689,7 +702,7 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
-  "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.additional": "",
   "privacy.unlisted.long": "Meno fanfare algoritmiche",
   "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
@@ -875,26 +888,12 @@
   "upload_button.label": "Aggiungi un file immagine, video o audio",
   "upload_error.limit": "Limite di caricamento dei file superato.",
   "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.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
   "upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
   "upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",
   "upload_form.drag_and_drop.on_drag_over": "L'allegato multimediale {item} è stato spostato.",
   "upload_form.drag_and_drop.on_drag_start": "L'allegato multimediale {item} è stato ricevuto.",
   "upload_form.edit": "Modifica",
-  "upload_form.thumbnail": "Cambia la miniatura",
-  "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
-  "upload_modal.analyzing_picture": "Analizzando l'immagine…",
-  "upload_modal.apply": "Applica",
-  "upload_modal.applying": "Applicazione…",
-  "upload_modal.choose_image": "Scegli l'immagine",
-  "upload_modal.description_placeholder": "Ma la volpe col suo balzo ha raggiunto il fiero Fido",
-  "upload_modal.detect_text": "Rileva il testo dall'immagine",
-  "upload_modal.edit_media": "Modifica il media",
-  "upload_modal.hint": "Clicca o trascina il cerchio sull'anteprima per scegliere il punto focale che sarà sempre visualizzato su tutte le miniature.",
-  "upload_modal.preparing_ocr": "Preparazione OCR…",
-  "upload_modal.preview_label": "Anteprima ({ratio})",
   "upload_progress.label": "Caricamento...",
   "upload_progress.processing": "Elaborazione…",
   "username.taken": "Quel nome utente è già in uso. Prova con un altro",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 926781b7f6..ea48d78e95 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "不明なエラーが発生しました。",
   "alert.unexpected.title": "エラー！",
   "alt_text_badge.title": "代替テキスト",
+  "alt_text_modal.add_alt_text": "代替テキストを追加",
+  "alt_text_modal.add_text_from_image": "画像からテキストを追加",
+  "alt_text_modal.cancel": "キャンセル",
+  "alt_text_modal.change_thumbnail": "サムネイルを変更",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "耳の不自由な方のために説明してください…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "目が不自由な方のために説明してください…",
+  "alt_text_modal.done": "完了",
   "announcement.announcement": "お知らせ",
   "annual_report.summary.archetype.booster": "トレンドハンター",
   "annual_report.summary.archetype.lurker": "ROM専",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
   "confirmations.logout.title": "ログアウトしようとしています",
+  "confirmations.missing_alt_text.confirm": "代替テキストを追加",
+  "confirmations.missing_alt_text.message": "あなたの投稿には大体テキストのないメディアが含まれています。説明文を追加することで、より多くの人がコンテンツにアクセスできるようになります。",
+  "confirmations.missing_alt_text.secondary": "そのまま投稿する",
+  "confirmations.missing_alt_text.title": "代替テキストを追加しますか？",
   "confirmations.mute.confirm": "ミュート",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "本当に「フォローされていないアカウントからの通知」を無視するようにしますか？",
   "ignore_notifications_modal.not_following_title": "本当に「フォローしていないアカウントからの通知」を無視するようにしますか？",
   "ignore_notifications_modal.private_mentions_title": "本当に「外部からの非公開の返信」を無視するようにしますか？",
+  "info_button.label": "ヘルプ",
+  "info_button.what_is_alt_text": "<h1>代替テキストとは何ですか？</h1> <p>代替テキストは、視覚障害、低速ネットワーク接続の人や追加コンテンツを求める人に役立つ画像説明です。</p> <p>明確、簡潔、客観的に記述することでアクセシビリティが向上し、より多くの人に理解されるようになります。</p> <ul> <li>要点をとらえる</li> <li>画像内のテキストを要約する</li> <li>平易な文章で説明する</li> <li>情報の重複を避ける</li> <li>複雑な内容 (図や地図など) では傾向やポイントを見つける</li> </ul>",
   "interaction_modal.action.favourite": "お気に入り登録はあなたのアカウントがあるサーバーで行う必要があります。",
   "interaction_modal.action.follow": "ユーザーをフォローするには、あなたのアカウントがあるサーバーからフォローする必要があります。",
   "interaction_modal.action.reblog": "投稿をブーストするには、あなたのアカウントがあるサーバーでブーストする必要があります。",
@@ -457,6 +470,7 @@
   "keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
   "keyboard_shortcuts.toggle_sensitivity": "非表示のメディアを見る/隠す",
   "keyboard_shortcuts.toot": "新規投稿",
+  "keyboard_shortcuts.translate": "投稿を翻訳する",
   "keyboard_shortcuts.unfocus": "投稿の入力欄・検索欄から離れる",
   "keyboard_shortcuts.up": "カラム内一つ上に移動",
   "lightbox.close": "閉じる",
@@ -836,6 +850,7 @@
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
   "status.remove_bookmark": "ブックマークを削除",
+  "status.remove_favourite": "お気に入りから削除",
   "status.replied_in_thread": "ほかのユーザーへ",
   "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",
@@ -873,26 +888,12 @@
   "upload_button.label": "メディアを追加 (複数の画像または1つの動画か音声ファイル)",
   "upload_error.limit": "アップロードできる上限を超えています。",
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
-  "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
-  "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
   "upload_form.drag_and_drop.instructions": "メディア添付ファイルを選択するには、スペースキーまたはエンターキーを押してください。ドラッグ中は、矢印キーを使ってメディア添付ファイルを任意の方向に移動できます。再度スペースキーまたはエンターキーを押すと新しい位置にメディア添付ファイルをドロップできます。キャンセルするにはエスケープキーを押してください。",
   "upload_form.drag_and_drop.on_drag_cancel": "ドラッグがキャンセルされました。メディア添付ファイル {item} がドロップされました。",
   "upload_form.drag_and_drop.on_drag_end": "メディア添付ファイル {item} がドロップされました。",
   "upload_form.drag_and_drop.on_drag_over": "メディア添付ファイル {item} が移動されました。",
   "upload_form.drag_and_drop.on_drag_start": "メディア添付ファイル {item} を選択しました。",
   "upload_form.edit": "編集",
-  "upload_form.thumbnail": "サムネイルを変更",
-  "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
-  "upload_modal.analyzing_picture": "画像を解析中…",
-  "upload_modal.apply": "適用",
-  "upload_modal.applying": "適用中...",
-  "upload_modal.choose_image": "画像を選択",
-  "upload_modal.description_placeholder": "あのイーハトーヴォのすきとおった風",
-  "upload_modal.detect_text": "画像からテキストを検出",
-  "upload_modal.edit_media": "メディアを編集",
-  "upload_modal.hint": "サムネイルの焦点にしたい場所をクリックするか円形の枠をその場所にドラッグしてください。",
-  "upload_modal.preparing_ocr": "OCRの準備中…",
-  "upload_modal.preview_label": "プレビュー ({ratio})",
   "upload_progress.label": "アップロード中...",
   "upload_progress.processing": "処理中…",
   "username.taken": "このユーザー名はすでに使用されています。ほかのユーザー名を入力してください",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index b1832888c5..d1587e1c2c 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -228,9 +228,6 @@
   "ui.beforeunload": "თქვენი დრაფტი გაუქმდება თუ დატოვებთ მასტოდონს.",
   "upload_area.title": "გადმოწიეთ და ჩააგდეთ ასატვირთათ",
   "upload_button.label": "მედიის დამატება",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "იტვირთება...",
   "video.close": "ვიდეოს დახურვა",
   "video.exit_fullscreen": "სრულ ეკრანზე ჩვენების გათიშვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 5914b33c2a..8cdfe6df19 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -74,7 +74,10 @@
   "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
   "alert.unexpected.title": "Ayhuh!",
   "alt_text_badge.title": "Aḍris asegzan",
+  "alt_text_modal.cancel": "Semmet",
+  "alt_text_modal.done": "Immed",
   "announcement.announcement": "Ulɣu",
+  "annual_report.summary.most_used_hashtag.none": "Ula yiwen",
   "audio.hide": "Ffer amesli",
   "block_modal.show_less": "Ssken-d drus",
   "block_modal.show_more": "Ssken-d ugar",
@@ -100,9 +103,11 @@
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
+  "column.create_list": "Snulfu-d tabdart",
   "column.direct": "Tabdarin tusligin",
   "column.directory": "Inig deg imeɣna",
   "column.domain_blocks": "Taɣulin yeffren",
+  "column.edit_list": "Ẓreg tabdart",
   "column.favourites": "Imenyafen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
   "column.home": "Agejdan",
@@ -165,6 +170,7 @@
   "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
   "content_warning.hide": "Ffer tasuffeɣt",
   "content_warning.show": "Ssken-d akken tebɣu tili",
+  "content_warning.show_more": "Sken-d ugar",
   "conversation.delete": "Kkes adiwenni",
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
@@ -325,11 +331,20 @@
   "link_preview.author": "S-ɣur {name}",
   "link_preview.more_from_author": "Ugar sɣur {name}",
   "link_preview.shares": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
+  "lists.add_member": "Rnu",
+  "lists.add_to_list": "Rnu ɣer tebdart",
+  "lists.add_to_lists": "Rnu {name} ɣer tebdarin",
+  "lists.create": "Snulfu-d",
   "lists.delete": "Kkes tabdart",
   "lists.edit": "Ẓreg tabdart",
+  "lists.list_name": "Isem n tebdart",
+  "lists.new_list_name": "Isem n tebdart tamaynut",
+  "lists.remove_member": "Kkes",
   "lists.replies_policy.followed": "Kra n useqdac i yettwaḍefren",
   "lists.replies_policy.list": "Iɛeggalen n tebdart",
   "lists.replies_policy.none": "Ula yiwen·t",
+  "lists.save": "Sekles",
+  "lists.search": "Nadi",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d …",
   "media_gallery.hide": "Seggelmes",
@@ -399,6 +414,7 @@
   "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:",
+  "notifications.column_settings.group": "Agraw",
   "notifications.column_settings.mention": "Abdar:",
   "notifications.column_settings.poll": "Igemmaḍ n usenqed:",
   "notifications.column_settings.push": "Alɣuten yettudemmren",
@@ -429,6 +445,9 @@
   "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
   "notifications_permission_banner.enable": "Rmed alɣuten n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
+  "onboarding.follows.back": "Uɣal",
+  "onboarding.follows.done": "Immed",
+  "onboarding.follows.search": "Nadi",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
   "onboarding.profile.display_name_hint": "Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer…",
   "onboarding.profile.note": "Tameddurt",
@@ -524,6 +543,7 @@
   "search_results.accounts": "Imeɣna",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
+  "search_results.no_results": "Ulac igemmaḍ.",
   "search_results.see_all": "Wali-ten akk",
   "search_results.statuses": "Tisuffaɣ",
   "server_banner.active_users": "iseqdacen urmiden",
@@ -602,20 +622,7 @@
   "upload_button.label": "Rnu taɣwalt",
   "upload_error.limit": "Asali n ufaylu iεedda talast.",
   "upload_error.poll": "Ur ittusireg ara usali n ufaylu s tefranin.",
-  "upload_form.audio_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt",
-  "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
-  "upload_form.thumbnail": "Beddel tugna",
-  "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.applying": "Asnas…",
-  "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 amidya",
-  "upload_modal.preparing_ocr": "Aheyyi n OCR…",
-  "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
   "upload_progress.processing": "Asesfer…",
   "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index b3678806b3..b7552a2d3e 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -329,19 +329,7 @@
   "upload_button.label": "Медиа қосу (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Файл жүктеу лимитінен асып кеттіңіз.",
   "upload_error.poll": "Сауалнамамен бірге файл жүктеуге болмайды.",
-  "upload_form.audio_description": "Есту қабілеті нашар адамдарға сипаттама беріңіз",
-  "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
   "upload_form.edit": "Түзету",
-  "upload_form.thumbnail": "Суретті өзгерту",
-  "upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
-  "upload_modal.analyzing_picture": "Суретті анализ жасау…",
-  "upload_modal.apply": "Қолдану",
-  "upload_modal.choose_image": "Сурет таңдау",
-  "upload_modal.description_placeholder": "Щучинск съезіндегі өрт пе? Вагон-үй, аэромобиль һәм ұшақ фюзеляжы цехінен ғой",
-  "upload_modal.detect_text": "Суреттен мәтін анықтау",
-  "upload_modal.edit_media": "Медиафайлды өңдеу",
-  "upload_modal.hint": "Алдын-ала қарау шеңберін басыңыз немесе сүйреңіз, барлық нобайларда көрінетін фокусты таңдау үшін.",
-  "upload_modal.preview_label": "Превью ({ratio})",
   "upload_progress.label": "Жүктеп жатыр...",
   "video.close": "Видеоны жабу",
   "video.download": "Файлды түсіру",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index a5737627e2..c7ba9e3916 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -87,8 +87,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index abaf40931c..df61294e33 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "예상하지 못한 에러가 발생했습니다.",
   "alert.unexpected.title": "앗!",
   "alt_text_badge.title": "대체 문구",
+  "alt_text_modal.add_alt_text": "대체 텍스트 추가",
+  "alt_text_modal.add_text_from_image": "이미지에서 텍스트 추가",
+  "alt_text_modal.cancel": "취소",
+  "alt_text_modal.change_thumbnail": "썸네일 변경",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "청력 장애가 있는 사람들을 위한 설명을 작성하세요…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "시각 장애가 있는 사람들을 위한 설명을 작성하세요…",
+  "alt_text_modal.done": "완료",
   "announcement.announcement": "공지사항",
   "annual_report.summary.archetype.booster": "연쇄부스트마",
   "annual_report.summary.archetype.lurker": "은둔자",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.logout.title": "로그아웃 할까요?",
+  "confirmations.missing_alt_text.confirm": "대체 텍스트 추가",
+  "confirmations.missing_alt_text.message": "대체 텍스트가 없는 미디어를 포함하고 있습니다. 설명을 추가하면 더 많은 사람들이 내 콘텐츠에 접근할 수 있습니다.",
+  "confirmations.missing_alt_text.secondary": "그냥 게시하기",
+  "confirmations.missing_alt_text.title": "대체 텍스트를 추가할까요?",
   "confirmations.mute.confirm": "뮤트",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
@@ -407,6 +418,15 @@
   "ignore_notifications_modal.not_followers_title": "나를 팔로우하지 않는 사람들의 알림을 무시할까요?",
   "ignore_notifications_modal.not_following_title": "내가 팔로우하지 않는 사람들의 알림을 무시할까요?",
   "ignore_notifications_modal.private_mentions_title": "요청하지 않은 개인 멘션 알림을 무시할까요?",
+  "info_button.label": "도움말",
+  "info_button.what_is_alt_text": "<h1>대체 텍스트가 무었인가요?</h1> <p>대체 텍스트는 저시력자, 낮은 인터넷 대역폭 사용자, 더 자세한 문맥을 위해 이미지에 대한 설명을 제공하는 것입니다.</p> <p>깔끔하고 간결하고 객관적인 대체 텍스트를 작성해 모두가 이해하기 쉽게 만들고 접근성이 높아질 수 있습니다.</p><ul><li>중요한 요소에 중점을 두세요</li> <li>이미지 안의 글자를 요약하세요</li> <li>정형화된 문장 구조를 사용하세요</li> <li>중복된 정보를 피하세요</li> <li>복잡한 시각자료(도표나 지도 같은)에선 추세와 주요 결과에 중점을 두세요</li> </ul>",
+  "interaction_modal.action.favourite": "계속하려면 내 계정으로 즐겨찾기해야 합니다.",
+  "interaction_modal.action.follow": "계속하려면 내 계정으로 팔로우해야 합니다.",
+  "interaction_modal.action.reblog": "계속하려면 내 계정으로 리블로그해야 합니다.",
+  "interaction_modal.action.reply": "계속하려면 내 계정으로 답장해야 합니다.",
+  "interaction_modal.action.vote": "계속하려면 내 계정으로 투표해야 합니다.",
+  "interaction_modal.go": "이동",
+  "interaction_modal.no_account_yet": "아직 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
   "interaction_modal.title.favourite": "{name} 님의 게시물을 좋아하기",
@@ -830,6 +850,7 @@
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
   "status.remove_bookmark": "북마크 삭제",
+  "status.remove_favourite": "즐겨찾기에서 제거",
   "status.replied_in_thread": "글타래에 답장",
   "status.replied_to": "{name} 님에게",
   "status.reply": "답장",
@@ -867,26 +888,12 @@
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
-  "upload_form.audio_description": "청각장애인이나 저청각자를 위한 설명",
-  "upload_form.description": "시각장애인이나 저시력자를 위한 설명",
   "upload_form.drag_and_drop.instructions": "미디어 첨부파일을 집으려면 스페이스나 엔터를 누르세요. 드래그 하는 동안 방향키를 이용해 원하는 방향으로 이동할 수 있습니다. 스페이스나 엔터를 다시 눌러 새 위치에 놓거나 ESC를 이용해 취소할 수 있습니다.",
   "upload_form.drag_and_drop.on_drag_cancel": "드래그가 취소되었습니다. 미디어 첨부파일 {item}은 이동되지 않았습니다.",
   "upload_form.drag_and_drop.on_drag_end": "미디어 첨부파일 {item}은 이동되지 않았습니다.",
   "upload_form.drag_and_drop.on_drag_over": "미디어 첨부파일 {item}이 이동되었습니다.",
   "upload_form.drag_and_drop.on_drag_start": "미디어 첨부파일 {item}을 집었습니다.",
   "upload_form.edit": "수정",
-  "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.video_description": "청각장애인, 저청각자, 시각장애인, 저시력자를 위한 설명",
-  "upload_modal.analyzing_picture": "사진 분석 중…",
-  "upload_modal.apply": "적용",
-  "upload_modal.applying": "적용 중...",
-  "upload_modal.choose_image": "이미지 선택",
-  "upload_modal.description_placeholder": "다람쥐 헌 쳇바퀴 타고파",
-  "upload_modal.detect_text": "사진에서 문자 탐색",
-  "upload_modal.edit_media": "미디어 수정",
-  "upload_modal.hint": "미리보기를 클릭하거나 드래그 해서 초점을 맞추세요. 이 점은 썸네일에서 항상 보여질 부분을 나타냅니다.",
-  "upload_modal.preparing_ocr": "OCR 준비 중…",
-  "upload_modal.preview_label": "미리보기 ({ratio})",
   "upload_progress.label": "업로드 중...",
   "upload_progress.processing": "처리 중...",
   "username.taken": "이미 쓰인 사용자명입니다. 다른 것으로 시도해보세요",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index ccd0160ac2..3e543e938a 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -514,21 +514,7 @@
   "upload_button.label": "Wêne, vîdeoyek an jî pelê dengî tevlî bike",
   "upload_error.limit": "Sînora barkirina pelan derbas bû.",
   "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.edit": "Serrast bike",
-  "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "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",
-  "upload_modal.applying": "Tê sepandin…",
-  "upload_modal.choose_image": "Wêneyê hilbijêre",
-  "upload_modal.description_placeholder": "Rovîyek qehweyî û bilez li ser kûçikê tîral banz dide",
-  "upload_modal.detect_text": "Ji nivîsa wêneyê re serwext be",
-  "upload_modal.edit_media": "Medyayê sererast bike",
-  "upload_modal.hint": "Ji bo hilbijartina xala navendê her tim dîmenê piçûk de pêşdîtina çerxê bitikîne an jî kaş bike.",
-  "upload_modal.preparing_ocr": "OCR dihê amadekirin…",
-  "upload_modal.preview_label": "Pêşdîtin ({ratio})",
   "upload_progress.label": "Tê barkirin...",
   "upload_progress.processing": "Kar tê kirin…",
   "video.close": "Vîdyoyê bigire",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f2c911502..8197f01c66 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -331,20 +331,7 @@
   "upload_button.label": "Keworra skeusennow, gwydhyow po sonadow",
   "upload_error.limit": "Finweth ughkarga a veu gorfassys.",
   "upload_error.poll": "Nyns yw gesys ughkarga restrennow gans sondyansow.",
-  "upload_form.audio_description": "Deskrifewgh rag tus vodharek",
-  "upload_form.description": "Deskrifewgh rag tus dhallek",
   "upload_form.edit": "Golegi",
-  "upload_form.thumbnail": "Chanjya avenik",
-  "upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
-  "upload_modal.analyzing_picture": "Ow tytratya skeusen…",
-  "upload_modal.apply": "Gweytha",
-  "upload_modal.choose_image": "Dewis aven",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Kilela tekst a skeusen",
-  "upload_modal.edit_media": "Golegi myski",
-  "upload_modal.hint": "Klykkyewgh po tenna'n kylgh war an gynwel dhe dhewis an poynt fogella neb a vydh pupprys gweladow yn pub avenik.",
-  "upload_modal.preparing_ocr": "Ow pareusi ANG…",
-  "upload_modal.preview_label": "Kynwel ({ratio})",
   "upload_progress.label": "Owth ughkarga...",
   "video.close": "Degea gwydhyow",
   "video.download": "Iskarga restren",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index f3fba6757f..80f9a5a592 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -240,9 +240,7 @@
   "units.short.million": "{count} milionum",
   "units.short.thousand": "{count} millia",
   "upload_button.label": "Imaginēs, vīdeō aut fīle audītūs adde",
-  "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
-  "upload_modal.description_placeholder": "A velox brunneis vulpes salit super piger canis",
   "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 45d9852e9e..ed91aaccfe 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -747,21 +747,7 @@
   "upload_button.label": "Adjusta imajes, un video or una dosya audio",
   "upload_error.limit": "Limito de dosyas kargadas eksedido.",
   "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.edit": "Edita",
-  "upload_form.thumbnail": "Troka minyatura",
-  "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",
-  "upload_modal.applying": "Aplikando…",
-  "upload_modal.choose_image": "Eskoje imaje",
-  "upload_modal.description_placeholder": "Lorem ipsum dolor sit amet",
-  "upload_modal.detect_text": "Detektar teksto de la imaje",
-  "upload_modal.edit_media": "Edita multimedia",
-  "upload_modal.hint": "Klika o arrastra el sirkolo en la vista previa para eskojer el punto fokal ke siempre estara en vista en todas las minyaturas.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Kargando...",
   "upload_progress.processing": "Prosesando…",
   "username.taken": "Akel nombre de utilizador ya esta en uzo. Aprova otruno",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 3940aa630c..17541985fd 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Alternatyvus tekstas",
+  "alt_text_modal.add_alt_text": "Pridėti alternatyvųjį tekstą",
+  "alt_text_modal.add_text_from_image": "Pridėti tekstą iš vaizdo",
+  "alt_text_modal.cancel": "Atšaukti",
+  "alt_text_modal.change_thumbnail": "Keisti miniatiūrą",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Aprašykite tai klausos negalią turintiems asmenims…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Aprašykite tai regos sutrikimų turintiems asmenims…",
+  "alt_text_modal.done": "Atlikta",
   "announcement.announcement": "Skelbimas",
   "annual_report.summary.archetype.booster": "Šaunus medžiotojas",
   "annual_report.summary.archetype.lurker": "Stebėtojas",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.logout.title": "Atsijungti?",
+  "confirmations.missing_alt_text.confirm": "Pridėti alternatyvųjį tekstą",
+  "confirmations.missing_alt_text.message": "Jūsų įrašas turi mediją be alternatyvaus teksto. Pridėjus aprašymus, jūsų turinys taps pasiekiamas daugeliui asmenų.",
+  "confirmations.missing_alt_text.secondary": "Siųsti vis tiek",
+  "confirmations.missing_alt_text.title": "Pridėti alternatyvųjį tekstą?",
   "confirmations.mute.confirm": "Nutildyti",
   "confirmations.redraft.confirm": "Ištrinti ir iš naujo parengti",
   "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo? Bus prarasti mėgstami ir pasidalinimai, o atsakymai į originalų įrašą bus panaikinti.",
@@ -287,7 +298,7 @@
   "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": "Kol kas nėra užblokuotų serverių.",
-  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
+  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrinkite 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.",
@@ -403,6 +414,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignoruoti pranešimus iš žmonių, kurie tave neseka?",
   "ignore_notifications_modal.not_following_title": "Ignoruoti pranešimus iš žmonių, kuriuos neseki?",
   "ignore_notifications_modal.private_mentions_title": "Ignoruoti pranešimus iš neprašytų privačių paminėjimų?",
+  "info_button.label": "Žinynas",
+  "info_button.what_is_alt_text": "<h1>Kas yra alternatyvusis tekstas?</h1> <p>Alternatyvusis tekstas pateikia vaizdų aprašymus asmenims su regos sutrikimais, turintiems mažo pralaidumo ryšį arba ieškantiems papildomo konteksto.</p> <p>Galite pagerinti prieinamumą ir suprantamumą visiems, jei parašysite aiškų, glaustą ir objektyvų alternatyvųjį tekstą.</p> <ul> <li>Užfiksuokite svarbiausius elementus.</li> <li>Apibendrinkite tekstą vaizduose.</li> <li>Naudokite įprasta sakinio struktūrą.</li> <li>Venkite nereikalingos informacijos.</li> <li>Sutelkite dėmesį į tendencijas ir pagrindines išvadas sudėtinguose vaizdiniuose (tokiuose kaip diagramos ar žemėlapiai).</li> </ul>",
   "interaction_modal.action.favourite": "Kad tęstumėte, turite pamėgti iš savo paskyros.",
   "interaction_modal.action.follow": "Kad tęstumėte, turite sekti iš savo paskyros.",
   "interaction_modal.action.reblog": "Kad tęstumėte, turite pasidalinti iš savo paskyros.",
@@ -707,7 +720,7 @@
   "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
   "report.category.subtitle": "Pasirink geriausią atitikmenį.",
   "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}",
-  "report.category.title_account": "profilis",
+  "report.category.title_account": "profiliu",
   "report.category.title_status": "įrašas",
   "report.close": "Atlikta",
   "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?",
@@ -860,26 +873,12 @@
   "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.drag_and_drop.instructions": "Kad paimtum medijos priedą, paspausk tarpo arba įvedimo klavišą. Tempant naudok rodyklių klavišus, kad perkeltum medijos priedą bet kuria kryptimi. Dar kartą paspausk tarpo arba įvedimo klavišą, kad nuleistum medijos priedą naujoje vietoje, arba paspausk grįžimo klavišą, kad atšauktum.",
   "upload_form.drag_and_drop.on_drag_cancel": "Nutempimas buvo atšauktas. Medijos priedas {item} buvo nuleistas.",
   "upload_form.drag_and_drop.on_drag_end": "Medijos priedas {item} buvo nuleistas.",
   "upload_form.drag_and_drop.on_drag_over": "Medijos priedas {item} buvo perkeltas.",
   "upload_form.drag_and_drop.on_drag_start": "Paimtas medijos priedas {item}.",
   "upload_form.edit": "Redaguoti",
-  "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ą.",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 94c48453b7..0db471f19a 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -719,21 +719,7 @@
   "upload_button.label": "Pievienot bildi, video vai audio datni",
   "upload_error.limit": "Sasniegts datņu augšupielādes ierobežojums.",
   "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.edit": "Labot",
-  "upload_form.thumbnail": "Nomainīt sīktēlu",
-  "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",
-  "upload_modal.applying": "Pielieto…",
-  "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": "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})",
   "upload_progress.label": "Augšupielādē...",
   "upload_progress.processing": "Apstrādā…",
   "username.taken": "Šis lietotājvārds ir jau paņemts. Izmēģini citu",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 3dffd8b816..63851de700 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -228,8 +228,5 @@
   "time_remaining.moments": "Уште некои мига",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} {number, plural, one {остана} other {останаа}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 49f19f7b36..95da7b9970 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -397,18 +397,7 @@
   "upload_area.title": "അപ്‌ലോഡുചെയ്യാൻ വലിച്ചിടുക",
   "upload_button.label": "ഇമേജുകൾ, ഒരു വീഡിയോ അല്ലെങ്കിൽ ഓഡിയോ ഫയൽ ചേർക്കുക",
   "upload_error.limit": "ഫയൽ അപ്‌ലോഡ് പരിധി കവിഞ്ഞു.",
-  "upload_form.audio_description": "കേൾവിശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
-  "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.edit": "തിരുത്തുക",
-  "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
-  "upload_modal.apply": "പ്രയോഗിക്കുക",
-  "upload_modal.choose_image": "ചിത്രം തിരഞ്ഞെടുക്കുക",
-  "upload_modal.detect_text": "ചിത്രത്തിൽ നിന്ന് വാചകം കണ്ടെത്തുക",
-  "upload_modal.edit_media": "മീഡിയ തിരുത്തുക",
-  "upload_modal.preparing_ocr": "OCR തയ്യാറാക്കുന്നു…",
-  "upload_modal.preview_label": "പൂര്‍വ്വദൃശ്യം({ratio})",
   "upload_progress.label": "Uploading…",
   "video.close": "വീഡിയോ അടയ്ക്കുക",
   "video.download": "ഫയൽ ഇറക്കുവയ്ക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 9c4accb81b..94f9aef261 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -207,8 +207,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 108d0a9ed9..b934c3ea63 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -613,21 +613,7 @@
   "upload_button.label": "Tambah fail imej, video atau audio",
   "upload_error.limit": "Sudah melebihi had muat naik.",
   "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.edit": "Sunting",
-  "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
-  "upload_modal.analyzing_picture": "Menganalisis gambar…",
-  "upload_modal.apply": "Guna",
-  "upload_modal.applying": "Terapkan…",
-  "upload_modal.choose_image": "Pilih imej",
-  "upload_modal.description_placeholder": "Seekor rubah perang pantas melompat merentasi anjing yang pemalas",
-  "upload_modal.detect_text": "Kesan teks daripada gambar",
-  "upload_modal.edit_media": "Sunting media",
-  "upload_modal.hint": "Klik atau seret bulatan di pratonton untuk memilih titik tumpu yang akan kelihatan pada semua gambar kecil.",
-  "upload_modal.preparing_ocr": "Mempersiapkan OCR…",
-  "upload_modal.preview_label": "Pratonton ({ratio})",
   "upload_progress.label": "Memuat naik...",
   "upload_progress.processing": "Memproses…",
   "username.taken": "Nama pengguna tersebut sudah digunakan. Sila cuba lagi",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 947cf7cdb6..3d62c4329a 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -588,21 +588,7 @@
   "upload_button.label": "ပုံများ၊ ဗီဒီယို သို့မဟုတ် အသံဖိုင်တစ်ခု ထည့်ပါ",
   "upload_error.limit": "ဖိုင်အများဆုံးတင်နိုင်မည့်ကန့်သတ်ချက်ကို ကျော်သွားပါပြီ။",
   "upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
-  "upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_form.edit": "ပြင်ရန်",
-  "upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
-  "upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
-  "upload_modal.apply": "သုံးပါ",
-  "upload_modal.applying": "အသုံးချနေသည်...",
-  "upload_modal.choose_image": "ပုံရွေးပါ",
-  "upload_modal.description_placeholder": "သီဟိုဠ်မှ ဉာဏ်ကြီးရှင်သည် အာယုဝဍ္ဎနဆေးညွှန်းစာကို ဇလွန်ဈေးဘေး ဗာဒံပင်ထက် အဓိဋ္ဌာန်လျက် ဂဃနဏဖတ်ခဲ့သည်",
-  "upload_modal.detect_text": "ပုံမှစာသားကို ရှာဖွေပါ",
-  "upload_modal.edit_media": "မီဒီယာကို ပြင်ဆင်ရန်",
-  "upload_modal.hint": "ပုံသေးအားလုံးတွင် အမြဲတမ်းကြည့်ရှုနိုင်သည့် focal point ကို ရွေးချယ်ရန် Preview ပေါ်ရှိ စက်ဝိုင်းကို နှိပ်ပါ သို့မဟုတ် ဖိဆွဲပါ။",
-  "upload_modal.preparing_ocr": "OCR ပြင်ဆင်နေသည်…",
-  "upload_modal.preview_label": "({ratio}) အစမ်းကြည့်ရှုရန်",
   "upload_progress.label": "တင်နေသည်...",
   "upload_progress.processing": "လုပ်ဆောင်နေသည်…",
   "username.taken": "ထိုအသုံးပြုသူအမည်မှာ အသုံးပြုထားပြီးဖြစ်ပါသည်။ နောက်တစ်ခု စမ်းကြည့်ပါ",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index 22a7c507fc..13a11d2999 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "發生意外ê錯誤。.",
   "alert.unexpected.title": "Ai-ioh!",
   "alt_text_badge.title": "替代文字",
+  "alt_text_modal.add_alt_text": "加添說明文字",
+  "alt_text_modal.add_text_from_image": "Tuì圖加說明文字",
+  "alt_text_modal.cancel": "取消",
+  "alt_text_modal.change_thumbnail": "改縮小圖",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "請替聽有困難ê敘述tsit ê內容…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "請替看有困難ê敘述tsit ê內容…",
+  "alt_text_modal.done": "做好ah",
   "announcement.announcement": "公告",
   "annual_report.summary.archetype.booster": "追求趣味ê",
   "annual_report.summary.archetype.lurker": "有讀無PO ê",
@@ -131,6 +138,15 @@
   "bundle_modal_error.close": "關",
   "bundle_modal_error.message": "Tī載入tsit ê畫面ê時起錯誤。",
   "bundle_modal_error.retry": "Koh試",
+  "closed_registrations.other_server_instructions": "因為Mastodon非中心化，所以lí ē當tī別ê服侍器建立口座，iáu ē當kap tsit ê服侍器來往。",
+  "closed_registrations_modal.description": "Tann bē當tī {domain} 建立新ê口座，m̄-koh著記得，lí bô需要 {domain} 服侍器ê帳號，mā ē當用 Mastodon。",
+  "closed_registrations_modal.find_another_server": "Tshuē別ê服侍器",
+  "closed_registrations_modal.preamble": "因為Mastodon非中心化，所以bô論tī tá tsi̍t ê服侍器建立口座，lí lóng ē當跟tuè tsi̍t ê服侍器ê逐ê lâng，kap hām in交流。Lí iā ē當ka-tī起tsi̍t ê站！",
+  "closed_registrations_modal.title": "註冊 Mastodon ê口座",
+  "column.about": "概要",
+  "column.blocks": "封鎖ê用者",
+  "column.bookmarks": "冊籤",
+  "column.community": "本地ê時間線",
   "column.create_list": "建立列單",
   "column.direct": "私人ê提起",
   "column.directory": "瀏覽個人資料",
@@ -140,6 +156,16 @@
   "column.firehose": "Tsit-má ê動態",
   "column.follow_requests": "跟tuè請求",
   "column.home": "頭頁",
+  "column.list_members": "管理列單ê成員",
+  "column.lists": "列單",
+  "column.mutes": "消音ê用者",
+  "column.notifications": "通知",
+  "column.pins": "釘起來ê PO文",
+  "column.public": "聯邦ê時間線",
+  "column_back_button.label": "頂頁",
+  "column_header.hide_settings": "Khàm掉設定",
+  "column_header.moveLeft_settings": "Kā欄sak khah倒pîng",
+  "column_header.moveRight_settings": "Kā欄sak khah正pîng",
   "column_header.pin": "釘",
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "Pak掉",
@@ -155,7 +181,60 @@
   "compose.saved.body": "PO文儲存ah。",
   "compose_form.direct_message_warning_learn_more": "詳細資訊",
   "compose_form.encryption_warning": "Mastodon ê PO文無點tuì點加密。M̄通用Mastodon分享任何敏感ê資訊。",
+  "compose_form.hashtag_warning": "因為tsit êPO文m̄是公開ê，buē列tī任何ê hashtag。Kan-ta公開ê PO文tsiah ē當用hashtag tshuē。",
+  "compose_form.lock_disclaimer": "Lí ê口座iáu buē {locked}。逐ê lâng lóng通跟tuè lí，看lí kan-ta hōo跟tuè ê看ê PO文。",
+  "compose_form.lock_disclaimer.lock": "鎖起來ê",
+  "compose_form.placeholder": "Lí teh想siánn？",
+  "compose_form.poll.duration": "投票期間",
+  "compose_form.poll.multiple": "Tsē選擇",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.single": "單選擇",
+  "compose_form.poll.switch_to_multiple": "Kā投票改做ē當選tsē-tsē ê。",
+  "compose_form.poll.switch_to_single": "Kā投票改做kan-ta通選tsi̍t-ê",
+  "compose_form.poll.type": "投票ê方法",
+  "compose_form.publish": "PO文",
+  "compose_form.publish_form": "PO出去",
+  "compose_form.reply": "回應",
+  "compose_form.save_changes": "更新",
+  "compose_form.spoiler.marked": "Thâi掉內容警告",
+  "compose_form.spoiler.unmarked": "加添內容警告",
+  "compose_form.spoiler_placeholder": "內容警告（m̄是必要）",
+  "confirmation_modal.cancel": "取消",
+  "confirmations.block.confirm": "封鎖",
+  "confirmations.delete.confirm": "Thâi掉",
+  "confirmations.delete.message": "Lí kám確定beh thâi掉tsit ê PO文？",
+  "confirmations.delete.title": "Kám beh thâi掉tsit ê PO文？",
+  "confirmations.delete_list.confirm": "Thâi掉",
+  "confirmations.delete_list.message": "Lí kám確定beh永永thâi掉tsit ê列單？",
+  "confirmations.delete_list.title": "Kám beh thâi掉tsit ê列單？",
+  "confirmations.discard_edit_media.confirm": "棄sak",
+  "confirmations.discard_edit_media.message": "Lí佇媒體敘述á是先看māi ê所在有iáu buē儲存ê改變，kám beh kā in棄sak？",
+  "confirmations.edit.confirm": "編輯",
+  "confirmations.edit.message": "Tsit-má編輯ē khàm掉lí tng-leh編寫ê訊息，lí kám beh繼續án-ne做？",
+  "confirmations.edit.title": "Kám beh khàm掉PO文？",
   "confirmations.follow_to_list.confirm": "跟tuè，加入kàu列單",
+  "confirmations.follow_to_list.message": "Beh kā {name} 加添kàu列單，lí tio̍h先跟tuè伊。",
+  "confirmations.follow_to_list.title": "Kám beh跟tuè tsit ê用者？",
+  "confirmations.logout.confirm": "登出",
+  "confirmations.logout.message": "Lí kám確定beh登出？",
+  "confirmations.logout.title": "Lí kám beh登出？",
+  "confirmations.missing_alt_text.confirm": "加添說明文字",
+  "confirmations.missing_alt_text.message": "Lí ê PO文包含無說明文字ê媒體。加添敘述，ē幫tsān lí ê內容hōo khah tsē lâng接近使用。",
+  "confirmations.missing_alt_text.secondary": "就按呢PO出去",
+  "confirmations.missing_alt_text.title": "Kám beh加添說明文字？",
+  "confirmations.mute.confirm": "消音",
+  "confirmations.redraft.confirm": "Thâi掉了後重寫",
+  "confirmations.redraft.message": "Lí kám確定behthâi掉tsit篇PO文了後koh重寫？收藏kap轉PO ē無去，而且原底ê PO文ê回應ē變孤立。",
+  "confirmations.redraft.title": "Kám beh thâi掉koh重寫PO文？",
+  "confirmations.reply.confirm": "回應",
+  "confirmations.reply.message": "Tsit-má回應ē khàm掉lí tng-leh編寫ê訊息。Lí kám確定beh繼續án-ne做？",
+  "confirmations.reply.title": "Kám beh khàm掉PO文？",
+  "confirmations.unfollow.confirm": "取消跟tuè",
+  "confirmations.unfollow.message": "Lí kám確定無愛跟tuè {name}？",
+  "confirmations.unfollow.title": "Kám beh取消跟tuè tsit ê用者？",
+  "content_warning.hide": "Am-khàm PO文",
+  "emoji_button.label": "加入繪文字(emoji)",
+  "emoji_button.nature": "自然",
   "notification.favourite_pm": "{name} kah意lí ê私人提起",
   "notification.favourite_pm.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>kah意lí ê私人提起",
   "search_popout.language_code": "ISO語言代碼",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index f9b631c0e2..3329878229 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Er deed zich een onverwachte fout voor",
   "alert.unexpected.title": "Oeps!",
   "alt_text_badge.title": "Alt-tekst",
+  "alt_text_modal.add_alt_text": "Alt-tekst toevoegen",
+  "alt_text_modal.add_text_from_image": "Tekst van afbeelding toevoegen",
+  "alt_text_modal.cancel": "Annuleren",
+  "alt_text_modal.change_thumbnail": "Miniatuur wijzigen",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beschrijf dit voor doven en slechthorenden…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beschrijf dit voor blinden en slechtzienden…",
+  "alt_text_modal.done": "Klaar",
   "announcement.announcement": "Mededeling",
   "annual_report.summary.archetype.booster": "De cool-hunter",
   "annual_report.summary.archetype.lurker": "De lurker",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.logout.title": "Uitloggen?",
+  "confirmations.missing_alt_text.confirm": "Alt-tekst toevoegen",
+  "confirmations.missing_alt_text.message": "Je bericht bevat media zonder alt-tekst. Het toevoegen van beschrijvingen helpt je om je inhoud toegankelijk te maken voor meer mensen.",
+  "confirmations.missing_alt_text.secondary": "Toch plaatsen",
+  "confirmations.missing_alt_text.title": "Alt-tekst toevoegen?",
   "confirmations.mute.confirm": "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.",
@@ -294,7 +305,7 @@
   "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": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
+  "empty_column.follow_requests": "Je hebt nog geen volgverzoeken ontvangen. Wanneer je er een 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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Meldingen negeren van mensen die jou niet volgen?",
   "ignore_notifications_modal.not_following_title": "Meldingen negeren van mensen die je niet volgt?",
   "ignore_notifications_modal.private_mentions_title": "Meldingen negeren van ongevraagde privéberichten?",
+  "info_button.label": "Help",
+  "info_button.what_is_alt_text": "<h1>Wat is alt-tekst?</h1> <p>Alt-tekst biedt beschrijvingen van afbeeldingen voor mensen met een visuele beperking, voor verbindingen met lage internetsnelheid of mensen die op zoek zijn naar extra context.</p> <p>Je kunt de toegankelijkheid en de begrijpelijkheid voor iedereen verbeteren door heldere, beknopte en objectieve alt-teksten te schrijven.</p> <ul> <li>Leg belangrijke elementen vast</li> <li>Tekst in afbeeldingen samenvatten</li> <li>Een eenvoudige zinsbouw gebruiken</li> <li>Overbodige informatie vermijden</li> <li>Voor complexe diagrammen of kaarten alleen op trends en belangrijke bevindingen focussen</li> </ul>",
   "interaction_modal.action.favourite": "Om verder te gaan, moet je vanaf je eigen account als favoriet markeren.",
   "interaction_modal.action.follow": "Om verder te gaan, moet je vanaf je eigen account volgen.",
   "interaction_modal.action.reblog": "Om verder te gaan, moet je vanaf je eigen account boosten.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Afbeeldingen, een video- of een geluidsbestand toevoegen",
   "upload_error.limit": "Uploadlimiet van bestand overschreden.",
   "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.drag_and_drop.instructions": "Druk op spatie of enter om een mediabijlage op te pakken. Gebruik de pijltjestoetsen om de bijlage in een bepaalde richting te verplaatsen. Druk opnieuw op de spatiebalk of enter om de mediabijlage op de nieuwe positie te plaatsen, of druk op escape om te annuleren.",
   "upload_form.drag_and_drop.on_drag_cancel": "Slepen is geannuleerd. Mediabijlage {item} is niet verplaatst.",
   "upload_form.drag_and_drop.on_drag_end": "Mediabijlage {item} is niet verplaatst.",
   "upload_form.drag_and_drop.on_drag_over": "Mediabijlage {item} is verplaatst.",
   "upload_form.drag_and_drop.on_drag_start": "Mediabijlage {item} is opgepakt.",
   "upload_form.edit": "Bewerken",
-  "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
-  "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
-  "upload_modal.analyzing_picture": "Afbeelding analyseren…",
-  "upload_modal.apply": "Toepassen",
-  "upload_modal.applying": "Aan het toepassen…",
-  "upload_modal.choose_image": "Kies een afbeelding",
-  "upload_modal.description_placeholder": "Pa's wijze lynx bezag vroom het fikse aquaduct",
-  "upload_modal.detect_text": "Tekst in een afbeelding detecteren",
-  "upload_modal.edit_media": "Media bewerken",
-  "upload_modal.hint": "Klik of sleep de cirkel in de voorvertoning naar een centraal focuspunt dat op elke thumbnail zichtbaar moet blijven.",
-  "upload_modal.preparing_ocr": "OCR voorbereiden…",
-  "upload_modal.preview_label": "Voorvertoning ({ratio})",
   "upload_progress.label": "Uploaden...",
   "upload_progress.processing": "Bezig…",
   "username.taken": "Die gebruikersnaam is al in gebruik. Probeer een andere",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 1a7f92be18..95d173dca5 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -211,6 +211,10 @@
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
   "confirmations.logout.title": "Logg ut?",
+  "confirmations.missing_alt_text.confirm": "Legg til alternativ tekst",
+  "confirmations.missing_alt_text.message": "Posten din inneheld media utan alternativ-tekst. Det å leggje til skildringar hjelper med gjere innhaldet ditt tilgjengeleg for fleire personar.",
+  "confirmations.missing_alt_text.secondary": "Publiser likevel",
+  "confirmations.missing_alt_text.title": "Legg til alternativ tekst?",
   "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.",
@@ -875,26 +879,12 @@
   "upload_button.label": "Legg til medium",
   "upload_error.limit": "Du har gått over opplastingsgrensa.",
   "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.drag_and_drop.instructions": "For å plukka opp eit medievedlegg, trykkjer du på mellomrom eller enter. Når du dreg, brukar du piltastane for å flytta vedlegget i den retninga du vil. Deretter trykkjer du mellomrom eller enter att for å sleppa vedlegget på den nye plassen, eller trykk escape for å avbryta.",
   "upload_form.drag_and_drop.on_drag_cancel": "Du avbraut draginga. Medievedlegget {item} vart sleppt.",
   "upload_form.drag_and_drop.on_drag_end": "Medeivedlegget {item} vart sleppt.",
   "upload_form.drag_and_drop.on_drag_over": "Medievedlegget {item} vart flytta.",
   "upload_form.drag_and_drop.on_drag_start": "Plukka opp medievedlegget {item}.",
   "upload_form.edit": "Rediger",
-  "upload_form.thumbnail": "Bytt miniatyrbilete",
-  "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
-  "upload_modal.analyzing_picture": "Analyserer bilete…",
-  "upload_modal.apply": "Bruk",
-  "upload_modal.applying": "Utfører…",
-  "upload_modal.choose_image": "Vel bilete",
-  "upload_modal.description_placeholder": "Ein rask brun rev hoppar over den late hunden",
-  "upload_modal.detect_text": "Oppdag tekst i biletet",
-  "upload_modal.edit_media": "Rediger medium",
-  "upload_modal.hint": "Klikk og dra sirkelen på førehandsvisninga for å velja eit fokuspunkt som alltid vil vera synleg på miniatyrbilete.",
-  "upload_modal.preparing_ocr": "Førebur OCR…",
-  "upload_modal.preview_label": "Førehandsvis ({ratio})",
   "upload_progress.label": "Lastar opp...",
   "upload_progress.processing": "Handsamar…",
   "username.taken": "Dette brukernavnet er tatt. Prøv et annet",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index ccd6f92f4b..7e19eb06a3 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -724,21 +724,7 @@
   "upload_button.label": "Legg til media",
   "upload_error.limit": "Filopplastingsgrensen er oversteget.",
   "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.edit": "Rediger",
-  "upload_form.thumbnail": "Endre miniatyrbilde",
-  "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
-  "upload_modal.analyzing_picture": "Analyserer bildet …",
-  "upload_modal.apply": "Bruk",
-  "upload_modal.applying": "Utfører…",
-  "upload_modal.choose_image": "Velg et bilde",
-  "upload_modal.description_placeholder": "Når du en gang kommer, neste sommer, skal vi atter drikke vin",
-  "upload_modal.detect_text": "Oppdag tekst i bildet",
-  "upload_modal.edit_media": "Rediger media",
-  "upload_modal.hint": "Klikk eller dra sirkelen i forhåndsvisningen for å velge hovedpunktet som alltid vil bli vist i alle miniatyrbilder.",
-  "upload_modal.preparing_ocr": "Forbereder OCR…",
-  "upload_modal.preview_label": "Forhåndsvisning ({ratio})",
   "upload_progress.label": "Laster opp...",
   "upload_progress.processing": "Behandler…",
   "username.taken": "Dette brukernavnet er tatt. Prøv et annet",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 8761fd0e2e..1ab2c774c5 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -74,7 +74,14 @@
   "alert.unexpected.message": "Una error s’es producha.",
   "alert.unexpected.title": "Ops !",
   "alt_text_badge.title": "Tèxt alternatiu",
+  "alt_text_modal.add_alt_text": "Inserir tèxte alteratiu",
+  "alt_text_modal.add_text_from_image": "Apondre tèxte de l’imatge",
+  "alt_text_modal.cancel": "Anullar",
+  "alt_text_modal.change_thumbnail": "Cambiar de miniatura",
+  "alt_text_modal.done": "Acabat",
   "announcement.announcement": "Anóncia",
+  "annual_report.summary.followers.followers": "seguidors",
+  "annual_report.summary.followers.total": "{count} en total",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
   "block_modal.show_less": "Ne veire mens",
@@ -410,6 +417,7 @@
   "relative_time.seconds": "fa {number}s",
   "relative_time.today": "uèi",
   "reply_indicator.cancel": "Anullar",
+  "reply_indicator.poll": "Sondatge",
   "report.block": "Blocar",
   "report.categories.other": "Autre",
   "report.categories.spam": "Messatge indesirable",
@@ -532,21 +540,7 @@
   "upload_button.label": "Ajustar un mèdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Talha maximum pels mandadís subrepassada.",
   "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.edit": "Modificar",
-  "upload_form.thumbnail": "Cambiar la vinheta",
-  "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",
-  "upload_modal.applying": "Aplicacion…",
-  "upload_modal.choose_image": "Causir un imatge",
-  "upload_modal.description_placeholder": "Lo dròlle bilingüe manja un yaourt de ròcs exagonals e kiwis verds farà un an mai",
-  "upload_modal.detect_text": "Detectar lo tèxt de l’imatge",
-  "upload_modal.edit_media": "Modificar lo mèdia",
-  "upload_modal.hint": "Clicatz o lisatz lo cercle de l’apercebut per causir lo ponch que serà totjorn visible dins las vinhetas.",
-  "upload_modal.preparing_ocr": "Preparacion de la ROC…",
-  "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",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 1fae89e579..e3850fed39 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -39,7 +39,7 @@
   "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
   "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ",
   "account.posts": "ਪੋਸਟਾਂ",
-  "account.posts_with_replies": "ਪੋਸਤਾਂ ਅਤੇ ਜਵਾਬ",
+  "account.posts_with_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ",
   "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ",
   "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
@@ -57,6 +57,8 @@
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "alt_text_badge.title": "ਬਦਲੀ ਲਿਖਤ",
+  "alt_text_modal.cancel": "ਰੱਦ ਕਰੋ",
+  "alt_text_modal.done": "ਮੁਕੰਮਲ",
   "announcement.announcement": "ਹੋਕਾ",
   "annual_report.summary.followers.followers": "ਫ਼ਾਲੋਅਰ",
   "annual_report.summary.followers.total": "{count} ਕੁੱਲ",
@@ -73,6 +75,7 @@
   "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
   "block_modal.title": "ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
   "boost_modal.reblog": "ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰਨਾ ਹੈ?",
+  "bundle_column_error.copy_stacktrace": "ਗਲਤੀ ਰਿਪੋਰਟ ਨੂੰ ਕਾਪੀ ਕਰੋ",
   "bundle_column_error.error.title": "ਓਹ ਹੋ!",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
   "bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
@@ -106,6 +109,7 @@
   "column_header.pin": "ਟੰਗੋ",
   "column_header.show_settings": "ਸੈਟਿੰਗਾਂ ਦਿਖਾਓ",
   "column_header.unpin": "ਲਾਹੋ",
+  "column_search.cancel": "ਰੱਦ ਕਰੋ",
   "column_subheading.settings": "ਸੈਟਿੰਗਾਂ",
   "community.column_settings.local_only": "ਸਿਰਫ ਲੋਕਲ ਹੀ",
   "community.column_settings.media_only": "ਸਿਰਫ ਮੀਡੀਆ ਹੀ",
@@ -141,9 +145,12 @@
   "confirmations.delete_list.title": "ਸੂਚੀ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
   "confirmations.edit.confirm": "ਸੋਧ",
+  "confirmations.follow_to_list.confirm": "ਫ਼ਾਲੋ ਕਰੋ ਅਤੇ ਲਿਸਟ 'ਚ ਜੋੜੋ",
+  "confirmations.follow_to_list.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਫ਼ਾਲੋ ਕਰਨਾ ਹੈ?",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.logout.message": "ਕੀ ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.logout.title": "ਲਾਗ ਆਉਟ ਕਰਨਾ ਹੈ?",
+  "confirmations.missing_alt_text.secondary": "ਕਿਵੇਂ ਵੀ ਪੋਸਟ ਕਰੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
   "confirmations.redraft.confirm": "ਹਟਾਓ ਤੇ ਮੁੜ-ਡਰਾਫਟ",
   "confirmations.reply.confirm": "ਜਵਾਬ ਦੇਵੋ",
@@ -209,9 +216,12 @@
   "filter_modal.select_filter.expired": "ਮਿਆਦ ਪੁੱਗੀ",
   "filter_modal.select_filter.prompt_new": "ਨਵੀਂ ਕੈਟਾਗਰੀ: {name}",
   "filter_modal.select_filter.search": "ਖੋਜੋ ਜਾਂ ਬਣਾਓ",
+  "filter_modal.select_filter.title": "ਇਸ ਪੋਸਟ ਨੂੰ ਫਿਲਟਰ ਕਰੋ",
+  "filter_modal.title.status": "ਇੱਕ ਪੋਸਟ ਨੂੰ ਫਿਲਟਰ ਕਰੋ",
   "firehose.all": "ਸਭ",
   "firehose.local": "ਇਹ ਸਰਵਰ",
   "firehose.remote": "ਹੋਰ ਸਰਵਰ",
+  "follow_request.authorize": "ਪਰਮਾਣਿਤ",
   "follow_request.reject": "ਰੱਦ ਕਰੋ",
   "follow_suggestions.dismiss": "ਮੁੜ ਨਾ ਵੇਖਾਓ",
   "follow_suggestions.personalized_suggestion": "ਨਿੱਜੀ ਸੁਝਾਅ",
@@ -227,6 +237,7 @@
   "footer.privacy_policy": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "footer.source_code": "ਸਰੋਤ ਕੋਡ ਵੇਖੋ",
   "footer.status": "ਹਾਲਤ",
+  "footer.terms_of_service": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ",
   "generic.saved": "ਸਾਂਭੀ ਗਈ",
   "getting_started.heading": "ਸ਼ੁਰੂ ਕਰੀਏ",
   "hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
@@ -243,11 +254,15 @@
   "hints.profiles.see_more_followers": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋਅਰ ਵੇਖੋ",
   "hints.profiles.see_more_follows": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋ ਨੂੰ ਵੇਖੋ",
   "hints.profiles.see_more_posts": "{domain} ਉੱਤੇ ਹੋਰ ਪੋਸਟਾਂ ਨੂੰ ਵੇਖੋ",
+  "hints.threads.see_more": "{domain} ਤੋਂ ਹੋਰ ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
   "home.column_settings.show_reblogs": "ਬੂਸਟਾਂ ਨੂੰ ਵੇਖੋ",
   "home.column_settings.show_replies": "ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
   "home.hide_announcements": "ਐਲਾਨਾਂ ਨੂੰ ਓਹਲੇ ਕਰੋ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "ignore_notifications_modal.ignore": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ",
+  "info_button.label": "ਮਦਦ",
+  "interaction_modal.go": "ਜਾਓ",
+  "interaction_modal.no_account_yet": "ਹਾਲੇ ਖਾਤਾ ਨਹੀਂ ਹੈ?",
   "interaction_modal.on_another_server": "ਵੱਖਰੇ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.on_this_server": "ਇਸ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.title.favourite": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
@@ -255,6 +270,7 @@
   "interaction_modal.title.reblog": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰੋ",
   "interaction_modal.title.reply": "{name} ਦੀ ਪੋਸਟ ਦਾ ਜਵਾਬ ਦਿਓ",
   "interaction_modal.title.vote": "{name} ਦੀ ਚੋਣ ਵਾਸਤੇ ਵੋਟ ਪਾਓ",
+  "interaction_modal.username_prompt": "ਜਿਵੇਂ {example}",
   "intervals.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}}",
   "intervals.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}}",
   "intervals.full.minutes": "{number, plural, one {# ਮਿੰਟ} other {# ਮਿੰਟ}}",
@@ -268,6 +284,7 @@
   "keyboard_shortcuts.down": "ਸੂਚੀ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ",
   "keyboard_shortcuts.enter": "ਪੋਸਟ ਨੂੰ ਖੋਲ੍ਹੋ",
   "keyboard_shortcuts.favourite": "ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
+  "keyboard_shortcuts.favourites": "ਮਨਪਸੰਦ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹੋ",
   "keyboard_shortcuts.federated": "",
   "keyboard_shortcuts.heading": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
   "keyboard_shortcuts.home": "ਮੁੱਖ-ਸਫ਼ਾ ਟਾਈਮ-ਲਾਈਨ ਨੂੰ ਖੋਲ੍ਹੋ",
@@ -288,11 +305,13 @@
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "ਮੀਡੀਆ ਦਿਖਾਉਣ/ਲੁਕਾਉਣ ਲਈ",
   "keyboard_shortcuts.toot": "ਨਵੀਂ ਪੋਸਟ ਸ਼ੁਰੂ ਕਰੋ",
+  "keyboard_shortcuts.translate": "ਪੋਸਟ ਨੂੰ ਅਨੁਵਾਦ ਕਰਨ ਲਈ",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "ਸੂਚੀ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ",
   "lightbox.close": "ਬੰਦ ਕਰੋ",
   "lightbox.next": "ਅਗਲੀ",
   "lightbox.previous": "ਪਿਛਲੀ",
+  "limited_account_hint.action": "ਪਰੋਫਾਈਲ ਨੂੰ ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
   "link_preview.author": "{name} ਵਲੋਂ",
   "link_preview.more_from_author": "{name} ਵਲੋਂ ਹੋਰ",
   "link_preview.shares": "{count, plural, one {{counter} ਪੋਸਟ} other {{counter} ਪੋਸਟਾਂ}}",
@@ -309,13 +328,17 @@
   "lists.list_name": "ਸੂਚੀ ਦਾ ਨਾਂ",
   "lists.new_list_name": "ਨਵੀਂ ਸੂਚੀਂ ਦਾ ਨਾਂ",
   "lists.no_lists_yet": "ਹਾਲੇ ਕੋਈ ਵੀ ਸੂਚੀ ਨਹੀਂ ਹੈ।",
+  "lists.no_members_yet": "ਹਾਲੇ ਮੈਂਬਰ ਨਹੀਂ ਹਨ।",
+  "lists.no_results_found": "ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ।",
   "lists.remove_member": "ਹਟਾਓ",
   "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
   "lists.replies_policy.list": "ਸੂਚੀ ਦੇ ਮੈਂਬਰ",
   "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
   "lists.save": "ਸੰਭਾਲੋ",
+  "lists.search": "ਖੋਜੋ",
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
   "media_gallery.hide": "ਲੁਕਾਓ",
+  "mute_modal.hide_from_notifications": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚੋਂ ਲੁਕਾਓ",
   "mute_modal.show_options": "ਚੋਣਾਂ ਨੂੰ ਵੇਖਾਓ",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
   "navigation_bar.administration": "ਪਰਸ਼ਾਸ਼ਨ",
@@ -354,6 +377,8 @@
   "notification.mentioned_you": "{name} ਨੇ ਤੁਹਾਡਾ ਜ਼ਿਕਰ ਕੀਤਾ",
   "notification.moderation-warning.learn_more": "ਹੋਰ ਜਾਣੋ",
   "notification.moderation_warning.action_disable": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰਅਸਮਰੱਥ ਕੀਤਾ ਹੈ।",
+  "notification.moderation_warning.action_silence": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰ ਸੀਮਿਤ ਕੀਤਾ ਗਿਆ ਹੈ।",
+  "notification.moderation_warning.action_suspend": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ ਹੈ।",
   "notification.reblog": "{name} boosted your status",
   "notification.relationships_severance_event.learn_more": "ਹੋਰ ਜਾਣੋ",
   "notification.status": "{name} ਨੇ ਹੁਣੇ ਪੋਸਟ ਕੀਤਾ",
@@ -393,6 +418,14 @@
   "notifications.policy.accept": "ਮਨਜ਼ੂਰ",
   "notifications.policy.accept_hint": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚ ਵੇਖਾਓ",
   "notifications.policy.drop": "ਅਣਡਿੱਠਾ",
+  "notifications.policy.filter": "ਫਿਲਟਰ",
+  "notifications.policy.filter_new_accounts_title": "ਨਵੇਂ ਖਾਤੇ",
+  "notifications.policy.filter_not_followers_title": "ਲੋਕ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦੇ",
+  "notifications.policy.filter_not_following_hint": "ਜਦ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਖੁਦ ਮਨਜ਼ੂਰੀ ਨਹੀਂ ਦਿੰਦੇ",
+  "notifications_permission_banner.enable": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ ਸਮਰੱਥ ਕਰੋ",
+  "onboarding.follows.back": "ਪਿੱਛੇ",
+  "onboarding.follows.done": "ਮੁਕੰਮਲ",
+  "onboarding.follows.search": "ਖੋਜੋ",
   "onboarding.profile.note": "ਜਾਣਕਾਰੀ",
   "onboarding.profile.save_and_continue": "ਸੰਭਾਲੋ ਅਤੇ ਜਾਰੀ ਰੱਖੋ",
   "onboarding.profile.title": "ਪਰੋਫਾਈਲ ਸੈਟਅੱਪ",
@@ -403,11 +436,16 @@
   "poll.vote": "ਵੋਟ ਪਾਓ",
   "poll.voted": "ਤੁਸੀਂ ਇਸ ਜਵਾਬ ਲਈ ਵੋਟ ਕੀਤਾ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
+  "privacy.direct.long": "ਪੋਸਟ ਵਿੱਚ ਜ਼ਿਕਰ ਕੀਤੇ ਹਰ ਕੋਈ",
+  "privacy.direct.short": "ਖਾਸ ਲੋਕ",
+  "privacy.private.long": "ਸਿਰਫ਼ ਤੁਹਾਡੇ ਫ਼ਾਲੋਅਰ ਹੀ",
   "privacy.private.short": "ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
+  "privacy_policy.last_updated": "ਆਖਰੀ ਵਾਰ {date} ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "recommended": "ਸਿਫ਼ਾਰਸ਼ੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
+  "regeneration_indicator.please_stand_by": "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ।",
   "relative_time.days": "{number}ਦਿਨ",
   "relative_time.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}} ਪਹਿਲਾਂ",
   "relative_time.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}} ਪਹਿਲਾਂ",
@@ -431,9 +469,16 @@
   "report.next": "ਅਗਲੀ",
   "report.placeholder": "ਵਧੀਕ ਟਿੱਪਣੀਆਂ",
   "report.reasons.dislike": "ਮੈਨੂੰ ਇਹ ਪਸੰਦ ਨਹੀਂ ਹੈ",
+  "report.reasons.legal": "ਇਹ ਗ਼ੈਰ-ਕਨੂੰਨੀ ਹੈ",
+  "report.reasons.other": "ਇਹ ਕੁਝ ਹੋਰ ਹੈ",
   "report.reasons.spam": "ਇਹ ਸਪੈਮ ਹੈ",
+  "report.rules.subtitle": "ਲਾਗੂ ਹੋਣ ਵਾਲੇ ਸਾਰੇ ਚੁਣੋ",
+  "report.rules.title": "ਕਿਹੜੇ ਨਿਯਮਾਂ ਦਾ ਉਲੰਘਣ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ?",
+  "report.statuses.subtitle": "ਲਾਗੂ ਹੋਣ ਵਾਲੇ ਸਾਰੇ ਚੁਣੋ",
   "report.submit": "ਭੇਜੋ",
   "report.target": "{target} ਰਿਪੋਰਟ",
+  "report.thanks.title": "ਇਸ ਨੂੰ ਵੇਖਣਾ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹੋ?",
+  "report.thanks.title_actionable": "ਰਿਪੋਰਟ ਕਰਨ ਲਈ ਧੰਨਵਾਦ ਹੈ। ਅਸੀਂ ਇਸ ਦੀ ਛਾਣਬੀਣ ਕਰਾਂਗੇ।",
   "report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "ਕਨੂੰਨੀ",
@@ -444,6 +489,7 @@
   "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "report_notification.categories.violation_sentence": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
+  "search.no_recent_searches": "ਕੋਈ ਸੱਜਰੀ ਖੋਜ ਨਹੀਂ ਹੈ",
   "search.placeholder": "ਖੋਜੋ",
   "search.quick_action.go_to_account": "ਪਰੋਫਾਈਲ {x} ਉੱਤੇ ਜਾਓ",
   "search.quick_action.go_to_hashtag": "ਹੈਸ਼ਟੈਗ {x} ਉੱਤੇ ਜਾਓ",
@@ -456,6 +502,7 @@
   "search_results.accounts": "ਪਰੋਫਾਈਲ",
   "search_results.all": "ਸਭ",
   "search_results.hashtags": "ਹੈਸ਼ਟੈਗ",
+  "search_results.no_results": "ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ ਹਨ।",
   "search_results.see_all": "ਸਭ ਵੇਖੋ",
   "search_results.statuses": "ਪੋਸਟਾਂ",
   "server_banner.active_users": "ਸਰਗਰਮ ਵਰਤੋਂਕਾਰ",
@@ -478,39 +525,50 @@
   "status.load_more": "ਹੋਰ ਦਿਖਾਓ",
   "status.media.open": "ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "status.media.show": "ਵੇਖਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ",
+  "status.media_hidden": "ਮੀਡਿਆ ਲੁਕਵਾਂ ਹੈ",
   "status.mention": "@{name} ਦਾ ਜ਼ਿਕਰ",
   "status.more": "ਹੋਰ",
+  "status.mute": "@{name} ਨੂੰ ਮੌਨ ਕਰੋ",
+  "status.mute_conversation": "ਗੱਲਬਾਤ ਨੂੰ ਮੌਨ ਕਰੋ",
   "status.open": "ਇਹ ਪੋਸਟ ਨੂੰ ਫੈਲਾਓ",
   "status.pin": "ਪਰੋਫਾਈਲ ਉੱਤੇ ਟੰਗੋ",
   "status.pinned": "ਟੰਗੀ ਹੋਈ ਪੋਸਟ",
   "status.read_more": "ਹੋਰ ਪੜ੍ਹੋ",
   "status.reblog": "ਵਧਾਓ",
+  "status.reblogged_by": "{name} ਨੇ ਬੂਸਟ ਕੀਤਾ",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "ਹਟਾਓ ਤੇ ਮੁੜ-ਡਰਾਫਟ",
+  "status.remove_bookmark": "ਬੁੱਕਮਾਰਕ ਨੂੰ ਹਟਾਓ",
+  "status.remove_favourite": "ਮਨਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ",
+  "status.replied_in_thread": "ਮਾਮਲੇ ਵਿੱਚ ਜਵਾਬ ਦਿਓ",
   "status.replied_to": "{name} ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ",
   "status.reply": "ਜਵਾਬ ਦੇਵੋ",
   "status.replyAll": "ਮਾਮਲੇ ਨੂੰ ਜਵਾਬ ਦਿਓ",
   "status.report": "@{name} ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
   "status.sensitive_warning": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ",
   "status.share": "ਸਾਂਝਾ ਕਰੋ",
+  "status.show_less_all": "ਸਭ ਲਈ ਘੱਟ ਵੇਖਾਓ",
+  "status.show_more_all": "ਸਭ ਲਈ ਵੱਧ ਵੇਖਾਓ",
+  "status.show_original": "ਅਸਲ ਨੂੰ ਵੇਖਾਓ",
   "status.title.with_attachments": "{user} ਨੇ {attachmentCount, plural,one {ਅਟੈਚਮੈਂਟ} other {{attachmentCount}ਅਟੈਚਮੈਂਟਾਂ}} ਪੋਸਟ ਕੀਤੀਆਂ",
   "status.translate": "ਉਲੱਥਾ ਕਰੋ",
+  "status.translated_from_with": "{provider} ਵਰਤ ਕੇ {lang} ਤੋਂ ਅਨੁਵਾਦ ਕੀਤਾ",
+  "status.uncached_media_warning": "ਝਲਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
   "status.unpin": "ਪਰੋਫਾਈਲ ਤੋਂ ਲਾਹੋ",
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
   "tabs_bar.home": "ਘਰ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
+  "terms_of_service.title": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ",
+  "time_remaining.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}} ਬਾਕੀ",
+  "time_remaining.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}} ਬਾਕੀ",
+  "time_remaining.minutes": "{number, plural, one {# ਮਿੰਟ} other {# ਮਿੰਟ}} ਬਾਕੀ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "ਹੁਣ ਰੁਝਾਨ ਵਿੱਚ",
   "units.short.billion": "{count}ਿਬ",
   "units.short.million": "{count}ਮਿ",
   "units.short.thousand": "{count}ਹਜ਼ਾਰ",
-  "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
-  "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
+  "upload_button.label": "ਚਿੱਤਰ, ਵੀਡੀਓ ਜਾਂ ਆਡੀਓ ਫਾਇਲ ਨੂੰ ਜੋੜੋ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
-  "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
-  "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
-  "upload_modal.choose_image": "ਤਸਵੀਰ ਚੁਣੋ",
-  "upload_modal.edit_media": "ਮੀਡੀਆ ਸੋਧੋ",
   "upload_progress.label": "ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...",
   "upload_progress.processing": "ਕਾਰਵਾਈ ਚੱਲ ਰਹੀ ਹੈ…",
   "username.taken": "ਉਹ ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲੈ ਲਿਆ ਹੈ। ਹੋਰ ਅਜ਼ਮਾਓ",
@@ -520,6 +578,8 @@
   "video.expand": "ਵੀਡੀਓ ਨੂੰ ਫੈਲਾਓ",
   "video.fullscreen": "ਪੂਰੀ ਸਕਰੀਨ",
   "video.hide": "ਵੀਡੀਓ ਨੂੰ ਲੁਕਾਓ",
+  "video.mute": "ਆਵਾਜ਼ ਨੂੰ ਬੰਦ ਕਰੋ",
   "video.pause": "ਠਹਿਰੋ",
-  "video.play": "ਚਲਾਓ"
+  "video.play": "ਚਲਾਓ",
+  "video.unmute": "ਆਵਾਜ਼ ਨੂੰ ਸੁਣਾਓ"
 }
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index b419870d7a..f31de0151d 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Wystąpił nieoczekiwany błąd.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Tekst alternatywny",
+  "alt_text_modal.add_alt_text": "Dodaj tekst alternatywny",
+  "alt_text_modal.add_text_from_image": "Dodaj tekst z obrazu",
+  "alt_text_modal.cancel": "Anuluj",
+  "alt_text_modal.change_thumbnail": "Zmień miniaturę",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Opisz to dla osób z wadą słuchu…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Opisz to dla osób z wadą wzroku…",
+  "alt_text_modal.done": "Gotowe",
   "announcement.announcement": "Ogłoszenie",
   "annual_report.summary.archetype.booster": "Łowca treści",
   "annual_report.summary.archetype.lurker": "Czyhający",
@@ -103,6 +110,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "najczęściej używany hashtag",
   "annual_report.summary.most_used_hashtag.none": "Brak",
   "annual_report.summary.new_posts.new_posts": "nowe wpisy",
+  "annual_report.summary.percentile.text": "<topLabel>Plasuje Cię w czołówce</topLabel><percentage></percentage><bottomLabel> użytkowników {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Nie powiemy Berniemu.",
   "annual_report.summary.thanks": "Dziękujemy, że jesteś częścią Mastodona!",
   "attachments_list.unprocessed": "(nieprzetworzone)",
@@ -210,6 +218,7 @@
   "confirmations.logout.confirm": "Wyloguj",
   "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
   "confirmations.logout.title": "Wylogować?",
+  "confirmations.missing_alt_text.message": "Twój wpis zawiera treści graficzne bez opisu pomocniczego. Dodając opis, sprawisz, że będzie on bardziej dostępny dla większej liczby osób.",
   "confirmations.mute.confirm": "Wycisz",
   "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.",
@@ -406,8 +415,14 @@
   "ignore_notifications_modal.not_followers_title": "Ignoruj powiadomienia od użytkowników którzy cię nie obserwują?",
   "ignore_notifications_modal.not_following_title": "Ignoruj powiadomienia od użytkowników których nie obserwujesz?",
   "ignore_notifications_modal.private_mentions_title": "Ignoruj powiadomienia o nieproszonych wzmiankach prywatnych?",
+  "info_button.label": "Pomoc",
+  "info_button.what_is_alt_text": "<h1>Czym jest tekst pomocniczy obrazków?</h1><p> Tekst pomocniczy zapewnia osobom z zaburzeniem widzenia, słabym łączem internetowym oraz tym, którzy szukają dodatkowego kontekstu opis grafik i zdjęć.</p>\n<p>Możesz zwiększyć jego dostępność i zrozumienie poprzez jasne, zwięzłe i obiektywne sformułowanie tekstu pomocniczego.</p>\n<ul>\n<li>Uchwyć ważne elementy</li>\n<li>Streść tekst na obrazkach</li>\n<li>Używaj standardowej składni zdań</li>\n<li>Unikaj wprowadzania zbędnych informacji</li>\n<li>Skup się na głównych trendach i kluczowych informacjach w skomplikowanych materiałach (tkaich jak wykresy czy mapy)</li>\n</ul>",
   "interaction_modal.action.favourite": "Aby kontynuować, musisz dodać do ulubionych na swoim koncie.",
   "interaction_modal.action.follow": "Aby kontynuować, musisz obserwować ze swojego konta.",
+  "interaction_modal.action.reblog": "Aby kontynuować, musisz podać dalej ze swojego konta.",
+  "interaction_modal.action.reply": "Aby kontynuować, musisz odpowiedzieć ze swojego konta.",
+  "interaction_modal.action.vote": "Aby kontynuować, musisz zagłosować ze swojego konta.",
+  "interaction_modal.go": "Dalej",
   "interaction_modal.no_account_yet": "Nie masz jeszcze konta?",
   "interaction_modal.on_another_server": "Na innym serwerze",
   "interaction_modal.on_this_server": "Na tym serwerze",
@@ -452,6 +467,7 @@
   "keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
   "keyboard_shortcuts.toggle_sensitivity": "Pokaż/ukryj multimedia",
   "keyboard_shortcuts.toot": "Stwórz nowy post",
+  "keyboard_shortcuts.translate": "Aby przetłumaczyć post",
   "keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania",
   "keyboard_shortcuts.up": "aby przejść na górę listy",
   "lightbox.close": "Zamknij",
@@ -690,6 +706,8 @@
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
   "refresh": "Odśwież",
+  "regeneration_indicator.please_stand_by": "Proszę czekać.",
+  "regeneration_indicator.preparing_your_home_feed": "Przygotowywanie Twojego kanału wiadomości...",
   "relative_time.days": "{number} dni",
   "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
   "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",
@@ -867,26 +885,12 @@
   "upload_button.label": "Dodaj zdjęcia, filmy lub audio",
   "upload_error.limit": "Przekroczono limit plików do wysłania.",
   "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.drag_and_drop.instructions": "Naciśnij spację lub enter żeby podnieść załącznik. Podczas przeciągania, strzałki przesuwają załącznik. Naciśnięcie spacji lub entera upuści załącznik w nowym miejscu, a escape anuluje przesuwanie.",
   "upload_form.drag_and_drop.on_drag_cancel": "Przesuwanie anulowane. Załącznik {item} upuszczony.",
   "upload_form.drag_and_drop.on_drag_end": "Upuszczono załącznik {item}.",
   "upload_form.drag_and_drop.on_drag_over": "Przesunięto załącznik {item}.",
   "upload_form.drag_and_drop.on_drag_start": "Podniesiono załącznik {item}.",
   "upload_form.edit": "Edytuj",
-  "upload_form.thumbnail": "Zmień miniaturę",
-  "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",
-  "upload_modal.applying": "Stosowanie…",
-  "upload_modal.choose_image": "Wybierz obraz",
-  "upload_modal.description_placeholder": "Pchnąć w tę łódź jeża lub ośm skrzyń fig",
-  "upload_modal.detect_text": "Wykryj tekst z obrazu",
-  "upload_modal.edit_media": "Edytuj multimedia",
-  "upload_modal.hint": "Kliknij lub przeciągnij kółko na podglądzie by wybrać centralny punkt, który zawsze będzie na widoku na miniaturce.",
-  "upload_modal.preparing_ocr": "Przygotowywanie OCR…",
-  "upload_modal.preview_label": "Podgląd ({ratio})",
   "upload_progress.label": "Wysyłanie…",
   "upload_progress.processing": "Przetwarzanie…",
   "username.taken": "Ta nazwa użytkownika jest już zajęta. Wybierz inną",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 99929e1f35..021eeb349b 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -873,26 +873,12 @@
   "upload_button.label": "Adicionar mídia",
   "upload_error.limit": "Limite de anexação alcançado.",
   "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.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",
   "upload_form.drag_and_drop.on_drag_over": "O anexo de mídia {item} foi movido.",
   "upload_form.drag_and_drop.on_drag_start": "Foi coletado o anexo de mídia {item}.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
-  "upload_modal.analyzing_picture": "Analisando imagem…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Aplicando…",
-  "upload_modal.choose_image": "Escolher imagem",
-  "upload_modal.description_placeholder": "Um pequeno jabuti xereta viu dez cegonhas felizes",
-  "upload_modal.detect_text": "Transcrever imagem",
-  "upload_modal.edit_media": "Editar mídia",
-  "upload_modal.hint": "Clique ou arraste o círculo na prévia para escolher o foco que ficará visível na miniatura.",
-  "upload_modal.preparing_ocr": "Preparando OCR…",
-  "upload_modal.preview_label": "Prévia ({ratio})",
   "upload_progress.label": "Enviando...",
   "upload_progress.processing": "Processando…",
   "username.taken": "Esse nome de usuário já está sendo usado. Por favor, tente outro.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 42d06ea72b..aaa36704d7 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -42,7 +42,7 @@
   "account.hide_reblogs": "Esconder partilhas impulsionadas de @{name}",
   "account.in_memoriam": "Em Memória.",
   "account.joined_short": "Juntou-se a",
-  "account.languages": "Alterar línguas subscritas",
+  "account.languages": "Alterar idiomas subscritos",
   "account.link_verified_on": "O proprietário desta hiperligação foi verificado em {date}",
   "account.locked_info": "Esta conta é privada. O proprietário revê manualmente quem o pode seguir.",
   "account.media": "Multimédia",
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
   "alert.unexpected.title": "Bolas!",
   "alt_text_badge.title": "Texto descritivo",
+  "alt_text_modal.add_alt_text": "Adicionar texto alternativo",
+  "alt_text_modal.add_text_from_image": "Adicionar texto a partir da imagem",
+  "alt_text_modal.cancel": "Cancelar",
+  "alt_text_modal.change_thumbnail": "Alterar miniatura",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descreve isto para pessoas com problemas de audição…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Descreve isto para pessoas com problemas de visão…",
+  "alt_text_modal.done": "Concluído",
   "announcement.announcement": "Mensagem de manutenção",
   "annual_report.summary.archetype.booster": "O caçador de frescura",
   "annual_report.summary.archetype.lurker": "O espreitador",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Terminar sessão",
   "confirmations.logout.message": "Tens a certeza de que queres terminar a sessão?",
   "confirmations.logout.title": "Terminar sessão?",
+  "confirmations.missing_alt_text.confirm": "Adicionar texto alternativo",
+  "confirmations.missing_alt_text.message": "A tua publicação contém multimédia sem texto alternativo. A adição de descrições ajuda a tornar o conteúdo acessível a mais pessoas.",
+  "confirmations.missing_alt_text.secondary": "Publicar mesmo assim",
+  "confirmations.missing_alt_text.title": "Adicionar texto alternativo?",
   "confirmations.mute.confirm": "Ocultar",
   "confirmations.redraft.confirm": "Eliminar e reescrever",
   "confirmations.redraft.message": "Tens a certeza de que queres eliminar e tornar a escrever esta publicação? Os favoritos e as publicações impulsionadas perder-se-ão e as respostas à publicação original ficarão órfãs.",
@@ -407,9 +418,11 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não te seguem?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que não segues?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
+  "info_button.label": "Ajuda",
+  "info_button.what_is_alt_text": "<h1>O que é texto alternativo?</h1> <p>O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, conexões de baixa largura de banda ou pessoas que procuram um contexto adicional.</p> <p>Podes melhorar a acessibilidade e a compreensão para todos escrevendo um texto alternativo claro, conciso e objetivo.</p> <ul> <li>Capta elementos importantes</li> <li>Resume o texto que aparece nas imagens</li> <li>Usa uma estrutura de frase regular</li> <li>Evita informações redundantes</li> <li>Centra-te nas tendências e nas principais conclusões em imagens complexas (como diagramas ou mapas)</li> </ul>",
   "interaction_modal.action.favourite": "Para continuar, tens de adicionar um favorito na tua conta.",
   "interaction_modal.action.follow": "Para continuar, tens de seguir alguém na tua conta.",
-  "interaction_modal.action.reblog": "Para continuar, tens de fazer uma republicação na tua conta.",
+  "interaction_modal.action.reblog": "Para continuar, tens de impulsionar desde a tua conta.",
   "interaction_modal.action.reply": "Para continuar, tens de fazer uma resposta na tua conta.",
   "interaction_modal.action.vote": "Para continuar é necessário votar a partir da tua conta.",
   "interaction_modal.go": "Ir",
@@ -804,7 +817,7 @@
   "status.cancel_reblog_private": "Retirar impulso",
   "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
   "status.continued_thread": "Continuação da conversa",
-  "status.copy": "Copiar hiperligação para a publicação",
+  "status.copy": "Copiar hiperligação da publicação",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista pormenorizada da conversa",
   "status.direct": "Mencionar @{name} em privado",
@@ -875,26 +888,12 @@
   "upload_button.label": "Adicionar imagens, um vídeo ou um ficheiro de som",
   "upload_error.limit": "Limite de envio de ficheiros excedido.",
   "upload_error.poll": "Não é permitido o envio de ficheiros 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.drag_and_drop.instructions": "Para escolher um anexo multimédia, prima espaço ou enter. Enquanto arrasta, utilize as teclas de setas para mover o anexo multimédia em qualquer direção. Prima espaço ou enter novamente para largar o anexo multimédia na sua nova posição ou prima escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo multimédia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo multimédia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_over": "O anexo multimédia {item} foi movido.",
   "upload_form.drag_and_drop.on_drag_start": "O anexo multimédia {item} foi escolhido.",
   "upload_form.edit": "Editar",
-  "upload_form.thumbnail": "Alterar miniatura",
-  "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",
-  "upload_modal.applying": "A aplicar…",
-  "upload_modal.choose_image": "Escolher imagem",
-  "upload_modal.description_placeholder": "Grave e cabisbaixo, o filho justo zelava pela querida mãe doente",
-  "upload_modal.detect_text": "Detetar texto na imagem",
-  "upload_modal.edit_media": "Editar multimédia",
-  "upload_modal.hint": "Clique ou arraste o círculo na pré-visualização para escolher o ponto focal que será sempre visível em todas as miniaturas.",
-  "upload_modal.preparing_ocr": "A preparar o reconhecimento de caracteres (OCR)…",
-  "upload_modal.preview_label": "Pré-visualizar ({ratio})",
   "upload_progress.label": "A enviar...",
   "upload_progress.processing": "A processar…",
   "username.taken": "Esse nome de utilizador já está a ser utilizado. Por favor, tente outro",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 3d8bff2ed1..bf002011df 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -587,21 +587,7 @@
   "upload_button.label": "Adaugă media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Limita de încărcare a fișierului a fost depășită.",
   "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.edit": "Modifică",
-  "upload_form.thumbnail": "Schimbă miniatura",
-  "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ă",
-  "upload_modal.applying": "Se aplică…",
-  "upload_modal.choose_image": "Alege imaginea",
-  "upload_modal.description_placeholder": "Vând muzică de jazz și haine de bun-gust în New-York și Quebec la preț fix",
-  "upload_modal.detect_text": "Detectare text din imagine",
-  "upload_modal.edit_media": "Modifică media",
-  "upload_modal.hint": "Fă clic sau glisează cercul pe previzualizare pentru a alege punctul focal care va fi vizibil în toate miniaturile.",
-  "upload_modal.preparing_ocr": "Se pregătește OCR…",
-  "upload_modal.preview_label": "Previzualizare ({ratio})",
   "upload_progress.label": "Se încarcă...",
   "upload_progress.processing": "Se procesează…",
   "username.taken": "Acel nume de utilizator este luat. Încearcă altul",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index da8f68664a..b6f3a8a95d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Ой!",
   "alt_text_badge.title": "Альтернативный текст",
+  "alt_text_modal.add_alt_text": "Альтернативный текст",
+  "alt_text_modal.add_text_from_image": "Добавить текст из изображения",
+  "alt_text_modal.cancel": "Отмена",
+  "alt_text_modal.change_thumbnail": "Изменить обложку",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Опишите то, что слышите, для людей с нарушениями слуха…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Опишите то, что видите, для людей с нарушениями зрения…",
+  "alt_text_modal.done": "Готово",
   "announcement.announcement": "Объявление",
   "annual_report.summary.archetype.booster": "Репостер",
   "annual_report.summary.archetype.lurker": "Молчун",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.logout.title": "Выйти?",
+  "confirmations.missing_alt_text.confirm": "Добавить",
+  "confirmations.missing_alt_text.message": "Ваш пост содержит медиафайлы без альтернативного текста. Добавляя описания, вы делаете ваш контент доступным для более широкого круга людей.",
+  "confirmations.missing_alt_text.secondary": "Опубликовать",
+  "confirmations.missing_alt_text.title": "Добавить альтернативный текст?",
   "confirmations.mute.confirm": "Игнорировать",
   "confirmations.redraft.confirm": "Удалить и исправить",
   "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут потеряны.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Игнорировать уведомления от людей, которые не следят за вами?",
   "ignore_notifications_modal.not_following_title": "Игнорировать уведомления от людей, за которыми вы не следите?",
   "ignore_notifications_modal.private_mentions_title": "Игнорировать уведомления о нежелательных личных сообщениях?",
+  "info_button.label": "Помощь",
+  "info_button.what_is_alt_text": "<h1>Что это такое?</h1> <p>Альтернативный текст содержит описание изображения для людей с ограничениями зрения, медленным интернетом и для тех, кому нужен дополнительный контекст.</p> <p>Вы можете улучшить доступность и понимание для всех, написав четкий, краткий и объективный альтернативный текст.</p> <ul> <li>Уловите важные элементы</li> <li>Перескажите текстовую информацию на изображении</li> <li>Используйте правильную структуру предложений</li> <li>Избегайте избыточной информации</li> <li>Сосредоточьтесь на тенденциях и ключевых выводах при описании сложных визуализаций (таких как диаграммы или карты)</li> </ul>",
   "interaction_modal.action.favourite": "Вы можете добавить этот пост в избранное со своей учётной записью.",
   "interaction_modal.action.follow": "Вы можете подписаться со своей учётной записью.",
   "interaction_modal.action.reblog": "Вы можете продвинуть этот пост со своей учётной записью.",
@@ -457,6 +470,7 @@
   "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
   "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
   "keyboard_shortcuts.toot": "начать писать новый пост",
+  "keyboard_shortcuts.translate": "перевести пост",
   "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
   "keyboard_shortcuts.up": "вверх по списку",
   "lightbox.close": "Закрыть",
@@ -836,6 +850,7 @@
   "status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.",
   "status.redraft": "Создать заново",
   "status.remove_bookmark": "Убрать из закладок",
+  "status.remove_favourite": "Убрать из избранного",
   "status.replied_in_thread": "Ответил в теме",
   "status.replied_to": "Ответил(а) {name}",
   "status.reply": "Ответить",
@@ -873,26 +888,12 @@
   "upload_button.label": "Прикрепить фото, видео или аудио",
   "upload_error.limit": "Достигнут лимит загруженных файлов.",
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
-  "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
-  "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
   "upload_form.drag_and_drop.instructions": "Чтобы подобрать прикрепленный файл, нажмите \"Пробел\" (Space) или \"Ввод\" (Enter). При перетаскивании используйте клавиши со стрелками, чтобы переместить прикрепленные файлы в любом направлении. Нажмите \"Пробел\" (Space) или \"Ввод\" (Enter) еще раз, чтобы переместить вложение в новое место, или нажмите кнопку \"Выйти\" (Escape), чтобы отменить.",
   "upload_form.drag_and_drop.on_drag_cancel": "Перетаскивание было отменено. Вложение медиа {item} было удалено.",
   "upload_form.drag_and_drop.on_drag_end": "Медиа вложение {item} было удалено.",
   "upload_form.drag_and_drop.on_drag_over": "Медиа вложение {item} было перемещено.",
   "upload_form.drag_and_drop.on_drag_start": "Загружается медиафайл {item}.",
   "upload_form.edit": "Изменить",
-  "upload_form.thumbnail": "Изменить обложку",
-  "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
-  "upload_modal.analyzing_picture": "Обработка изображения…",
-  "upload_modal.apply": "Применить",
-  "upload_modal.applying": "Применение…",
-  "upload_modal.choose_image": "Выбрать изображение",
-  "upload_modal.description_placeholder": "На дворе трава, на траве дрова",
-  "upload_modal.detect_text": "Найти текст на картинке",
-  "upload_modal.edit_media": "Изменить файл",
-  "upload_modal.hint": "Нажмите и перетащите круг в предпросмотре в точку фокуса, которая всегда будет видна на эскизах.",
-  "upload_modal.preparing_ocr": "Подготовка распознавания…",
-  "upload_modal.preview_label": "Предпросмотр ({ratio})",
   "upload_progress.label": "Загрузка...",
   "upload_progress.processing": "Обработка…",
   "username.taken": "Это имя пользователя уже занято. Выберите другое",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index e6d4509e19..1ecc057023 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -475,8 +475,5 @@
   "status.redraft": "मार्जय पुनश्च लिख्यताम्",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.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 aaf3368d3c..27080aaa9e 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -682,20 +682,7 @@
   "upload_button.label": "Agiunghe immàgines, unu vìdeu o unu documentu sonoru",
   "upload_error.limit": "Lìmite de càrriga de archìvios barigadu.",
   "upload_error.poll": "Non si permitit s'imbiu de archìvios in is sondàgios.",
-  "upload_form.audio_description": "Descritzione pro persones cun pèrdida auditiva",
-  "upload_form.description": "Descritzione pro persones cun pèrdida visuale",
   "upload_form.edit": "Modìfica",
-  "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o visuale",
-  "upload_modal.analyzing_picture": "Analizende immàgine…",
-  "upload_modal.apply": "Àplica",
-  "upload_modal.choose_image": "Sèbera un'immàgine",
-  "upload_modal.description_placeholder": "Su margiane castàngiu brincat lestru a subra de su cane mandrone",
-  "upload_modal.detect_text": "Rileva testu de s'immàgine",
-  "upload_modal.edit_media": "Modìfica elementu multimediale",
-  "upload_modal.hint": "Incarca o traga su tzìrculu in sa previsualizatzione pro seberare su puntu focale chi at a èssere semper visìbile in totu is miniaduras.",
-  "upload_modal.preparing_ocr": "Ammaniende s'OCR…",
-  "upload_modal.preview_label": "Previsualiza ({ratio})",
   "upload_progress.label": "Carrighende...",
   "video.close": "Serra su vìdeu",
   "video.download": "Iscàrriga archìviu",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index b82634ca7c..6adf365e52 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -500,21 +500,7 @@
   "upload_button.label": "Add images, a video or a audio file",
   "upload_error.limit": "File upload limit exceedit.",
   "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.edit": "Edit",
-  "upload_form.thumbnail": "Chynge thoomnail",
-  "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
-  "upload_modal.analyzing_picture": "Analyzin picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applyin…",
-  "upload_modal.choose_image": "Pick image",
-  "upload_modal.description_placeholder": "A quick broon fox jamps ower the lazy dug",
-  "upload_modal.detect_text": "Detect text fae picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview tae pick the focal pynt thit wull aye be in view on aw thoomnails.",
-  "upload_modal.preparing_ocr": "Preparin OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploadin...",
   "upload_progress.processing": "Processin…",
   "video.close": "Shut video",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index d8a8c0a094..7e2d9af986 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -435,20 +435,7 @@
   "upload_button.label": "රූප, දෘශ්‍යක හෝ හඬපට අමුණන්න",
   "upload_error.limit": "සීමාව ඉක්මවා ඇත.",
   "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
-  "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
-  "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
   "upload_form.edit": "සංස්කරණය",
-  "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
-  "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
-  "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
-  "upload_modal.apply": "යොදන්න",
-  "upload_modal.applying": "යොදමින්…",
-  "upload_modal.choose_image": "රූපයක් තෝරන්න",
-  "upload_modal.description_placeholder": "කඩිසර දුඹුරු හිවලෙක් කම්මැලි බල්ලා මතින් පනී",
-  "upload_modal.detect_text": "රූපයෙහි පෙළ අනාවරණය",
-  "upload_modal.edit_media": "මාධ්‍ය සංස්කරණය",
-  "upload_modal.preparing_ocr": "OCR සඳහා සැරසෙමින්…",
-  "upload_modal.preview_label": "පෙරදසුන ({ratio})",
   "upload_progress.label": "උඩුගත වෙමින්...",
   "upload_progress.processing": "සැකසෙමින්…",
   "username.taken": "නම දැනටමත් අරගෙන ඇත",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 00eb948985..b9f0fd1b33 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -86,6 +86,9 @@
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Alternatívny popis",
+  "alt_text_modal.add_text_from_image": "Pridaj text z obrázka",
+  "alt_text_modal.cancel": "Zrušiť",
+  "alt_text_modal.done": "Hotovo",
   "announcement.announcement": "Oznámenie",
   "annual_report.summary.archetype.oracle": "Veštec",
   "annual_report.summary.followers.followers": "sledovatelia",
@@ -202,6 +205,7 @@
   "confirmations.logout.confirm": "Odhlásiť sa",
   "confirmations.logout.message": "Určite sa chcete odhlásiť?",
   "confirmations.logout.title": "Odhlásiť sa?",
+  "confirmations.missing_alt_text.secondary": "Odošli aj tak",
   "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é.",
@@ -316,6 +320,7 @@
   "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.featured_longer": "Ručne vybrané tímom {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populárne medzi ľudmi ktorých nasleduješ",
   "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.",
@@ -378,6 +383,7 @@
   "ignore_notifications_modal.not_followers_title": "Nevšímať si oznámenia od ľudí, ktorí ťa nenasledujú?",
   "ignore_notifications_modal.not_following_title": "Nevšímať si oznámenia od ľudí, ktorých nenasleduješ?",
   "ignore_notifications_modal.private_mentions_title": "Nevšímať si oznámenia o nevyžiadaných súkromných spomínaniach?",
+  "info_button.label": "Pomoc",
   "interaction_modal.action.favourite": "Pre pokračovanie si musíš obľúbiť zo svojho účtu.",
   "interaction_modal.action.follow": "Pre pokračovanie musíš nasledovať zo svojho účtu.",
   "interaction_modal.action.reply": "Pre pokračovanie musíš odpovedať s tvojho účtu.",
@@ -448,6 +454,8 @@
   "lists.delete": "Vymazať zoznam",
   "lists.done": "Hotovo",
   "lists.edit": "Upraviť zoznam",
+  "lists.exclusive": "Skryť členov na Domovskej osi",
+  "lists.exclusive_hint": "Ak je niekto na tomto zozname, skry ich na tvojej Domácej osi, aby si ich príspevky nevidel/a dvakrát.",
   "lists.find_users_to_add": "Nájdi užívateľov na pridanie",
   "lists.list_members": "Členovia zoznamu",
   "lists.list_name": "Názov zoznamu",
@@ -461,6 +469,7 @@
   "lists.replies_policy.none": "Nikomu",
   "lists.save": "Ulož",
   "lists.search": "Hľadaj",
+  "lists.show_replies_to": "Zahrnúť odpovede od členov zoznamu na",
   "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.hide": "Skryť",
@@ -594,6 +603,7 @@
   "onboarding.follows.done": "Hotovo",
   "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.search": "Hľadať",
+  "onboarding.follows.title": "Pre začiatok nasleduj ľudí",
   "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",
@@ -804,21 +814,7 @@
   "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 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.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.processing": "Spracovávanie…",
   "username.taken": "Používateľské meno je obsadené. Skúste iné",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 1e44d31ac4..3fcb1f9dbc 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -86,6 +86,10 @@
   "alert.unexpected.message": "Zgodila se je nepričakovana napaka.",
   "alert.unexpected.title": "Ojoj!",
   "alt_text_badge.title": "Nadomestno besedilo",
+  "alt_text_modal.add_alt_text": "Dodaj nadomestno besedilo",
+  "alt_text_modal.cancel": "Prekliči",
+  "alt_text_modal.change_thumbnail": "Spremeni sličico",
+  "alt_text_modal.done": "Opravljeno",
   "announcement.announcement": "Obvestilo",
   "annual_report.summary.followers.followers": "sledilcev",
   "annual_report.summary.followers.total": "",
@@ -148,6 +152,7 @@
   "column_header.pin": "Pripni",
   "column_header.show_settings": "Pokaži nastavitve",
   "column_header.unpin": "Odpni",
+  "column_search.cancel": "Prekliči",
   "column_subheading.settings": "Nastavitve",
   "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo mediji",
@@ -306,6 +311,7 @@
   "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",
+  "filter_warning.matches_filter": "Se ujema s filtrom »<span>{title}</span>«",
   "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
@@ -336,8 +342,10 @@
   "footer.privacy_policy": "Pravilnik o zasebnosti",
   "footer.source_code": "Pokaži izvorno kodo",
   "footer.status": "Stanje",
+  "footer.terms_of_service": "Pogoji uporabe",
   "generic.saved": "Shranjeno",
   "getting_started.heading": "Kako začeti",
+  "hashtag.admin_moderation": "Odpri vmesnik za moderiranje za #{name}",
   "hashtag.column_header.tag_mode.all": "in {additional}",
   "hashtag.column_header.tag_mode.any": "ali {additional}",
   "hashtag.column_header.tag_mode.none": "brez {additional}",
@@ -368,6 +376,7 @@
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtriranje pomaga pri izogibanju morebitni zmedi",
   "ignore_notifications_modal.filter_to_review_separately": "Filtrirana obvestila lahko pregledate ločeno",
   "ignore_notifications_modal.ignore": "Prezri obvestila",
+  "interaction_modal.no_account_yet": "Še nimate računa?",
   "interaction_modal.on_another_server": "Na drugem strežniku",
   "interaction_modal.on_this_server": "Na tem strežniku",
   "interaction_modal.title.favourite": "Daj objavo {name} med priljubljene",
@@ -573,6 +582,8 @@
   "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",
+  "onboarding.follows.back": "Nazaj",
+  "onboarding.follows.done": "Opravljeno",
   "onboarding.follows.empty": "Žal trenutno ni mogoče prikazati nobenih rezultatov. Lahko poskusite z iskanjem ali brskanjem po strani za raziskovanje, da poiščete osebe, ki jim želite slediti, ali poskusite znova pozneje.",
   "onboarding.profile.discoverable": "Naj bo moj profil mogoče najti",
   "onboarding.profile.discoverable_hint": "Ko se odločite za razkrivanje na Mastodonu, se lahko vaše objave pojavijo v rezultatih iskanja in trendih, vaš profil pa se lahko predlaga ljudem, ki imajo podobne interese kot vi.",
@@ -694,6 +705,7 @@
   "search_results.accounts": "Profili",
   "search_results.all": "Vse",
   "search_results.hashtags": "Ključniki",
+  "search_results.no_results": "Ni rezultatov.",
   "search_results.see_all": "Poglej vse",
   "search_results.statuses": "Objave",
   "server_banner.about_active_users": "Osebe, ki so uporabljale ta strežnik zadnjih 30 dni (dejavni uporabniki meseca)",
@@ -746,6 +758,7 @@
   "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",
+  "status.remove_favourite": "Odstrani iz priljubljenih",
   "status.replied_to": "Odgovoril/a {name}",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na nit",
@@ -766,6 +779,7 @@
   "subscribed_languages.target": "Spremeni naročene jezike za {target}",
   "tabs_bar.home": "Domov",
   "tabs_bar.notifications": "Obvestila",
+  "terms_of_service.title": "Pogoji uporabe",
   "time_remaining.days": "{number, plural, one {preostaja # dan} two {preostajata # dneva} few {preostajajo # dnevi} other {preostaja # dni}}",
   "time_remaining.hours": "{number, plural, one {# ura} other {# ur}} je ostalo",
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minut}} je ostalo",
@@ -781,21 +795,7 @@
   "upload_button.label": "Dodajte slike, video ali zvočno datoteko",
   "upload_error.limit": "Omejitev prenosa datoteke je presežena.",
   "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.edit": "Uredi",
-  "upload_form.thumbnail": "Spremeni sličico",
-  "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
-  "upload_modal.analyzing_picture": "Analiziranje slike …",
-  "upload_modal.apply": "Uveljavi",
-  "upload_modal.applying": "Uveljavljanje poteka …",
-  "upload_modal.choose_image": "Izberite sliko",
-  "upload_modal.description_placeholder": "Pri Jakcu bom vzel šest čudežnih fig",
-  "upload_modal.detect_text": "Zaznaj besedilo v sliki",
-  "upload_modal.edit_media": "Uredi medij",
-  "upload_modal.hint": "Kliknite ali povlecite krog v predogledu, da izberete točko pozornosti, ki bo vedno vidna na vseh oglednih sličicah.",
-  "upload_modal.preparing_ocr": "Priprava optične prepoznave znakov (OCR) …",
-  "upload_modal.preview_label": "Predogled ({ratio})",
   "upload_progress.label": "Pošiljanje ...",
   "upload_progress.processing": "Obdelovanje …",
   "username.taken": "To uporabniško ime je zasedeno. Poskusite z drugim.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index ce2ec13740..29b8a8263a 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ndodhi një gabim të papritur.",
   "alert.unexpected.title": "Hëm!",
   "alt_text_badge.title": "Tekst alternativ",
+  "alt_text_modal.add_alt_text": "Shtoni tekst alternativ",
+  "alt_text_modal.add_text_from_image": "Shtoni tekst nga figura",
+  "alt_text_modal.cancel": "Anuloje",
+  "alt_text_modal.change_thumbnail": "Ndryshoni miniaturën",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Përshkruajeni këtë për persona me mangësi dëgjimi…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Përshkruajeni këtë për persona me mangësi shikimi…",
+  "alt_text_modal.done": "U bë",
   "announcement.announcement": "Lajmërim",
   "annual_report.summary.followers.followers": "ndjekës",
   "annual_report.summary.followers.total": "{count} gjithsej",
@@ -206,6 +213,10 @@
   "confirmations.logout.confirm": "Dilni",
   "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
   "confirmations.logout.title": "Të dilet?",
+  "confirmations.missing_alt_text.confirm": "Shtoni tekst alternativ",
+  "confirmations.missing_alt_text.message": "Postimi juaj përmban media pa tekst alternativ. Shtimi i përshkrimeve ndihmon të bëhet lënda juaj e përdorshme nga më tepër njerëz.",
+  "confirmations.missing_alt_text.secondary": "Postoje, sido qoftë",
+  "confirmations.missing_alt_text.title": "Të shtohet tekst alternativ?",
   "confirmations.mute.confirm": "Heshtoje",
   "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.",
@@ -402,6 +413,8 @@
   "ignore_notifications_modal.not_followers_title": "Të shpërfillen njoftime nga persona që s’ju ndjekin?",
   "ignore_notifications_modal.not_following_title": "Të shpërfillen njoftime nga persona që s’i ndiqni?",
   "ignore_notifications_modal.private_mentions_title": "Të shpërfillen njoftime nga Përmendje Private të pakërkuara?",
+  "info_button.label": "Ndihmë",
+  "info_button.what_is_alt_text": "<h1>Ç’është teksti alternativ?</h1> <p>Teksti alternativ jep përshkrime figurash për persona me mangësi në të parët, lidhje me gjerësi bande të ulët, ose për ata që duan kontekst shtesë.</p> <p>Mund të përmirësoni përdorimin nga persona me aftësi të kufizuara dhe kuptimin për këto, duke shkruar tekst alternativ të qartë, konciz dhe objektiv.</p> <ul> <li>Rrokni elementët e rëndësishëm</li> <li>Përmblidhni tekst në figura</li> <li>Përdorni strukturë të rregullt fjalish</li> <li>Shmangni përsëritje informacioni</li> <li>Në aspekte pamore të ndërlikuara (fjala vjen, diagrame ose harta) përqendrohuni te prirje dhe gjetje gjërash kyçe</li> </ul>",
   "interaction_modal.action.favourite": "Që të vazhdoni, lypset t’i vini shenjë si i parapëlqyer që nga llogaria juaj.",
   "interaction_modal.action.follow": "Që të vazhdoni, lypset ta ndiqni që nga llogaria juaj.",
   "interaction_modal.action.reblog": "Që të vazhdoni, lypset ta riblogoni që nga llogaria juaj.",
@@ -870,26 +883,12 @@
   "upload_button.label": "Shtoni figura, një video ose një kartelë audio",
   "upload_error.limit": "U tejkalua kufi ngarkimi kartelash.",
   "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.drag_and_drop.instructions": "Që të merrni një bashkëngjitje media, shtypni tastin Space ose Enter. Teksa bëhet tërheqje, përdorni tastet shigjetë për ta shpënë bashkëngjitjen media në cilëndo drejtori që doni. Shtypni sërish Space ose Enter që të lihet bashkëngjitja media në pozicionin e vet të ri, ose shtypni Esc, që të anulohet veprimi.",
   "upload_form.drag_and_drop.on_drag_cancel": "Tërheqja u anulua. Bashkëngjitja media {item} u la.",
   "upload_form.drag_and_drop.on_drag_end": "Bashkëngjitja media {item} u la.",
   "upload_form.drag_and_drop.on_drag_over": "Bashkëngjitja media {item} u lëviz.",
   "upload_form.drag_and_drop.on_drag_start": "U mor bashkëngjitja media {item}.",
   "upload_form.edit": "Përpunoni",
-  "upload_form.thumbnail": "Ndryshoni miniaturën",
-  "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",
-  "upload_modal.applying": "Po zbatohet…",
-  "upload_modal.choose_image": "Zgjidhni figurë",
-  "upload_modal.description_placeholder": "Deshe Korçën, Korçën të dhamë",
-  "upload_modal.detect_text": "Pikase tekstin prej fotoje",
-  "upload_modal.edit_media": "Përpunoni media",
-  "upload_modal.hint": "Që të zgjidhni pikën vatrore e cila do të jetë përherë e dukshme në krejt miniaturat, klikojeni ose tërhiqeni rrethin te paraparja.",
-  "upload_modal.preparing_ocr": "Po përgatitet OCR-ja…",
-  "upload_modal.preview_label": "Paraparje ({ratio})",
   "upload_progress.label": "Po ngarkohet…",
   "upload_progress.processing": "Po përpunon…",
   "username.taken": "Ai emër përdoruesi është zënë. Provoni tjetër",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 6fdb2da2ab..36a7ed760b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -704,21 +704,7 @@
   "upload_button.label": "Dodaj slike, video ili audio datoteku",
   "upload_error.limit": "Dostignuto je ograničenje za otpremanje datoteka.",
   "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.edit": "Uredi",
-  "upload_form.thumbnail": "Promeni sličicu",
-  "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",
-  "upload_modal.applying": "Primena…",
-  "upload_modal.choose_image": "Odaberite sliku",
-  "upload_modal.description_placeholder": "Ljubazni fenjerdžija čađavog lica hoće da mi pokaže štos",
-  "upload_modal.detect_text": "Pronađi tekst sa slike",
-  "upload_modal.edit_media": "Uredi multimediju",
-  "upload_modal.hint": "Kliknite ili prevucite kružić na pregledu za izbor tačke fokusa koja će uvek biti vidljiva na svim sličicama.",
-  "upload_modal.preparing_ocr": "Priprema OCR-a…",
-  "upload_modal.preview_label": "Pregled ({ratio})",
   "upload_progress.label": "Otpremanje...",
   "upload_progress.processing": "Obrada…",
   "username.taken": "To korisničko ime je zauzeto. Pokušajte drugo",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 29661e13a9..f248a29da0 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -704,21 +704,7 @@
   "upload_button.label": "Додај слике, видео или аудио датотеку",
   "upload_error.limit": "Достигнуто је ограничење за отпремање датотека.",
   "upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
-  "upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
-  "upload_form.description": "Додајте опис за особе са оштећеним видом",
   "upload_form.edit": "Уреди",
-  "upload_form.thumbnail": "Промени сличицу",
-  "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
-  "upload_modal.analyzing_picture": "Анализирање слике…",
-  "upload_modal.apply": "Примени",
-  "upload_modal.applying": "Примена…",
-  "upload_modal.choose_image": "Одаберите слику",
-  "upload_modal.description_placeholder": "Љубазни фењерџија чађавог лица хоће да ми покаже штос",
-  "upload_modal.detect_text": "Пронађи текст са слике",
-  "upload_modal.edit_media": "Уреди мултимедију",
-  "upload_modal.hint": "Кликните или превуците кружић на прегледу за избор тачке фокуса која ће увек бити видљива на свим сличицама.",
-  "upload_modal.preparing_ocr": "Припрема OCR-а…",
-  "upload_modal.preview_label": "Преглед ({ratio})",
   "upload_progress.label": "Отпремање...",
   "upload_progress.processing": "Обрада…",
   "username.taken": "То корисничко име је заузето. Покушајте друго",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index f451caf6f9..21a620b3ec 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
   "alert.unexpected.title": "Hoppsan!",
   "alt_text_badge.title": "Alt-Text",
+  "alt_text_modal.add_alt_text": "Lägg till alt-text",
+  "alt_text_modal.add_text_from_image": "Lägg till text från bild",
+  "alt_text_modal.cancel": "Avbryt",
+  "alt_text_modal.change_thumbnail": "Ändra miniatyr",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beskriv detta för personer med hörselnedsättning…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beskriv detta för personer med synnedsättning…",
+  "alt_text_modal.done": "Klar",
   "announcement.announcement": "Meddelande",
   "annual_report.summary.archetype.booster": "Häftighetsjägaren",
   "annual_report.summary.archetype.lurker": "Smygaren",
@@ -211,6 +218,7 @@
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
   "confirmations.logout.title": "Logga ut?",
+  "confirmations.missing_alt_text.confirm": "Lägg till alt-text",
   "confirmations.mute.confirm": "Tysta",
   "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.",
@@ -220,7 +228,7 @@
   "confirmations.reply.title": "Skriva över inlägget?",
   "confirmations.unfollow.confirm": "Avfölj",
   "confirmations.unfollow.message": "Är du säker på att du vill avfölja {name}?",
-  "confirmations.unfollow.title": "Avfölj %s?",
+  "confirmations.unfollow.title": "Avfölj användare?",
   "content_warning.hide": "Dölj inlägg",
   "content_warning.show": "Visa ändå",
   "content_warning.show_more": "Visa mer",
@@ -407,6 +415,7 @@
   "ignore_notifications_modal.not_followers_title": "Vill du ignorera aviseringar från personer som inte följer dig?",
   "ignore_notifications_modal.not_following_title": "Vill du blockera aviseringar från personer som du inte följer dig?",
   "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oombedda privata omnämnanden?",
+  "info_button.label": "Hjälp",
   "interaction_modal.action.favourite": "För att fortsätta, måste du favoritmarkera från ditt konto.",
   "interaction_modal.action.follow": "För att fortsätta, måste du följa från ditt konto.",
   "interaction_modal.action.reblog": "För att fortsätta, måste du boosta från ditt konto.",
@@ -523,7 +532,7 @@
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
   "navigation_bar.follow_requests": "Följförfrågningar",
-  "navigation_bar.followed_tags": "Utvalda hashtags",
+  "navigation_bar.followed_tags": "Följda hashtaggar",
   "navigation_bar.follows_and_followers": "Följer och följare",
   "navigation_bar.lists": "Listor",
   "navigation_bar.logout": "Logga ut",
@@ -875,26 +884,12 @@
   "upload_button.label": "Lägg till media",
   "upload_error.limit": "Filöverföringsgränsen överskriden.",
   "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.drag_and_drop.instructions": "För att plocka upp en mediebilaga, tryck på mellanslag eller enter. Använd piltangenterna för att flytta mediebilagan. Tryck på mellanslag eller enter igen för att släppa mediebilagan i sin nya position, eller tryck på escape för att avbryta.",
   "upload_form.drag_and_drop.on_drag_cancel": "Flytten avbröts. Mediebilagan {item} släpptes.",
   "upload_form.drag_and_drop.on_drag_end": "Mediebilagan {item} släpptes.",
   "upload_form.drag_and_drop.on_drag_over": "Mediebilagan {item} flyttades.",
   "upload_form.drag_and_drop.on_drag_start": "Mediebilagan {item} plockades upp.",
   "upload_form.edit": "Redigera",
-  "upload_form.thumbnail": "Ändra miniatyr",
-  "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",
-  "upload_modal.applying": "Verkställer…",
-  "upload_modal.choose_image": "Välj bild",
-  "upload_modal.description_placeholder": "En snabb brun räv hoppar över den lata hunden",
-  "upload_modal.detect_text": "Upptäck bildens text",
-  "upload_modal.edit_media": "Redigera media",
-  "upload_modal.hint": "Klicka eller dra cirkeln på förhandstitten för att välja den fokusering som alltid kommer synas på alla miniatyrer.",
-  "upload_modal.preparing_ocr": "Förbereder OCR…",
-  "upload_modal.preview_label": "Förhandstitt ({ratio})",
   "upload_progress.label": "Laddar upp...",
   "upload_progress.processing": "Bearbetar…",
   "username.taken": "Det användarnamnet är upptaget. Försök med ett annat",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index c9a171984e..b7b930422c 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -88,8 +88,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index afe2627cac..1885c3a4ee 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -359,19 +359,7 @@
   "upload_button.label": "மீடியாவைச் சேர்க்கவும் (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "கோப்பு பதிவேற்ற வரம்பு மீறப்பட்டது.",
   "upload_error.poll": "கோப்பு பதிவேற்றம் அனுமதிக்கப்படவில்லை.",
-  "upload_form.audio_description": "செவித்திறன் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
-  "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
   "upload_form.edit": "தொகு",
-  "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
-  "upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
-  "upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
-  "upload_modal.apply": "உபயோகி",
-  "upload_modal.choose_image": "படத்தைத் தேர்வுசெய்ய",
-  "upload_modal.description_placeholder": "பொருள் விளக்கம்",
-  "upload_modal.detect_text": "படத்தில் இருக்கும் எழுத்தை கண்டறி",
-  "upload_modal.edit_media": "படத்தைத் தொகு",
-  "upload_modal.hint": "எல்லா வில்லைப்பட்த்திலும் தெரியவேண்டிய, படத்தின் முக்கிய குவியப்புள்ளிக்கு, வட்டத்தை சொடுக்கி இழுத்துச்செல்லவும்.",
-  "upload_modal.preview_label": "முன்னோட்டம் ({ratio})",
   "upload_progress.label": "ஏற்றுகிறது ...",
   "video.close": "வீடியோவை மூடு",
   "video.download": "கோப்பைப் பதிவிறக்கவும்",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 0fba9f162f..1e7548e378 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -76,8 +76,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 94b9f0e6a4..e734d9b37c 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -251,9 +251,6 @@
   "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.",
   "upload_area.title": "అప్లోడ్ చేయడానికి డ్రాగ్ & డ్రాప్ చేయండి",
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
   "video.close": "వీడియోని మూసివేయి",
   "video.exit_fullscreen": "పూర్తి స్క్రీన్ నుండి నిష్క్రమించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index d8f1b0b2f3..2959572ebc 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -866,26 +866,12 @@
   "upload_button.label": "เพิ่มไฟล์ภาพ, วิดีโอ หรือเสียง",
   "upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์แล้ว",
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
-  "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
-  "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
   "upload_form.drag_and_drop.instructions": "เพื่อหยิบไฟล์แนบสื่อ กดปุ่มเว้นวรรคหรือขึ้นบรรทัดใหม่ ขณะลาก ใช้ปุ่มลูกศรเพื่อย้ายไฟล์แนบสื่อในทิศทางใดก็ตามที่กำหนด กดปุ่มเว้นวรรคหรือขึ้นบรรทัดใหม่อีกครั้งเพื่อปล่อยไฟล์แนบสื่อในตำแหน่งใหม่ หรือกดปุ่ม Escape เพื่อยกเลิก",
   "upload_form.drag_and_drop.on_drag_cancel": "ยกเลิกการลากแล้ว ปล่อยไฟล์แนบสื่อ {item} แล้ว",
   "upload_form.drag_and_drop.on_drag_end": "ปล่อยไฟล์แนบสื่อ {item} แล้ว",
   "upload_form.drag_and_drop.on_drag_over": "ย้ายไฟล์แนบสื่อ {item} แล้ว",
   "upload_form.drag_and_drop.on_drag_start": "หยิบไฟล์แนบสื่อ {item} แล้ว",
   "upload_form.edit": "แก้ไข",
-  "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
-  "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
-  "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
-  "upload_modal.apply": "นำไปใช้",
-  "upload_modal.applying": "กำลังนำไปใช้…",
-  "upload_modal.choose_image": "เลือกภาพ",
-  "upload_modal.description_placeholder": "สุนัขจิ้งจอกสีน้ำตาลที่ว่องไวกระโดดข้ามสุนัขขี้เกียจ",
-  "upload_modal.detect_text": "ตรวจหาข้อความจากรูปภาพ",
-  "upload_modal.edit_media": "แก้ไขสื่อ",
-  "upload_modal.hint": "คลิกหรือลากวงกลมในตัวอย่างเพื่อเลือกจุดโฟกัส ซึ่งจะอยู่ในมุมมองของภาพขนาดย่อทั้งหมดเสมอ",
-  "upload_modal.preparing_ocr": "กำลังเตรียม OCR…",
-  "upload_modal.preview_label": "ตัวอย่าง ({ratio})",
   "upload_progress.label": "กำลังอัปโหลด...",
   "upload_progress.processing": "กำลังประมวลผล…",
   "username.taken": "มีการใช้ชื่อผู้ใช้นั้นแล้ว ลองอย่างอื่น",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index c2c1dafd21..7291588a38 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -1,11 +1,12 @@
 {
   "about.blocks": "ma lawa",
   "about.contact": "toki:",
-  "about.disclaimer": "ilo Masoton la, jan ale li ken kama jo e ona kepeken mani ala, li ken ante e toki ilo ona. kulupu esun Mastodon li jo e nimi ona. kulupu esun Mastodon li nasin lawa gGmbH.",
+  "about.disclaimer": "ilo Masoton la jan ale li lawa e ona li pana e pona tawa ona. kulupu esun Mastodon gGmbH li lawa e nimi ona.",
   "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.silenced.title": "ken lukin lili ",
+  "about.domain_blocks.suspended.explanation": "sona ale pi ma ni li kama pali ala, li kama esun ala, li kama awen ala la sina ken ala toki tawa jan pi ma ni.",
   "about.domain_blocks.suspended.title": "weka",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
   "about.powered_by": "lipu kulupu pi jan lawa mute tan {mastodon}",
@@ -18,7 +19,7 @@
   "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.cancel_follow_request": "o pini kute",
+  "account.cancel_follow_request": "o kute ala",
   "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",
@@ -50,74 +51,95 @@
   "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.muted": "sina kute ala e jan ni",
   "account.mutual": "jan pona sona",
-  "account.no_bio": "lipu li weka",
+  "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.report": "jan @{name} la o toki e ike tawa lawa",
+  "account.requested": "jan ni o ken e kute sina",
+  "account.requested_follow": "jan {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.statuses_counter": "{count, plural, other {toki {counter}}}",
   "account.unblock": "o weka ala e jan {name}",
   "account.unblock_domain": "o weka ala e ma {domain}",
-  "account.unblock_short": "o pini weka",
+  "account.unblock_short": "o weka ala",
   "account.unendorse": "lipu jan la o suli ala e ni",
-  "account.unfollow": "o pini kute",
+  "account.unfollow": "o kute ala",
   "account.unmute": "o len ala e @{name}",
   "account.unmute_notifications_short": "o kute e mu tan jan ni",
   "account.unmute_short": "o len ala",
   "account_note.placeholder": "o luka e ni la sona pi sina taso",
+  "admin.dashboard.daily_retention": "nanpa pi awen jan lon tenpo suno",
+  "admin.dashboard.monthly_retention": "nanpa pi awen jan lon tenpo mun",
   "admin.dashboard.retention.average": "sama",
   "admin.dashboard.retention.cohort": "tenpo mun open",
   "admin.dashboard.retention.cohort_size": "jan sin",
+  "admin.impact_report.instance_accounts": "ni li pakala li weka e lipu jan ni",
+  "admin.impact_report.instance_followers": "jan pi ma mi li weka tan jan kute ni",
+  "admin.impact_report.instance_follows": "ma ante li weka tan jan kute ni",
+  "admin.impact_report.title": "sona pi pakala kulupu",
   "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
+  "alert.rate_limited.title": "ilo ni li lili e ken sina",
   "alert.unexpected.message": "pakala li lon",
   "alert.unexpected.title": "pakala a!",
   "alt_text_badge.title": "toki sona sitelen",
+  "alt_text_modal.add_alt_text": "o pana e toki pi sona lukin",
+  "alt_text_modal.add_text_from_image": "o kama jo e toki sitelen tan sitelen ni",
+  "alt_text_modal.cancel": "weka",
+  "alt_text_modal.change_thumbnail": "o ante e sitelen lili",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "jan li ken ala kute la o pana e toki pi sona kalama…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "jan li ken ala lukin la o pana e toki pi sona lukin…",
+  "alt_text_modal.done": "pini",
   "announcement.announcement": "toki suli",
   "annual_report.summary.archetype.booster": "jan ni li alasa e pona",
   "annual_report.summary.archetype.lurker": "jan ni li lukin taso",
   "annual_report.summary.archetype.oracle": "jan ni li sona suli",
   "annual_report.summary.archetype.pollster": "jan ni li wile sona e pilin jan",
   "annual_report.summary.archetype.replier": "jan ni li toki tawa jan mute",
+  "annual_report.summary.followers.followers": "jan kute sina",
   "annual_report.summary.followers.total": "ale la {count}",
   "annual_report.summary.here_it_is": "toki lili la tenpo sike nanpa {year} li sama ni tawa sina:",
+  "annual_report.summary.highlighted_post.by_favourites": "toki pi olin nanpa wan",
+  "annual_report.summary.highlighted_post.by_reblogs": "toki pi sike nanpa wan",
+  "annual_report.summary.highlighted_post.by_replies": "toki li jo e toki kama pi nanpa wan",
   "annual_report.summary.highlighted_post.possessive": "tan jan {name}",
   "annual_report.summary.most_used_hashtag.none": "ala",
   "annual_report.summary.new_posts.new_posts": "toki suli sin",
-  "annual_report.summary.percentile.we_wont_tell_bernie": "mi toki ala e ni tawa jan Peni.",
+  "annual_report.summary.percentile.text": "<topLabel>ni la sina nanpa sewi</topLabel><percentage></percentage><bottomLabel>pi jan ale lon {domain}.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "sona ni li len tawa ale.",
   "annual_report.summary.thanks": "sina jan pi kulupu Masoton la sina pona a!",
   "attachments_list.unprocessed": "(nasin open)",
   "audio.hide": "o len e kalama",
+  "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso, o sona: ma li ken kepeken nasin len ante la pakala li ken lon. toki pi lukin ale la jan pi ma ala li ken lukin.",
   "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.show_more": "o suli e lukin",
+  "block_modal.they_cant_mention": "ona li ken ala toki tawa sina li ken ala kute e sina.",
   "block_modal.they_cant_see_posts": "ona li ken ala lukin e toki sina. sina ken ala lukin e toki ona.",
-  "block_modal.they_will_know": "ona li sona e ni: sina ala e lukin ona.",
+  "block_modal.they_will_know": "ona li sona e ni: sina weka e lukin ona.",
   "block_modal.title": "o weka ala weka e jan",
-  "block_modal.you_wont_see_mentions": "nimi ona li lon toki suli la sina lukin ala e toki ni.",
+  "block_modal.you_wont_see_mentions": "jan li toki e nimi ona la sina lukin ala e toki ni.",
   "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
   "boost_modal.reblog": "o wawa ala wawa e toki?",
-  "boost_modal.undo_reblog": "o pini ala pini e wawa toki?",
+  "boost_modal.undo_reblog": "o weka ala weka e wawa toki?",
   "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.error.title": "pakala a!",
   "bundle_column_error.network.body": "mi lukin pana e lipu la, pakala li lon. ken la, pakala li tan ilo nanpa sina. ken la, pakala li tan ilo nanpa suli pi ma kulupu ni.",
   "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.retry": "o alasa sin",
+  "bundle_column_error.return": "o tawa open",
   "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.other_server_instructions": "kulupu Masoton li jo e jan lawa mute, la sina ken pali e sijelo lon ma ante, li ken lukin e ijo pi ma ni.",
+  "bundle_modal_error.retry": "o alasa sin",
+  "closed_registrations.other_server_instructions": "kulupu Masoton la lawa mute li lon. sina ken pali e sijelo lon ma ante la sina awen ken lukin e ijo pi ma ni.",
   "closed_registrations_modal.description": "tenpo ni la, sina ken ala pali e jan lon ma {domain}. taso sina wile kepeken ilo Masoton la, sina ken pali e jan lon ma ante lon ala ma {domain}.",
   "closed_registrations_modal.find_another_server": "o alasa e ma ante",
+  "closed_registrations_modal.preamble": "ilo Masoton li lon ilo wan ala. sina kepeken ma ante la sina ken lukin li ken kute e jan pi ma ni. sina wile la, sina ken pali e ma sin!",
   "closed_registrations_modal.title": "sina kama lon kulupu Masoton",
   "column.about": "sona",
   "column.blocks": "kulupu pi jan weka",
@@ -137,8 +159,11 @@
   "column.mutes": "jan len",
   "column.notifications": "mu pi sona sin",
   "column.pins": "toki sewi",
+  "column.public": "toki pi ma poka ale",
   "column_back_button.label": "o tawa monsi",
   "column_header.hide_settings": "o len e lawa",
+  "column_header.moveLeft_settings": "poki toki ni o tawa ni ←",
+  "column_header.moveRight_settings": "poki toki ni o tawa ni →",
   "column_header.pin": "o sewi",
   "column_header.show_settings": "o lukin e lawa",
   "column_header.unpin": "o sewi ala",
@@ -154,6 +179,8 @@
   "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.lock_disclaimer": "lipu sina li open, li {locked} ala. jan ale li ken kama kute e sina, li ken lukin e toki sama ni.",
+  "compose_form.lock_disclaimer.lock": "pini",
   "compose_form.placeholder": "sina wile toki e seme?",
   "compose_form.poll.duration": "tenpo pana",
   "compose_form.poll.multiple": "pana mute",
@@ -169,7 +196,7 @@
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
   "compose_form.spoiler.unmarked": "o pali e toki pi ijo ike ken",
   "compose_form.spoiler_placeholder": "toki pi ijo ike ken (sina ken ala e ni)",
-  "confirmation_modal.cancel": "o pini",
+  "confirmation_modal.cancel": "o weka",
   "confirmations.block.confirm": "o weka",
   "confirmations.delete.confirm": "o weka",
   "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
@@ -182,22 +209,31 @@
   "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.edit.title": "o weka ala weka e toki? ni la, toki li kama toki sin.",
+  "confirmations.follow_to_list.confirm": "o kute, o pana tawa lipu jan",
+  "confirmations.follow_to_list.message": "sina wile pana e {name} tawa lipu jan la o kama kute e ona.",
+  "confirmations.follow_to_list.title": "sina wile ala wile kute?",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
   "confirmations.logout.title": "o 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.redraft.title": "ni li weka li pali sin e toki ni.",
   "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.reply.title": "sina wile ala wile weka e toki lon?",
+  "confirmations.unfollow.confirm": "o kute ala",
   "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+  "confirmations.unfollow.title": "sina wile ala wile pini kute?",
+  "content_warning.hide": "o len",
   "content_warning.show": "o lukin",
+  "content_warning.show_more": "o lukin",
   "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.copied": "sina jo e toki",
   "copypaste.copy_to_clipboard": "o awen lon ilo sina",
   "directory.local": "tan {domain} taso",
   "directory.new_arrivals": "jan pi kama sin",
@@ -206,15 +242,24 @@
   "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": "tenpo suno ni la jan pi kulupu ale li toki e ijo sin ni. ijo sin pi jan ante mute li sewi lon lipu ni.",
   "domain_block_modal.block": "o weka e ma",
   "domain_block_modal.they_wont_know": "ona li sona ala e ni: sina weka e ona.",
+  "domain_block_modal.title": "sina wile weka ala weka e ma?",
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {jan {followersCountDisplay}}} li kute e sina la, ona kama kute ala e sina. sina kute e {followingCount, plural,other {jan {followingCountDisplay}}} la, sina kama kute ala e ona.",
   "domain_block_modal.you_will_lose_relationships": "jan li lon kulupu ni la ona kute e sina la, ona li kama kute ala e sina. jan li lon kulupu ni la sina kute e ona la, sina kama kute ala e ona.",
   "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
   "domain_pill.server": "ma",
   "domain_pill.their_handle": "nimi pi ona taso li ni:",
+  "domain_pill.their_server": "ni li ma ona lon ilo. toki ale ona li lon ma ni.",
+  "domain_pill.their_username": "ni li nimi ona lon ma ni. jan mute li lon ma ante la, nimi ona li ken sama.",
   "domain_pill.username": "nimi jan",
+  "domain_pill.whats_in_a_handle": "seme li lon nimi?",
+  "domain_pill.who_they_are": "nimi ilo la sona jan en sona ma li lon. ni la sina ken toki tawa jan ni lon <button>kulupu ma ale</button>.",
+  "domain_pill.your_handle": "nimi sina:",
+  "domain_pill.your_server": "ni li ma sina lon ilo. toki ale sina li lon ma ni. ma li ike tawa sina la, sina ken tawa ma ante. ni la jan kute sina li tawa sama.",
   "domain_pill.your_username": "ni li nimi sina. ma sina la, sina taso li jo e ona. jan mute li lon ma ante la, ona li ken jo e nimi sama.",
+  "embed.instructions": "o pana e toki ni la, toki li lon lipu ante. ",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.clear": "o weka",
@@ -225,6 +270,7 @@
   "emoji_button.not_found": "sitelen pilin ala li lon",
   "emoji_button.objects": "ijo",
   "emoji_button.people": "jan",
+  "emoji_button.recent": "kepeken suli",
   "emoji_button.search": "o alasa...",
   "emoji_button.search_results": "ijo pi alasa ni",
   "emoji_button.symbols": "sitelen",
@@ -249,6 +295,7 @@
   "explore.title": "o alasa",
   "explore.trending_links": "sin",
   "explore.trending_statuses": "toki",
+  "explore.trending_tags": "kulupu pi lipu suli",
   "filter_modal.added.settings_link": "lipu lawa",
   "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
@@ -277,15 +324,23 @@
   "hashtag.column_settings.tag_mode.all": "ale ni",
   "hashtag.column_settings.tag_mode.any": "wan ni",
   "hashtag.column_settings.tag_mode.none": "ala ni",
+  "hashtag.counter_by_accounts": "{count, plural, other {jan {counter}}}",
   "hashtag.counter_by_uses": "{count, plural, other {toki {counter}}}",
+  "hashtag.follow": "o kute e kulupu lipu",
+  "hashtag.unfollow": "o kute ala e kulupu lipu",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "info_button.label": "sona",
+  "interaction_modal.go": "o tawa ma ni",
   "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}",
+  "interaction_modal.title.vote": "o pana tawa wile sona pi jan {name}",
+  "interaction_modal.username_prompt": "ni li sama ni: {example}",
   "intervals.full.days": "{number, plural, other {suni #}}",
+  "intervals.full.hours": "{number, plural, other {tenpo suli #}}",
   "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",
@@ -304,10 +359,17 @@
   "lightbox.previous": "monsi",
   "link_preview.author": "tan {name}",
   "lists.delete": "o weka e kulupu lipu",
+  "lists.done": "ale li pini",
   "lists.edit": "o ante e kulupu lipu",
+  "lists.list_members_count": "{count, plural, other {jan #}}",
+  "lists.list_name": "nimi kulupu",
+  "lists.new_list_name": "nimi pi kulupu sin",
+  "lists.no_lists_yet": "kulupu li lon ala.",
+  "lists.remove_member": "o weka",
   "lists.replies_policy.followed": "jan kute ale",
   "lists.replies_policy.list": "jan pi kulupu ni taso",
   "lists.replies_policy.none": "jan ala",
+  "lists.search": "o alasa",
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
   "mute_modal.title": "sina wile ala wile kute e jan ni?",
@@ -368,7 +430,7 @@
   "report.category.title": "ike seme li lon {type} ni",
   "report.category.title_account": "lipu",
   "report.category.title_status": "toki",
-  "report.close": "o pini",
+  "report.close": "ale li pona",
   "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",
@@ -377,7 +439,7 @@
   "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.unfollow": "o kute ala e {name}",
   "report_notification.categories.legal": "ike tawa nasin lawa",
   "report_notification.categories.other": "ante",
   "search.no_recent_searches": "alasa ala li lon tenpo poka",
@@ -427,17 +489,7 @@
   "units.short.thousand": "{count}K",
   "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.analyzing_picture": "ilo li lukin e sitelen...",
-  "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",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 9ce76a03d5..589037af4d 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Beklenmedik bir hata oluştu.",
   "alert.unexpected.title": "Hay aksi!",
   "alt_text_badge.title": "Alternatif metin",
+  "alt_text_modal.add_alt_text": "Alternatif metin ekle",
+  "alt_text_modal.add_text_from_image": "Resimden metin ekle",
+  "alt_text_modal.cancel": "İptal et",
+  "alt_text_modal.change_thumbnail": "Küçük resmi değiştir",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Bunu işitme sorunu yaşayan kişiler için betimleyin…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Bunu görme bozukluğu yaşayan kişiler için betimleyin…",
+  "alt_text_modal.done": "Tamamlandı",
   "announcement.announcement": "Duyuru",
   "annual_report.summary.archetype.booster": "Trend takipçisi",
   "annual_report.summary.archetype.lurker": "Gizli meraklı",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Oturumu kapat",
   "confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
   "confirmations.logout.title": "Oturumu kapat?",
+  "confirmations.missing_alt_text.confirm": "Alternatif metin ekle",
+  "confirmations.missing_alt_text.message": "Gönderiniz alternatif metni olmayan medya içeriyor. Tanımlamalar eklemek, içeriğinizi insanlar açısından daha erişilebilir kılar.",
+  "confirmations.missing_alt_text.secondary": "Yine de gönder",
+  "confirmations.missing_alt_text.title": "Alternatif metin ekle?",
   "confirmations.mute.confirm": "Sessize al",
   "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.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Takip etmeyen kişilerin bildirimlerini yoksay?",
   "ignore_notifications_modal.not_following_title": "Takip etmediğin kişilerin bildirimlerini yoksay?",
   "ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
+  "info_button.label": "Yardım",
+  "info_button.what_is_alt_text": "<h1>Alternatif metin nedir?</h1><p>Alternatif metin, görme bozukluğu olan, düşük bant genişliğine sahip bağlantıları olan veya ekstra bağlam arayan kişiler için görsel açıklamaları sağlar.</p><p>Net, sade ve nesnel alternatif metin yazarak herkes için erişilebilirliği ve anlaşılabilirliği iyileştirebilirsiniz.</p><ul><li>Önemlileri yakalayın</li><li>Resimlerdeki metni özetleyin</li><li>Düzenli cümle yapısı kullanın</li><li>Gereksiz bilgilerden kaçının</li><li>Karmaşık görsellerde (şemalar veya haritalar gibi) trendlere ve temel bulgulara odaklanın</li></ul>",
   "interaction_modal.action.favourite": "Devam etmek için, hesabınızı kullanarak beğenmelisiniz.",
   "interaction_modal.action.follow": "Devam etmek için, hesabınızı kullanarak takip etmelisiniz.",
   "interaction_modal.action.reblog": "Devam etmek için, hesabınızı kullanarak tekrar göndermelisiniz.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Resim, video veya ses dosyası ekleyin",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "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.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
   "upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
   "upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",
   "upload_form.drag_and_drop.on_drag_over": "Medya eklentisi {item} hareket ettirildi.",
   "upload_form.drag_and_drop.on_drag_start": "Medya eklentisi {item} tutuldu.",
   "upload_form.edit": "Düzenle",
-  "upload_form.thumbnail": "Küçük resmi değiştir",
-  "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
-  "upload_modal.analyzing_picture": "Görsel analiz ediliyor…",
-  "upload_modal.apply": "Uygula",
-  "upload_modal.applying": "Uygulanıyor…",
-  "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",
-  "upload_modal.hint": "Her zaman tüm küçük resimlerde görüntülenecek odak noktasını seçmek için ön izlemedeki daireyi tıklayın veya sürükleyin.",
-  "upload_modal.preparing_ocr": "OCR hazırlanıyor…",
-  "upload_modal.preview_label": "Ön izleme ({ratio})",
   "upload_progress.label": "Yükleniyor...",
   "upload_progress.processing": "İşleniyor…",
   "username.taken": "Bu kullanıcı adı alınmış. Farklı bir tane deneyin",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 00e8c83ab7..c545711052 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -406,17 +406,7 @@
   "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.edit": "Үзгәртү",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
-  "upload_modal.apply": "Куллан",
-  "upload_modal.applying": "Куллану…",
-  "upload_modal.choose_image": "Рәсемне сайлау",
-  "upload_modal.detect_text": "Рәсемнән текстны ачыклау",
-  "upload_modal.edit_media": "Медиа-файлны үзгәртү",
-  "upload_modal.preparing_ocr": "OCR әзерләү…",
   "upload_progress.label": "Йөкләү...",
   "upload_progress.processing": "Эшкәртелә…",
   "video.close": "Видеоны ябу",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index d6e4142f0d..378f688ba8 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -73,8 +73,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index af72998fd9..7274f425ea 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Сталася неочікувана помилка.",
   "alert.unexpected.title": "Ой!",
   "alt_text_badge.title": "Альтернативний текст",
+  "alt_text_modal.add_alt_text": "Додати альтернативний текст",
+  "alt_text_modal.add_text_from_image": "Додати текст із малюнку",
+  "alt_text_modal.cancel": "Скасувати",
+  "alt_text_modal.change_thumbnail": "Змінити мініатюру",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Опишіть цю ідею для людей із порушеннями слуху…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Опишіть цю ідею для людей із порушеннями зору…",
+  "alt_text_modal.done": "Готово",
   "announcement.announcement": "Оголошення",
   "annual_report.summary.archetype.booster": "Мисливець на дописи",
   "annual_report.summary.archetype.lurker": "Причаєнець",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
   "confirmations.logout.title": "Вийти?",
+  "confirmations.missing_alt_text.confirm": "Додати альтернативний текст",
+  "confirmations.missing_alt_text.message": "У вашому дописі є медіа без альтернативного тексту. Додавання опису допоможе зробити ваші матеріали доступними для більшої кількості людей.",
+  "confirmations.missing_alt_text.secondary": "Все одно опублікувати",
+  "confirmations.missing_alt_text.title": "Додати альтернативний текст?",
   "confirmations.mute.confirm": "Приховати",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Ігнорувати сповіщення від людей, які не підписані на вас?",
   "ignore_notifications_modal.not_following_title": "Ігнорувати сповіщення від людей, на яких ви не підписалися?",
   "ignore_notifications_modal.private_mentions_title": "Ігнорувати сповіщення від небажаних приватних згадок?",
+  "info_button.label": "Довідка",
+  "info_button.what_is_alt_text": "<h1>Що таке альтернативний текст?</h1> <p>Альтернативний текст містить описи зображень для людей з вадами зору, низькошвидкісними з'єднаннями або тих, хто шукає додатковий контекст.</p> <p>Ви можете покращити доступність і розуміння для всіх, написавши чіткий та лаконічний альтернативний текст.</p> <ul> <li>Позначайте важливі елементи</li> <li>Охоплюйте текст у картинках</li> <li>Використовуйте звичайну структуру речень</li> <li>Уникайте надлишкової інформації</li> <li>Зосередьтеся на тенденціях і ключових висновках у складних візуальних формах (наприклад, діаграмах або картах)</li> </ul>",
   "interaction_modal.action.favourite": "Щоб продовжити, потрібно додати улюблене з вашого облікового запису.",
   "interaction_modal.action.follow": "Щоб іти далі, потрібно підписатися з вашого облікового запису.",
   "interaction_modal.action.reblog": "Щоб іти далі, потрібно зробити реблог з вашого облікового запису.",
@@ -457,7 +470,7 @@
   "keyboard_shortcuts.toggle_hidden": "Показати/приховати текст під попередженням про вміст",
   "keyboard_shortcuts.toggle_sensitivity": "Показати/приховати медіа",
   "keyboard_shortcuts.toot": "Створити новий допис",
-  "keyboard_shortcuts.translate": "для перекладу повідомлення",
+  "keyboard_shortcuts.translate": "перекласти допис",
   "keyboard_shortcuts.unfocus": "Розфокусуватися з нового допису чи пошуку",
   "keyboard_shortcuts.up": "Рухатися вгору списком",
   "lightbox.close": "Закрити",
@@ -548,8 +561,8 @@
   "notification.annual_report.view": "Переглянути #Wrapstodon",
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.favourite.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> вподобали ваш допис",
-  "notification.favourite_pm": "{name} додав вашу особисту згадку до вибраного",
-  "notification.favourite_pm.name_and_others_with_link": "{name} та <a>{count, plural, one {# other} other {# others}}</a> додали вашу особисту згадку до вибраного",
+  "notification.favourite_pm": "{name} додає вашу особисту згадку до вибраного",
+  "notification.favourite_pm.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> додали вашу особисту згадку до вибраного",
   "notification.follow": "{name} підписалися на вас",
   "notification.follow.name_and_others": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> стежать за вами",
   "notification.follow_request": "{name} відправили запит на підписку",
@@ -782,7 +795,7 @@
   "search_results.all": "Усі",
   "search_results.hashtags": "Хештеґи",
   "search_results.no_results": "Жодних результатів.",
-  "search_results.no_search_yet": "Спробуйте пошукати записи, профілі або хештеґи.",
+  "search_results.no_search_yet": "Спробуйте пошукати дописи, профілі або хештеґи.",
   "search_results.see_all": "Показати все",
   "search_results.statuses": "Дописів",
   "search_results.title": "Шукати \"{q}\"",
@@ -837,7 +850,7 @@
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
   "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
-  "status.remove_favourite": "Видалити з улюблених",
+  "status.remove_favourite": "Вилучити з улюбленого",
   "status.replied_in_thread": "Відповідь у потоці",
   "status.replied_to": "Відповідь для {name}",
   "status.reply": "Відповісти",
@@ -875,26 +888,12 @@
   "upload_button.label": "Додати зображення, відео або аудіо",
   "upload_error.limit": "Ви перевищили ліміт завантаження файлів.",
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
-  "upload_form.audio_description": "Опишіть для людей із вадами слуху",
-  "upload_form.description": "Опишіть для людей з вадами зору",
   "upload_form.drag_and_drop.instructions": "Щоб вибрати медіавкладення, натисніть пробіл або Enter. Під час перетягування, використайте клавіші зі стрілками для переміщення вкладення в будь-якому напрямку. Натисніть пробіл або Enter знову, щоб залишити медіавкладення в новому положенні, або натисніть клавішу Escape, щоб скасувати.",
   "upload_form.drag_and_drop.on_drag_cancel": "Перетягування скасовано. Медіавкладення {item} прибрано.",
   "upload_form.drag_and_drop.on_drag_end": "Медіавкладення {item} прибрано.",
   "upload_form.drag_and_drop.on_drag_over": "Медіавкладення {item} переміщено.",
   "upload_form.drag_and_drop.on_drag_start": "Медіавкладення {item} вибрано.",
   "upload_form.edit": "Змінити",
-  "upload_form.thumbnail": "Змінити мініатюру",
-  "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
-  "upload_modal.analyzing_picture": "Аналізуємо зображення…",
-  "upload_modal.apply": "Застосувати",
-  "upload_modal.applying": "Застосування…",
-  "upload_modal.choose_image": "Вибрати зображення",
-  "upload_modal.description_placeholder": "Щурячий бугай із їжаком-харцизом в'ючись підписали ґешефт у єнах",
-  "upload_modal.detect_text": "Виявити текст на зображенні",
-  "upload_modal.edit_media": "Редагувати медіа",
-  "upload_modal.hint": "Клацніть або перетягніть коло на превʼю, щоб обрати точку, яку буде завжди видно на мініатюрах.",
-  "upload_modal.preparing_ocr": "Підготовка OCR…",
-  "upload_modal.preview_label": "Переглянути ({ratio})",
   "upload_progress.label": "Вивантаження...",
   "upload_progress.processing": "Обробка…",
   "username.taken": "Це ім'я користувача вже зайнято. Спробуйте інше",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 1d7a7b9094..cd50b512b4 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -253,8 +253,5 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index cbe15929a5..e58ab35444 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -320,6 +320,5 @@
   "status.open": "Expand this status",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "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_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 3bad8fedb7..88e926ffb1 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "Đã xảy ra lỗi không mong muốn.",
   "alert.unexpected.title": "Ốiii!",
   "alt_text_badge.title": "Văn bản thay thế",
+  "alt_text_modal.add_alt_text": "Thêm văn bản thay thế",
+  "alt_text_modal.add_text_from_image": "Thêm văn bản từ ảnh",
+  "alt_text_modal.cancel": "Hủy bỏ",
+  "alt_text_modal.change_thumbnail": "Đổi thumbnail",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Mô tả cho người khiếm thính…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Mô tả cho người khiếm thị…",
+  "alt_text_modal.done": "Xong",
   "announcement.announcement": "Có gì mới?",
   "annual_report.summary.archetype.booster": "Hiệp sĩ ngầu",
   "annual_report.summary.archetype.lurker": "Kẻ rình mò",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có chắc muốn thoát?",
   "confirmations.logout.title": "Đăng xuất",
+  "confirmations.missing_alt_text.confirm": "Thêm văn bản thay thế",
+  "confirmations.missing_alt_text.message": "Tút của bạn chứa media không có văn bản thay thế. Thêm mô tả giúp nội dung của bạn dễ tiếp cận với nhiều người hơn.",
+  "confirmations.missing_alt_text.secondary": "Đăng luôn",
+  "confirmations.missing_alt_text.title": "Thêm văn bản thay thế?",
   "confirmations.mute.confirm": "Ẩn",
   "confirmations.redraft.confirm": "Xóa & viết lại",
   "confirmations.redraft.message": "Điều này sẽ khiến những lượt thích và đăng lại của tút bị mất, cũng như những trả lời sẽ không còn nội dung gốc.",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "Bỏ qua thông báo từ những người chưa theo dõi bạn?",
   "ignore_notifications_modal.not_following_title": "Bỏ qua thông báo từ những người bạn không theo dõi?",
   "ignore_notifications_modal.private_mentions_title": "Bỏ qua thông báo từ những lượt Nhắn Riêng không mong muốn?",
+  "info_button.label": "Trợ giúp",
+  "info_button.what_is_alt_text": "<h1>Văn bản thay thế là gì?</h1> <p>Văn bản thay thế giúp mô tả hình ảnh cho những người khiếm thị, kết nối mạng chậm hoặc những người muốn biết ngữ cảnh bổ sung.</p> <p>Bạn có thể cải thiện khả năng tiếp cận và giải thích kỹ hơn cho mọi người bằng cách viết văn bản thay thế rõ ràng, ngắn gọn và khách quan.</p> <ul> <li>Nắm bắt thành phần quan trọng</li> <li>Tóm tắt văn bản trong hình</li> <li>Dùng cấu trúc câu đơn</li> <li>Tránh giải thích rối rắmn</li> <li>Tập trung vào các xu hướng và phát hiện chính trong hình ảnh phức tạp (như biểu đồ hoặc bản đồ)</li> </ul>",
   "interaction_modal.action.favourite": "Để thích, bạn cần dùng tài khoản của bạn.",
   "interaction_modal.action.follow": "Để theo dõi, bạn cần dùng tài khoản của bạn.",
   "interaction_modal.action.reblog": "Để đăng lại, bạn cần dùng tài khoản của bạn.",
@@ -875,26 +888,12 @@
   "upload_button.label": "Thêm media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Tập tin tải lên vượt quá giới hạn cho phép.",
   "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.drag_and_drop.instructions": "Để chọn tập tin đính kèm, hãy nhấn phím cách hoặc phím Enter. Trong khi kéo, sử dụng các phím mũi tên để di chuyển tập tin đính kèm theo bất kỳ hướng nào. Nhấn phím cách hoặc phím Enter một lần nữa để thả tập tin đính kèm vào vị trí mới hoặc nhấn phím thoát để hủy.",
   "upload_form.drag_and_drop.on_drag_cancel": "Kéo thả đã bị hủy bỏ. Tập tin đính kèm {item} bị bỏ qua.",
   "upload_form.drag_and_drop.on_drag_end": "Tập tin đính kèm {item} bị bỏ qua.",
   "upload_form.drag_and_drop.on_drag_over": "Tập tin đính kèm {item} đã bị dời.",
   "upload_form.drag_and_drop.on_drag_start": "Đã chọn tập tin đính kèm {item}.",
   "upload_form.edit": "Biên tập",
-  "upload_form.thumbnail": "Đổi ảnh thumbnail",
-  "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",
-  "upload_modal.applying": "Đang áp dụng…",
-  "upload_modal.choose_image": "Chọn ảnh",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Trích văn bản từ trong ảnh",
-  "upload_modal.edit_media": "Biên tập",
-  "upload_modal.hint": "Nhấp hoặc kéo vòng tròn trên bản xem trước để chọn phần hiển thị trên hình thu nhỏ.",
-  "upload_modal.preparing_ocr": "Đang nhận dạng ký tự…",
-  "upload_modal.preview_label": "Xem trước ({ratio})",
   "upload_progress.label": "Đang tải lên...",
   "upload_progress.processing": "Đang tải lên…",
   "username.taken": "Tên người dùng đã được sử dụng. Hãy thử tên khác",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index f71e1a6c41..334365acbe 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -169,11 +169,7 @@
   "time_remaining.days": "{number, plural, one {# ⵡⴰⵙⵙ} other {# ⵡⵓⵙⵙⴰⵏ}} ⵉⵇⵇⵉⵎⵏ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_button.label": "ⵔⵏⵓ ⵜⴰⵡⵍⴰⴼⵜ, ⴰⴼⵉⴷⵢⵓ ⵏⵖ ⴰⴼⴰⵢⵍⵓ ⵙ ⵉⵎⵙⵍⵉ",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "ⵙⵏⴼⵍ",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
   "upload_progress.label": "Uploading…",
   "video.close": "ⵔⴳⵍ ⴰⴼⵉⴷⵢⵓ",
   "video.download": "ⴰⴳⵎ ⴰⴼⴰⵢⵍⵓ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 55cb2313d4..a096db73da 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "发生了意外错误。",
   "alert.unexpected.title": "哎呀！",
   "alt_text_badge.title": "替代文本",
+  "alt_text_modal.add_alt_text": "添加替代文本",
+  "alt_text_modal.add_text_from_image": "从图像中添加文本",
+  "alt_text_modal.cancel": "取消",
+  "alt_text_modal.change_thumbnail": "更改缩略图",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "请为听力障碍人士描述此内容…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "请为视力障碍人士描述此内容…",
+  "alt_text_modal.done": "完成",
   "announcement.announcement": "公告",
   "annual_report.summary.archetype.booster": "潮流捕手",
   "annual_report.summary.archetype.lurker": "吃瓜群众",
@@ -109,7 +116,7 @@
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
   "block_modal.remote_users_caveat": "我们将要求站点 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些站点可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
-  "block_modal.show_less": "隐藏",
+  "block_modal.show_less": "折叠",
   "block_modal.show_more": "显示更多",
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
   "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
   "confirmations.logout.title": "确定要退出登录？",
+  "confirmations.missing_alt_text.confirm": "添加替代文本",
+  "confirmations.missing_alt_text.message": "您的帖子包含没有添加替代文本的媒体。添加描述有助于使更多人访问您的内容。",
+  "confirmations.missing_alt_text.secondary": "就这样发布",
+  "confirmations.missing_alt_text.title": "添加替代文本?",
   "confirmations.mute.confirm": "隐藏",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
@@ -221,8 +232,8 @@
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
   "confirmations.unfollow.title": "确定要取消关注用户？",
-  "content_warning.hide": "隐藏",
-  "content_warning.show": "展开",
+  "content_warning.hide": "隐藏嘟文",
+  "content_warning.show": "仍要显示",
   "content_warning.show_more": "展开",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "是否忽略未关注你的人的通知？",
   "ignore_notifications_modal.not_following_title": "是否忽略你未关注的人的通知？",
   "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
+  "info_button.label": "帮助",
+  "info_button.what_is_alt_text": "<h1>什么是替代文本？</h1> <p>替代文本为视力障碍者、低带宽连接用户或需要额外背景信息的用户提供图像描述。</p> <p>通过编写清晰、简洁、客观的替代文本，可以提升所有人的可访问性和理解力。</p> <ul> <li>捕捉重要元素</li> <li>总结图像中的文本</li> <li>使用常规句子结构</li> <li>避免冗余信息</li> <li>关注复杂视觉内容(如图表或地图)中的趋势和关键信息</li> </ul>",
   "interaction_modal.action.favourite": "你需要切换到自己的账号，再发送喜欢。",
   "interaction_modal.action.follow": "你需要切换到自己的账号，再进行关注。",
   "interaction_modal.action.reblog": "你需要切换到自己的账号，再进行转嘟。",
@@ -875,26 +888,12 @@
   "upload_button.label": "上传图片、视频或音频",
   "upload_error.limit": "文件大小超过限制。",
   "upload_error.poll": "投票中不允许上传文件。",
-  "upload_form.audio_description": "为听障人士添加文字描述",
-  "upload_form.description": "为视觉障碍人士添加文字说明",
   "upload_form.drag_and_drop.instructions": "要选中某个媒体附件，请按空格键或回车键。在拖拽时，使用方向键将媒体附件移动到任何给定方向。再次按空格键或回车键可将媒体附件放置在新位置，或按 Esc 键取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "拖拽已终止。媒体附件 {item} 已被丢弃。",
   "upload_form.drag_and_drop.on_drag_end": "媒体附件 {item} 已被丢弃。",
   "upload_form.drag_and_drop.on_drag_over": "媒体附件 {item} 已被移动。",
   "upload_form.drag_and_drop.on_drag_start": "已选中媒体附件 {item}。",
   "upload_form.edit": "编辑",
-  "upload_form.thumbnail": "更改缩略图",
-  "upload_form.video_description": "为听障人士与视障人士添加文字描述",
-  "upload_modal.analyzing_picture": "正在分析图片…",
-  "upload_modal.apply": "应用",
-  "upload_modal.applying": "正在应用…",
-  "upload_modal.choose_image": "选择图片",
-  "upload_modal.description_placeholder": "在这里写下你的描述",
-  "upload_modal.detect_text": "从图片中检测文本",
-  "upload_modal.edit_media": "编辑媒体",
-  "upload_modal.hint": "在预览图上点击或拖动圆圈，以选择缩略图的焦点。",
-  "upload_modal.preparing_ocr": "正在准备文字识别…",
-  "upload_modal.preview_label": "预览 ({ratio})",
   "upload_progress.label": "上传中…",
   "upload_progress.processing": "正在处理…",
   "username.taken": "此用户名已被占用。请换用其它用户名",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 39ffffb313..264a75fefd 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -707,21 +707,7 @@
   "upload_button.label": "加入圖片、影片或音訊檔",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許在投票上傳檔案。",
-  "upload_form.audio_description": "簡單描述內容給聽障人士",
-  "upload_form.description": "為視覺障礙人士添加文字說明",
   "upload_form.edit": "編輯",
-  "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.video_description": "簡單描述給聽障或視障人士",
-  "upload_modal.analyzing_picture": "正在分析圖片…",
-  "upload_modal.apply": "套用",
-  "upload_modal.applying": "套用中…",
-  "upload_modal.choose_image": "選擇圖片",
-  "upload_modal.description_placeholder": "一隻敏捷的狐狸，輕巧地跳過那隻懶洋洋的狗",
-  "upload_modal.detect_text": "從圖片偵測文字",
-  "upload_modal.edit_media": "編輯媒體",
-  "upload_modal.hint": "點擊或拖曳圓圈以選擇預覽縮圖。",
-  "upload_modal.preparing_ocr": "準備辨識圖片文字…",
-  "upload_modal.preview_label": "預覽 ({ratio})",
   "upload_progress.label": "上載中……",
   "upload_progress.processing": "處理中...",
   "username.taken": "這個使用者名稱已被使用。試試另一個",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index a06b566d01..a91778a9fb 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -86,6 +86,13 @@
   "alert.unexpected.message": "發生非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
   "alt_text_badge.title": "ALT 說明文字",
+  "alt_text_modal.add_alt_text": "新增說明文字",
+  "alt_text_modal.add_text_from_image": "自圖片新增說明文字",
+  "alt_text_modal.cancel": "取消",
+  "alt_text_modal.change_thumbnail": "變更預覽圖",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "替聽覺障礙人士描述...",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "替視覺障礙人士描述...",
+  "alt_text_modal.done": "完成",
   "announcement.announcement": "公告",
   "annual_report.summary.archetype.booster": "酷炫獵人",
   "annual_report.summary.archetype.lurker": "潛水高手",
@@ -211,6 +218,10 @@
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.logout.title": "您確定要登出嗎？",
+  "confirmations.missing_alt_text.confirm": "新增說明文字",
+  "confirmations.missing_alt_text.message": "您的嘟文中的多媒體內容未附上說明文字。添加說明文字描述能幫助更多人存取您的內容。",
+  "confirmations.missing_alt_text.secondary": "仍要發嘟",
+  "confirmations.missing_alt_text.title": "是否新增說明文字？",
   "confirmations.mute.confirm": "靜音",
   "confirmations.redraft.confirm": "刪除並重新編輯",
   "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
@@ -407,6 +418,8 @@
   "ignore_notifications_modal.not_followers_title": "忽略來自未跟隨您帳號之推播通知？",
   "ignore_notifications_modal.not_following_title": "忽略來自您未跟隨帳號之推播通知？",
   "ignore_notifications_modal.private_mentions_title": "忽略來自不請自來私訊之推播通知？",
+  "info_button.label": "幫助",
+  "info_button.what_is_alt_text": "<h1>何謂 ALT 說明文字？</h1> <p>ALT 說明文字為視覺障礙者、低網路頻寬或尋求額外上下文語境的人們提供圖片描述。</p> <p>您可以透過撰寫清晰、簡潔及客觀的說明文字以替所有人改善無障礙特性與協助理解。</p> <ul> <li>掌握幾個重要元素</li> <li>替圖片提供文字摘要</li> <li>使用常規行文結構</li> <li>避免冗贅資訊</li> <li>聚焦於趨勢與複雜視覺中之關鍵（如圖表或地圖）</li> </ul>",
   "interaction_modal.action.favourite": "若欲繼續，您必須自您的帳號加入最愛。",
   "interaction_modal.action.follow": "若欲繼續，您必須自您的帳號跟隨。",
   "interaction_modal.action.reblog": "若欲繼續，您必須自您的帳號轉嘟。",
@@ -875,26 +888,12 @@
   "upload_button.label": "上傳圖片、影片、或者音訊檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許於投票時上傳檔案。",
-  "upload_form.audio_description": "為聽障人士增加文字說明",
-  "upload_form.description": "為視障人士增加文字說明",
   "upload_form.drag_and_drop.instructions": "請按空白鍵或 Enter 鍵取多媒體附加檔案。使用方向鍵移動多媒體附加檔案。按下空白鍵或 Enter 鍵於新位置放置多媒體附加檔案，或按下 ESC 鍵取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "移動已取消。多媒體附加檔案 {item} 已被放置。",
   "upload_form.drag_and_drop.on_drag_end": "多媒體附加檔案 {item} 已被放置。",
   "upload_form.drag_and_drop.on_drag_over": "多媒體附加檔案 {item} 已被移動。",
   "upload_form.drag_and_drop.on_drag_start": "多媒體附加檔案 {item} 已被選取。",
   "upload_form.edit": "編輯",
-  "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.video_description": "為聽障或視障人士增加文字說明",
-  "upload_modal.analyzing_picture": "正在分析圖片…",
-  "upload_modal.apply": "套用",
-  "upload_modal.applying": "正在套用...",
-  "upload_modal.choose_image": "選擇圖片",
-  "upload_modal.description_placeholder": "我能吞下玻璃而不傷身體",
-  "upload_modal.detect_text": "自圖片中偵測文字",
-  "upload_modal.edit_media": "編輯媒體",
-  "upload_modal.hint": "於預覽中點擊或拖曳圓圈以選擇將於所有縮圖中顯示的焦點。",
-  "upload_modal.preparing_ocr": "準備 OCR 中……",
-  "upload_modal.preview_label": "預覽 ({ratio})",
   "upload_progress.label": "上傳中...",
   "upload_progress.processing": "處理中...",
   "username.taken": "這個帳號已經被註冊過囉。請嘗試其他帳號",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index ba975b75a8..0f092876e1 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -1,5 +1,6 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
+import { changeUploadCompose } from 'mastodon/actions/compose_typed';
 import { timelineDelete } from 'mastodon/actions/timelines_typed';
 
 import {
@@ -36,17 +37,11 @@ import {
   COMPOSE_LANGUAGE_CHANGE,
   COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
-  COMPOSE_UPLOAD_CHANGE_REQUEST,
-  COMPOSE_UPLOAD_CHANGE_SUCCESS,
-  COMPOSE_UPLOAD_CHANGE_FAIL,
   COMPOSE_RESET,
   COMPOSE_POLL_ADD,
   COMPOSE_POLL_REMOVE,
   COMPOSE_POLL_OPTION_CHANGE,
   COMPOSE_POLL_SETTINGS_CHANGE,
-  INIT_MEDIA_EDIT_MODAL,
-  COMPOSE_CHANGE_MEDIA_DESCRIPTION,
-  COMPOSE_CHANGE_MEDIA_FOCUS,
   COMPOSE_CHANGE_MEDIA_ORDER,
   COMPOSE_SET_STATUS,
   COMPOSE_FOCUS,
@@ -87,13 +82,6 @@ const initialState = ImmutableMap({
   resetFileKey: Math.floor((Math.random() * 0x10000)),
   idempotencyKey: null,
   tagHistory: ImmutableList(),
-  media_modal: ImmutableMap({
-    id: null,
-    description: '',
-    focusX: 0,
-    focusY: 0,
-    dirty: false,
-  }),
 });
 
 const initialPoll = ImmutableMap({
@@ -294,7 +282,24 @@ const updatePoll = (state, index, value, maxOptions) => state.updateIn(['poll',
   return tmp;
 });
 
-export default function compose(state = initialState, action) {
+/** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
+export const composeReducer = (state = initialState, action) => {
+  if (changeUploadCompose.fulfilled.match(action)) {
+    return state
+      .set('is_changing_upload', false)
+      .update('media_attachments', list => list.map(item => {
+        if (item.get('id') === action.payload.media.id) {
+          return fromJS(action.payload.media).set('unattached', !action.payload.attached);
+        }
+
+        return item;
+      }));
+  } else if (changeUploadCompose.pending.match(action)) {
+    return state.set('is_changing_upload', true);
+  } else if (changeUploadCompose.rejected.match(action)) {
+    return state.set('is_changing_upload', false);
+  }
+
   switch(action.type) {
   case STORE_HYDRATE:
     return hydrate(state, action.state.get('compose'));
@@ -369,16 +374,13 @@ export default function compose(state = initialState, action) {
     });
   case COMPOSE_SUBMIT_REQUEST:
     return state.set('is_submitting', true);
-  case COMPOSE_UPLOAD_CHANGE_REQUEST:
-    return state.set('is_changing_upload', true);
+
   case COMPOSE_REPLY_CANCEL:
   case COMPOSE_RESET:
   case COMPOSE_SUBMIT_SUCCESS:
     return clearAll(state);
   case COMPOSE_SUBMIT_FAIL:
     return state.set('is_submitting', false);
-  case COMPOSE_UPLOAD_CHANGE_FAIL:
-    return state.set('is_changing_upload', false);
   case COMPOSE_UPLOAD_REQUEST:
     return state.set('is_uploading', true).update('pending_media_attachments', n => n + 1);
   case COMPOSE_UPLOAD_PROCESSING:
@@ -407,20 +409,6 @@ export default function compose(state = initialState, action) {
 
         return item;
       }));
-  case INIT_MEDIA_EDIT_MODAL: {
-    const media =  state.get('media_attachments').find(item => item.get('id') === action.id);
-    return state.set('media_modal', ImmutableMap({
-      id: action.id,
-      description: media.get('description') || '',
-      focusX: media.getIn(['meta', 'focus', 'x'], 0),
-      focusY: media.getIn(['meta', 'focus', 'y'], 0),
-      dirty: false,
-    }));
-  }
-  case COMPOSE_CHANGE_MEDIA_DESCRIPTION:
-    return state.setIn(['media_modal', 'description'], action.description).setIn(['media_modal', 'dirty'], true);
-  case COMPOSE_CHANGE_MEDIA_FOCUS:
-    return state.setIn(['media_modal', 'focusX'], action.focusX).setIn(['media_modal', 'focusY'], action.focusY).setIn(['media_modal', 'dirty'], true);
   case COMPOSE_MENTION:
     return state.withMutations(map => {
       map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
@@ -458,17 +446,6 @@ export default function compose(state = initialState, action) {
     }
   case COMPOSE_EMOJI_INSERT:
     return insertEmoji(state, action.position, action.emoji, action.needsSpace);
-  case COMPOSE_UPLOAD_CHANGE_SUCCESS:
-    return state
-      .set('is_changing_upload', false)
-      .setIn(['media_modal', 'dirty'], false)
-      .update('media_attachments', list => list.map(item => {
-        if (item.get('id') === action.media.id) {
-          return fromJS(action.media).set('unattached', !action.attached);
-        }
-
-        return item;
-      }));
   case REDRAFT:
     return state.withMutations(map => {
       map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
@@ -550,4 +527,4 @@ export default function compose(state = initialState, action) {
   default:
     return state;
   }
-}
+};
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index fe9f59fcc3..2d181b6754 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -7,7 +7,7 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import compose from './compose';
+import { composeReducer } from './compose';
 import contexts from './contexts';
 import conversations from './conversations';
 import custom_emojis from './custom_emojis';
@@ -59,7 +59,7 @@ const reducers = {
   push_notifications,
   server,
   contexts,
-  compose,
+  compose: composeReducer,
   search: searchReducer,
   media_attachments,
   notifications,
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
index ca85eb8c7f..e287626ff2 100644
--- a/app/javascript/mastodon/reducers/modal.ts
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -3,7 +3,6 @@ import { Record as ImmutableRecord, Stack } from 'immutable';
 
 import { timelineDelete } from 'mastodon/actions/timelines_typed';
 
-import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import type { ModalType } from '../actions/modal';
 import { openModal, closeModal } from '../actions/modal';
 
@@ -53,12 +52,36 @@ const pushModal = (
   state: State,
   modalType: ModalType,
   modalProps: ModalProps,
+  previousModalProps?: ModalProps,
 ): State => {
   return state.withMutations((record) => {
     record.set('ignoreFocus', false);
-    record.update('stack', (stack) =>
-      stack.unshift(Modal({ modalType, modalProps })),
-    );
+    record.update('stack', (stack) => {
+      let tmp = stack;
+
+      // With this option, we update the previously opened modal, so that when the
+      // current (new) modal is closed, the previous modal is re-opened with different
+      // props. Specifically, this is useful for the confirmation modal.
+      if (previousModalProps) {
+        const previousModal = tmp.first() as Modal | undefined;
+
+        if (previousModal) {
+          tmp = tmp.shift().unshift(
+            Modal({
+              modalType: previousModal.modalType,
+              modalProps: {
+                ...previousModal.modalProps,
+                ...previousModalProps,
+              },
+            }),
+          );
+        }
+      }
+
+      tmp = tmp.unshift(Modal({ modalType, modalProps }));
+
+      return tmp;
+    });
   });
 };
 
@@ -68,11 +91,10 @@ export const modalReducer: Reducer<State> = (state = initialState, action) => {
       state,
       action.payload.modalType,
       action.payload.modalProps,
+      action.payload.previousModalProps,
     );
   else if (closeModal.match(action)) return popModal(state, action.payload);
   // TODO: type those actions
-  else if (action.type === COMPOSE_UPLOAD_CHANGE_SUCCESS)
-    return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
   else if (timelineDelete.match(action))
     return state.update('stack', (stack) =>
       stack.filterNot(
diff --git a/app/javascript/material-icons/400-24px/question_mark-fill.svg b/app/javascript/material-icons/400-24px/question_mark-fill.svg
new file mode 100644
index 0000000000..9b02086c4d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/question_mark-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M424-320q0-81 14.5-116.5T500-514q41-36 62.5-62.5T584-637q0-41-27.5-68T480-732q-51 0-77.5 31T365-638l-103-44q21-64 77-111t141-47q105 0 161.5 58.5T698-641q0 50-21.5 85.5T609-475q-49 47-59.5 71.5T539-320H424Zm56 240q-33 0-56.5-23.5T400-160q0-33 23.5-56.5T480-240q33 0 56.5 23.5T560-160q0 33-23.5 56.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/question_mark.svg b/app/javascript/material-icons/400-24px/question_mark.svg
new file mode 100644
index 0000000000..9b02086c4d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/question_mark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M424-320q0-81 14.5-116.5T500-514q41-36 62.5-62.5T584-637q0-41-27.5-68T480-732q-51 0-77.5 31T365-638l-103-44q21-64 77-111t141-47q105 0 161.5 58.5T698-641q0 50-21.5 85.5T609-475q-49 47-59.5 71.5T539-320H424Zm56 240q-33 0-56.5-23.5T400-160q0-33 23.5-56.5T480-240q33 0 56.5 23.5T560-160q0 33-23.5 56.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 4ed0e676de..d23d789e46 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -127,9 +127,7 @@
 .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,
-.simple_form .block-button,
-.simple_form .button,
-.simple_form button {
+.simple_form button:not(.button, .link-button) {
   color: $white;
 }
 
@@ -142,6 +140,11 @@
   border-top-color: lighten($ui-base-color, 4%);
 }
 
+.dialog-modal__content__preview {
+  background: #fff;
+  border-bottom: 1px solid var(--modal-border-color);
+}
+
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {
@@ -448,6 +451,15 @@
   background: darken($ui-base-color, 10%);
 }
 
+.dropdown-button.warning {
+  border-color: #b3261e;
+  color: #b3261e;
+
+  &.active {
+    background-color: #f9dedc;
+  }
+}
+
 .search__popout__menu__item {
   &:hover,
   &:active,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 072e7cb4a2..75c38d91f2 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -50,6 +50,34 @@
   }
 }
 
+.help-button {
+  background: $ui-button-background-color;
+  border: 0;
+  color: $ui-button-color;
+  border-radius: 20px;
+  cursor: pointer;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &:active,
+  &:focus,
+  &:hover {
+    background-color: $ui-button-focus-background-color;
+  }
+
+  &:focus-visible {
+    outline: $ui-button-icon-focus-outline;
+  }
+
+  .icon {
+    width: 14px;
+    height: 14px;
+  }
+}
+
 .button {
   background-color: $ui-button-background-color;
   border: 10px none;
@@ -85,6 +113,14 @@
     outline: $ui-button-icon-focus-outline;
   }
 
+  &--compact {
+    font-size: 14px;
+    line-height: normal;
+    font-weight: 700;
+    padding: 5px 12px;
+    border-radius: 4px;
+  }
+
   &--dangerous {
     background-color: var(--error-background-color);
     color: var(--on-error-color);
@@ -939,6 +975,16 @@ body > [data-popper-placement] {
     border-color: $ui-highlight-color;
     color: $primary-text-color;
   }
+
+  &.warning {
+    border-color: var(--goldenrod-2);
+    color: var(--goldenrod-2);
+
+    &.active {
+      background-color: var(--goldenrod-2);
+      color: var(--indigo-1);
+    }
+  }
 }
 
 .character-counter {
@@ -3724,58 +3770,6 @@ $ui-header-logo-wordmark-width: 99px;
   }
 }
 
-.setting-text {
-  display: block;
-  box-sizing: border-box;
-  margin: 0;
-  color: $primary-text-color;
-  background: $ui-base-color;
-  padding: 7px 10px;
-  font-family: inherit;
-  font-size: 14px;
-  line-height: 22px;
-  border-radius: 4px;
-  border: 1px solid var(--background-border-color);
-
-  &:focus {
-    outline: 0;
-  }
-
-  &__wrapper {
-    background: $ui-base-color;
-    border: 1px solid var(--background-border-color);
-    margin-bottom: 10px;
-    border-radius: 4px;
-
-    .setting-text {
-      border: 0;
-      margin-bottom: 0;
-      border-radius: 0;
-
-      &:focus {
-        border: 0;
-      }
-    }
-
-    &__modifiers {
-      color: $inverted-text-color;
-      font-family: inherit;
-      font-size: 14px;
-      background: $white;
-    }
-  }
-
-  &__toolbar {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 20px;
-  }
-
-  @media screen and (width <= 600px) {
-    font-size: 16px;
-  }
-}
-
 .status-card {
   display: flex;
   align-items: center;
@@ -4034,23 +4028,27 @@ a.status-card {
 }
 
 .load-more {
-  display: block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   color: $dark-text-color;
   background-color: transparent;
   border: 0;
   font-size: inherit;
-  text-align: center;
   line-height: inherit;
-  margin: 0;
+  width: 100%;
   padding: 15px;
   box-sizing: border-box;
-  width: 100%;
-  clear: both;
   text-decoration: none;
 
   &:hover {
     background: var(--on-surface-color);
   }
+
+  .icon {
+    width: 22px;
+    height: 22px;
+  }
 }
 
 .load-gap {
@@ -4427,6 +4425,7 @@ a.status-card {
   justify-content: center;
 }
 
+.load-more .loading-indicator,
 .button .loading-indicator {
   position: static;
   transform: none;
@@ -4438,6 +4437,10 @@ a.status-card {
   }
 }
 
+.load-more .loading-indicator .circular-progress {
+  color: lighten($ui-base-color, 26%);
+}
+
 .circular-progress {
   color: lighten($ui-base-color, 26%);
   animation: 1.4s linear 0s infinite normal none running simple-rotate;
@@ -6094,6 +6097,49 @@ a.status-card {
       gap: 16px;
       padding: 24px;
     }
+
+    &__preview {
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      align-items: center;
+      justify-content: center;
+      padding: 24px;
+      background: #000;
+
+      img {
+        display: block;
+      }
+
+      img,
+      .gifv video {
+        outline: 1px solid var(--media-outline-color);
+        outline-offset: -1px;
+        border-radius: 8px;
+      }
+
+      img,
+      .gifv video,
+      .video-player,
+      .audio-player {
+        max-width: 360px;
+        max-height: 45vh;
+      }
+    }
+  }
+
+  &__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;
+    z-index: 9999 !important;
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
   }
 
   .copy-paste-text {
@@ -6440,62 +6486,6 @@ a.status-card {
   margin-bottom: 29px;
 }
 
-.report-modal__comment {
-  padding: 20px;
-  border-inline-end: 1px solid var(--background-border-color);
-  max-width: 320px;
-
-  p {
-    font-size: 14px;
-    line-height: 20px;
-    margin-bottom: 20px;
-  }
-
-  .setting-text-label {
-    display: block;
-    color: $secondary-text-color;
-    font-size: 14px;
-    font-weight: 500;
-    margin-bottom: 10px;
-  }
-
-  .setting-text {
-    width: 100%;
-    resize: none;
-    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 {
-    margin-top: 20px;
-    margin-bottom: 24px;
-
-    &__label {
-      color: $inverted-text-color;
-      font-size: 14px;
-    }
-  }
-
-  @media screen and (width <= 480px) {
-    padding: 10px;
-    max-width: 100%;
-    order: 2;
-
-    .setting-toggle {
-      margin-bottom: 4px;
-    }
-  }
-}
-
 .actions-modal {
   max-height: 80vh;
   max-width: 80vw;
@@ -6988,11 +6978,6 @@ a.status-card {
   outline: 1px solid var(--media-outline-color);
   outline-offset: -1px;
 
-  &.editable {
-    border-radius: 0;
-    height: 100%;
-  }
-
   &.inactive {
     audio,
     .video-player__controls {
@@ -7061,11 +7046,6 @@ a.status-card {
   outline-offset: -1px;
   z-index: 2;
 
-  &.editable {
-    border-radius: 0;
-    height: 100% !important;
-  }
-
   video {
     display: block;
     z-index: -2;
@@ -7371,6 +7351,14 @@ a.status-card {
 }
 
 .gifv {
+  position: relative;
+
+  canvas {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+
   video {
     max-width: 100vw;
     max-height: 80vh;
@@ -7676,24 +7664,14 @@ noscript {
 
 .focal-point {
   position: relative;
-  cursor: move;
+  cursor: grab;
   overflow: hidden;
-  height: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
-  background: $base-shadow-color;
 
-  img,
-  video,
-  canvas {
-    display: block;
-    max-height: 80vh;
-    width: 100%;
-    height: auto;
-    margin: 0;
-    object-fit: contain;
-    background: $base-shadow-color;
+  &.dragging {
+    cursor: grabbing;
   }
 
   &__reticle {
@@ -7701,54 +7679,10 @@ noscript {
     width: 100px;
     height: 100px;
     transform: translate(-50%, -50%);
-    background: url('../images/reticle.png') no-repeat 0 0;
+    border: 2px solid #fff;
     border-radius: 50%;
     box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
-  }
-
-  &__overlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    inset-inline-start: 0;
-  }
-
-  &__preview {
-    position: absolute;
-    bottom: 10px;
-    inset-inline-end: 10px;
-    z-index: 2;
-    cursor: move;
-    transition: opacity 0.1s ease;
-
-    &:hover {
-      opacity: 0.5;
-    }
-
-    strong {
-      color: $primary-text-color;
-      font-size: 14px;
-      font-weight: 500;
-      display: block;
-      margin-bottom: 5px;
-    }
-
-    div {
-      border-radius: 4px;
-      box-shadow: 0 0 14px rgba($base-shadow-color, 0.2);
-    }
-  }
-
-  @media screen and (width <= 480px) {
-    img,
-    video {
-      max-height: 100%;
-    }
-
-    &__preview {
-      display: none;
-    }
+    pointer-events: none;
   }
 }
 
@@ -10458,12 +10392,7 @@ noscript {
 .compose-form__actions {
   .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;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 82c53de5f7..09ec0e9e41 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -76,6 +76,21 @@ code {
     margin-bottom: 16px;
     overflow: hidden;
 
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &__toolbar {
+      margin-top: 16px;
+      display: flex;
+      align-items: center;
+      gap: 16px;
+
+      .character-counter {
+        flex: 0 0 auto;
+      }
+    }
+
     &.hidden {
       margin: 0;
     }
@@ -540,6 +555,7 @@ code {
   .actions {
     margin-top: 30px;
     display: flex;
+    gap: 10px;
 
     &.actions--top {
       margin-top: 0;
@@ -548,13 +564,14 @@ code {
   }
 
   .stacked-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
     margin-top: 30px;
     margin-bottom: 15px;
   }
 
-  button,
-  .button,
-  .block-button {
+  .btn {
     display: block;
     width: 100%;
     border: 0;
@@ -571,8 +588,6 @@ code {
     cursor: pointer;
     font-weight: 500;
     outline: 0;
-    margin-bottom: 10px;
-    margin-inline-end: 10px;
 
     &:last-child {
       margin-inline-end: 0;
@@ -629,6 +644,18 @@ code {
   }
 
   .label_input {
+    position: relative;
+
+    &__loading-indicator {
+      box-sizing: border-box;
+      position: absolute;
+      top: 0;
+      inset-inline-start: 0;
+      border: 1px solid transparent;
+      padding: 10px 16px;
+      width: 100%;
+    }
+
     &__wrapper {
       position: relative;
     }
diff --git a/app/javascript/types/tesseract.d.ts b/app/javascript/types/tesseract.d.ts
new file mode 100644
index 0000000000..f638939b7e
--- /dev/null
+++ b/app/javascript/types/tesseract.d.ts
@@ -0,0 +1,3 @@
+declare module 'tesseract.js-core/tesseract-core.wasm.js';
+
+declare module 'tesseract.js/dist/worker.min.js';
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 5b9437eb8d..9122b07483 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -17,7 +17,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
 
     options         = serialization_options(options)
     serialized_hash = serializer.serializable_hash(options.merge(named_contexts: named_contexts, context_extensions: context_extensions))
-    serialized_hash = serialized_hash.select { |k, _| options[:fields].include?(k) } if options[:fields]
+    serialized_hash = serialized_hash.slice(*options[:fields]) if options[:fields]
     serialized_hash = self.class.transform_key_casing!(serialized_hash, instance_options)
 
     { '@context': serialized_context(named_contexts, context_extensions) }.merge(serialized_hash)
diff --git a/app/lib/admin/system_check/media_privacy_check.rb b/app/lib/admin/system_check/media_privacy_check.rb
index 2ddc8e8b07..378a8ce294 100644
--- a/app/lib/admin/system_check/media_privacy_check.rb
+++ b/app/lib/admin/system_check/media_privacy_check.rb
@@ -76,7 +76,7 @@ class Admin::SystemCheck::MediaPrivacyCheck < Admin::SystemCheck::BaseCheck
 
   def media_attachment
     @media_attachment ||= begin
-      attachment = Account.representative.media_attachments.first
+      attachment = Account.representative.media_attachments.take
       if attachment.present?
         attachment.touch
         attachment
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 8a0043268b..9c5c306e96 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -32,6 +32,15 @@ class FeedManager
     "feed:#{type}:#{id}:#{subtype}"
   end
 
+  # The number of items in the given timeline
+  # @param [Symbol] type
+  # @param [Integer] id
+  # @param [Symbol] subtype
+  # @return [Integer]
+  def timeline_size(type, id, subtype = nil)
+    redis.zcard(key(type, id, subtype))
+  end
+
   # The filter result of the status to a particular feed
   # @param [Symbol] timeline_type
   # @param [Status] status
@@ -42,7 +51,7 @@ class FeedManager
     when :home
       filter_from_home(status, receiver.id, build_crutches(receiver.id, [status]), :home)
     when :list
-      (filter_from_list?(status, receiver) ? :filter : nil) || filter_from_home(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list)
+      (filter_from_list?(status, receiver) ? :filter : nil) || filter_from_home(status, receiver.account_id, build_crutches(receiver.account_id, [status], list: receiver), :list)
     when :mentions
       filter_from_mentions?(status, receiver.id) ? :filter : nil
     when :tags
@@ -121,7 +130,7 @@ class FeedManager
 
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
-    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(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
@@ -149,7 +158,7 @@ class FeedManager
 
     timeline_key = key(:list, list.id)
     aggregate    = list.account.user&.aggregates_reblogs?
-    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(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
@@ -157,10 +166,10 @@ class FeedManager
     end
 
     statuses = query.to_a
-    crutches = build_crutches(list.account_id, statuses)
+    crutches = build_crutches(list.account_id, statuses, list: list)
 
     statuses.each do |status|
-      next if filter_from_home(status, list.account_id, crutches) || filter_from_list?(status, list)
+      next if filter_from_home(status, list.account_id, crutches, :list)
 
       add_to_feed(:list, list.id, status, aggregate_reblogs: aggregate)
     end
@@ -272,23 +281,32 @@ class FeedManager
     limit        = FeedManager::MAX_ITEMS / 2
     aggregate    = account.user&.aggregates_reblogs?
     timeline_key = key(:home, account.id)
+    over_limit = false
 
     account.statuses.limit(limit).each do |status|
       add_to_feed(:home, account.id, status, aggregate_reblogs: aggregate)
     end
 
     account.following.includes(:account_stat).reorder(nil).find_each do |target_account|
-      if redis.zcard(timeline_key) >= limit
+      query = target_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(limit)
+
+      over_limit ||= redis.zcard(timeline_key) >= limit
+      if over_limit
         oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
-        last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at)
+        last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at, with_random: false)
 
         # If the feed is full and this account has not posted more recently
         # than the last item on the feed, then we can skip the whole account
         # because none of its statuses would stay on the feed anyway
         next if last_status_score < oldest_home_score
+
+        # No need to get older statuses
+        query = query.where(id: oldest_home_score...)
       end
 
-      statuses = target_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
+      statuses = query.to_a
+      next if statuses.empty?
+
       crutches = build_crutches(account.id, statuses)
 
       statuses.each do |status|
@@ -301,6 +319,47 @@ class FeedManager
     end
   end
 
+  # Populate list feed of account from scratch
+  # @param [List] list
+  # @return [void]
+  def populate_list(list)
+    limit        = FeedManager::MAX_ITEMS / 2
+    aggregate    = list.account.user&.aggregates_reblogs?
+    timeline_key = key(:list, list.id)
+    over_limit = false
+
+    list.active_accounts.includes(:account_stat).reorder(nil).find_each do |target_account|
+      query = target_account.statuses.list_eligible_visibility.includes(reblog: :account).limit(limit)
+
+      over_limit ||= redis.zcard(timeline_key) >= limit
+      if over_limit
+        oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
+        last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at, with_random: false)
+
+        # If the feed is full and this account has not posted more recently
+        # than the last item on the feed, then we can skip the whole account
+        # because none of its statuses would stay on the feed anyway
+        next if last_status_score < oldest_home_score
+
+        # No need to get older statuses
+        query = query.where(id: oldest_home_score...)
+      end
+
+      statuses = query.to_a
+      next if statuses.empty?
+
+      crutches = build_crutches(list.account_id, statuses, list: list)
+
+      statuses.each do |status|
+        next if filter_from_home(status, list.account_id, crutches, :list)
+
+        add_to_feed(:list, list.id, status, aggregate_reblogs: aggregate)
+      end
+
+      trim(:list, list.id)
+    end
+  end
+
   # Completely clear multiple feeds at once
   # @param [Symbol] type
   # @param [Array<Integer>] ids
@@ -560,8 +619,9 @@ class FeedManager
   # are going to be checked by the filtering methods
   # @param [Integer] receiver_id
   # @param [Array<Status>] statuses
+  # @param [List] list
   # @return [Hash]
-  def build_crutches(receiver_id, statuses)
+  def build_crutches(receiver_id, statuses, list: nil)
     crutches = {}
 
     crutches[:active_mentions] = crutches_active_mentions(statuses)
@@ -578,20 +638,33 @@ class FeedManager
       arr
     end
 
-    lists = List.where(account_id: receiver_id, exclusive: 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)
+    crutches[:following]            = crutches_following(receiver_id, statuses, list)
     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)
     crutches[:muting]               = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
     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_list_users] = crutches_exclusive_list_users(receiver_id, statuses) if list.blank?
 
     crutches
   end
 
+  def crutches_exclusive_list_users(recipient_id, statuses)
+    lists = List.where(account_id: recipient_id, exclusive: true)
+    ListAccount.where(list: lists, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
+  end
+
+  def crutches_following(recipient_id, statuses, list)
+    if list.blank? || list.show_followed?
+      Follow.where(account_id: recipient_id, target_account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:target_account_id).index_with(true)
+    elsif list.show_list?
+      ListAccount.where(list_id: list.id, account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:account_id).index_with(true)
+    else
+      {}
+    end
+  end
+
   def crutches_active_mentions(statuses)
     Mention
       .active
diff --git a/app/lib/http_signature_draft.rb b/app/lib/http_signature_draft.rb
new file mode 100644
index 0000000000..fc0d498b29
--- /dev/null
+++ b/app/lib/http_signature_draft.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# This implements an older draft of HTTP Signatures:
+# https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures
+
+class HttpSignatureDraft
+  REQUEST_TARGET = '(request-target)'
+
+  def initialize(keypair, key_id, full_path: true)
+    @keypair = keypair
+    @key_id = key_id
+    @full_path = full_path
+  end
+
+  def request_target(verb, url)
+    if url.query.nil? || !@full_path
+      "#{verb} #{url.path}"
+    else
+      "#{verb} #{url.path}?#{url.query}"
+    end
+  end
+
+  def sign(signed_headers, verb, url)
+    signed_headers = signed_headers.merge(REQUEST_TARGET => request_target(verb, url))
+    signed_string = signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
+    algorithm = 'rsa-sha256'
+    signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
+
+    "keyId=\"#{@key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
+  end
+end
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index fe7f23f481..a8004f2925 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -46,7 +46,7 @@ class LinkDetailsExtractor
     end
 
     def image
-      obj = first_of_value(json['image'])
+      obj = first_of_hash(json['image'])
 
       return obj['url'] if obj.is_a?(Hash)
 
@@ -85,15 +85,15 @@ class LinkDetailsExtractor
     private
 
     def author
-      first_of_value(json['author']) || {}
+      first_of_hash(json['author']) || {}
     end
 
     def publisher
-      first_of_value(json['publisher']) || {}
+      first_of_hash(json['publisher']) || {}
     end
 
-    def first_of_value(arr)
-      arr.is_a?(Array) ? arr.first : arr
+    def first_of_hash(arr)
+      arr.is_a?(Array) ? arr.flatten.find { |item| item.is_a?(Hash) } : arr
     end
 
     def root_array(root)
diff --git a/app/lib/request.rb b/app/lib/request.rb
index f984f0e63e..4e0ba77833 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -61,8 +61,6 @@ class PerOperationWithDeadline < HTTP::Timeout::PerOperation
 end
 
 class Request
-  REQUEST_TARGET = '(request-target)'
-
   # We enforce a 5s timeout on DNS resolving, 5s timeout on socket opening
   # and 5s timeout on the TLS handshake, meaning the worst case should take
   # about 15s in total
@@ -78,11 +76,21 @@ class Request
     @http_client = options.delete(:http_client)
     @allow_local = options.delete(:allow_local)
     @full_path   = !options.delete(:omit_query_string)
-    @options     = options.merge(socket_class: use_proxy? || @allow_local ? ProxySocket : Socket)
-    @options     = @options.merge(timeout_class: PerOperationWithDeadline, timeout_options: TIMEOUT)
+    @options     = {
+      follow: {
+        max_hops: 3,
+        on_redirect: ->(response, request) { re_sign_on_redirect(response, request) },
+      },
+    }.merge(options).merge(
+      socket_class: use_proxy? || @allow_local ? ProxySocket : Socket,
+      timeout_class: PerOperationWithDeadline,
+      timeout_options: TIMEOUT
+    )
     @options     = @options.merge(proxy_url) if use_proxy?
     @headers     = {}
 
+    @signing = nil
+
     raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?
 
     set_common_headers!
@@ -92,8 +100,9 @@ class Request
   def on_behalf_of(actor, sign_with: nil)
     raise ArgumentError, 'actor must not be nil' if actor.nil?
 
-    @actor         = actor
-    @keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @actor.keypair
+    key_id = ActivityPub::TagManager.instance.key_uri_for(actor)
+    keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : actor.keypair
+    @signing = HttpSignatureDraft.new(keypair, key_id, full_path: @full_path)
 
     self
   end
@@ -119,7 +128,7 @@ class Request
   end
 
   def headers
-    (@actor ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
+    (@signing ? @headers.merge('Signature' => signature) : @headers)
   end
 
   class << self
@@ -134,14 +143,13 @@ class Request
     end
 
     def http_client
-      HTTP.use(:auto_inflate).follow(max_hops: 3)
+      HTTP.use(:auto_inflate)
     end
   end
 
   private
 
   def set_common_headers!
-    @headers[REQUEST_TARGET]    = request_target
     @headers['User-Agent']      = Mastodon::Version.user_agent
     @headers['Host']            = @url.host
     @headers['Date']            = Time.now.utc.httpdate
@@ -152,31 +160,28 @@ class Request
     @headers['Digest'] = "SHA-256=#{Digest::SHA256.base64digest(@options[:body])}"
   end
 
-  def request_target
-    if @url.query.nil? || !@full_path
-      "#{@verb} #{@url.path}"
-    else
-      "#{@verb} #{@url.path}?#{@url.query}"
-    end
+  def signature
+    @signing.sign(@headers.without('User-Agent', 'Accept-Encoding'), @verb, @url)
   end
 
-  def signature
-    algorithm = 'rsa-sha256'
-    signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
+  def re_sign_on_redirect(_response, request)
+    # Delete existing signature if there is one, since it will be invalid
+    request.headers.delete('Signature')
 
-    "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
-  end
+    return unless @signing.present? && @verb == :get
 
-  def signed_string
-    signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
-  end
+    signed_headers = request.headers.to_h.slice(*@headers.keys)
+    unless @headers.keys.all? { |key| signed_headers.key?(key) }
+      # We have lost some headers in the process, so don't sign the new
+      # request, in order to avoid issuing a valid signature with fewer
+      # conditions than expected.
 
-  def signed_headers
-    @headers.without('User-Agent', 'Accept-Encoding')
-  end
+      Rails.logger.warn { "Some headers (#{@headers.keys - signed_headers.keys}) have been lost on redirect from {@uri} to #{request.uri}, this should not happen. Skipping signatures" }
+      return
+    end
 
-  def key_id
-    ActivityPub::TagManager.instance.key_uri_for(@actor)
+    signature_value = @signing.sign(signed_headers.without('User-Agent', 'Accept-Encoding'), @verb, Addressable::URI.parse(request.uri))
+    request.headers['Signature'] = signature_value
   end
 
   def http_client
diff --git a/app/models/custom_emoji_category.rb b/app/models/custom_emoji_category.rb
index f480746517..dfcc156080 100644
--- a/app/models/custom_emoji_category.rb
+++ b/app/models/custom_emoji_category.rb
@@ -14,4 +14,6 @@ class CustomEmojiCategory < ApplicationRecord
   has_many :emojis, class_name: 'CustomEmoji', foreign_key: 'category_id', inverse_of: :category, dependent: nil
 
   validates :name, presence: true, uniqueness: true
+
+  scope :alphabetic, -> { order(name: :asc) }
 end
diff --git a/app/models/list.rb b/app/models/list.rb
index bb7dd4cfc0..cd01774539 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -24,6 +24,7 @@ class List < ApplicationRecord
 
   has_many :list_accounts, inverse_of: :list, dependent: :destroy
   has_many :accounts, through: :list_accounts
+  has_many :active_accounts, -> { merge(ListAccount.active) }, through: :list_accounts, source: :account
 
   validates :title, presence: true
 
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index cfbcdbf0d5..00ecd44c3c 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -20,6 +20,8 @@ class ListAccount < ApplicationRecord
   validates :account_id, uniqueness: { scope: :list_id }
   validate :validate_relationship
 
+  scope :active, -> { where.not(follow_id: nil) }
+
   before_validation :set_follow, unless: :list_owner_account_is_account?
 
   private
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 93ef0cc589..7c59339b7e 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -37,7 +37,8 @@ class Poll < ApplicationRecord
 
   validates :options, presence: true
   validates :expires_at, presence: true, if: :local?
-  validates_with PollValidator, on: :create, if: :local?
+  validates_with PollOptionsValidator, if: :local?
+  validates_with PollExpirationValidator, if: -> { local? && expires_at_changed? }
 
   before_validation :prepare_options, if: :local?
   before_validation :prepare_votes_count
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 7db14407ac..4151a9afed 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -29,6 +29,7 @@ class UserSettings
     setting :disable_hover_cards, default: false
     setting :delete_modal, default: true
     setting :reblog_modal, default: false
+    setting :missing_alt_text_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)
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 5778bcc60f..0ad06d22cc 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -12,13 +12,14 @@ class InitialStateSerializer < ActiveModel::Serializer
   has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
   has_one :role, serializer: REST::RoleSerializer
 
-  def meta
+  def meta # rubocop:disable Metrics/AbcSize
     store = default_meta_store
 
     if object.current_account
       store[:me]                = object.current_account.id.to_s
       store[:boost_modal]       = object_account_user.setting_boost_modal
       store[:delete_modal]      = object_account_user.setting_delete_modal
+      store[:missing_alt_text_modal] = object_account_user.settings['web.missing_alt_text_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
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 936748707f..e15cba7cc8 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -87,10 +87,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       },
 
       polls: {
-        max_options: PollValidator::MAX_OPTIONS,
-        max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
-        min_expiration: PollValidator::MIN_EXPIRATION,
-        max_expiration: PollValidator::MAX_EXPIRATION,
+        max_options: PollOptionsValidator::MAX_OPTIONS,
+        max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
+        min_expiration: PollExpirationValidator::MIN_EXPIRATION,
+        max_expiration: PollExpirationValidator::MAX_EXPIRATION,
       },
 
       translation: {
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index db83af4907..a1d51f50e4 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -70,10 +70,10 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
       },
 
       polls: {
-        max_options: PollValidator::MAX_OPTIONS,
-        max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
-        min_expiration: PollValidator::MIN_EXPIRATION,
-        max_expiration: PollValidator::MAX_EXPIRATION,
+        max_options: PollOptionsValidator::MAX_OPTIONS,
+        max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
+        min_expiration: PollExpirationValidator::MIN_EXPIRATION,
+        max_expiration: PollExpirationValidator::MAX_EXPIRATION,
       },
     }
   end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index e87e5024fe..f820f969a6 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -34,6 +34,7 @@ class NotifyService < BaseService
       @sender = notification.from_account
       @notification = notification
       @policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
+      @from_staff = @sender.local? && @sender.user.present? && @sender.user_role&.bypass_block?(@recipient.user_role)
     end
 
     private
@@ -63,6 +64,14 @@ class NotifyService < BaseService
       @sender.silenced? && not_following?
     end
 
+    def message?
+      @notification.type == :mention
+    end
+
+    def from_staff?
+      @from_staff
+    end
+
     def private_mention_not_in_response?
       @notification.type == :mention && @notification.target_status.direct_visibility? && !response_to_recipient?
     end
@@ -129,14 +138,6 @@ class NotifyService < BaseService
       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&.bypass_block?(@recipient.user_role)
-    end
-
     def from_self?
       @recipient.id == @sender.id
     end
@@ -174,6 +175,7 @@ class NotifyService < BaseService
     def filter?
       return false unless filterable_type?
       return false if override_for_sender?
+      return false if message? && from_staff?
 
       filtered_by_limited_accounts_policy? ||
         filtered_by_not_following_policy? ||
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index f813f06b20..a591c90913 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -3,9 +3,21 @@
 class PrecomputeFeedService < BaseService
   include Redisable
 
-  def call(account)
-    FeedManager.instance.populate_home(account)
+  def call(account, skip_filled_timelines: false)
+    @skip_filled_timelines = skip_filled_timelines
+
+    FeedManager.instance.populate_home(account) unless skip_timeline?(:home, account.id)
+
+    account.owned_lists.each do |list|
+      FeedManager.instance.populate_list(list) unless skip_timeline?(:list, list.id)
+    end
   ensure
     redis.del("account:#{account.id}:regeneration")
   end
+
+  private
+
+  def skip_timeline?(type, id)
+    @skip_filled_timelines && FeedManager.instance.timeline_size(type, id) * 2 > FeedManager::MAX_ITEMS
+  end
 end
diff --git a/app/validators/poll_expiration_validator.rb b/app/validators/poll_expiration_validator.rb
new file mode 100644
index 0000000000..34a627e205
--- /dev/null
+++ b/app/validators/poll_expiration_validator.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class PollExpirationValidator < ActiveModel::Validator
+  MAX_EXPIRATION = 1.month.freeze
+  MIN_EXPIRATION = 5.minutes.freeze
+
+  def validate(poll)
+    # We have a `presence: true` check for this attribute already
+    return if poll.expires_at.nil?
+
+    current_time = Time.now.utc
+
+    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at - current_time > MAX_EXPIRATION
+    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if (poll.expires_at - current_time).ceil < MIN_EXPIRATION
+  end
+end
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_options_validator.rb
similarity index 57%
rename from app/validators/poll_validator.rb
rename to app/validators/poll_options_validator.rb
index a327277963..0ac84f93f4 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_options_validator.rb
@@ -1,19 +1,13 @@
 # frozen_string_literal: true
 
-class PollValidator < ActiveModel::Validator
+class PollOptionsValidator < ActiveModel::Validator
   MAX_OPTIONS      = 4
   MAX_OPTION_CHARS = 50
-  MAX_EXPIRATION   = 1.month.freeze
-  MIN_EXPIRATION   = 5.minutes.freeze
 
   def validate(poll)
-    current_time = Time.now.utc
-
     poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1
     poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
     poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
     poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size
-    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
-    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION
   end
 end
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 9dd4f0e4e4..260d237b53 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -39,7 +39,7 @@
 
   .actions
     %button.button= t('admin.accounts.search')
-    = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
+    = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button button--dangerous'
 
 %hr.spacer/
 
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 6db97e2e8e..b9e11a17d1 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -35,7 +35,7 @@
 
     .actions
       %button.button= t('admin.accounts.search')
-      = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative'
+      = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button button--dangerous'
 
 = form_with model: @form, url: batch_admin_custom_emojis_path do |f|
   = hidden_field_tag :page, params[:page] || 1
@@ -72,7 +72,7 @@
             .input.select.optional
               .label_input
                 = f.select :category_id,
-                           options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
+                           options_from_collection_for_select(CustomEmojiCategory.alphabetic.all, 'id', 'name'),
                            'aria-label': t('admin.custom_emojis.assign_category'),
                            class: 'select optional',
                            prompt: t('admin.custom_emojis.assign_category')
diff --git a/app/views/admin/domain_blocks/confirm_suspension.html.haml b/app/views/admin/domain_blocks/confirm_suspension.html.haml
index 4c4f92d710..e82026d3a2 100644
--- a/app/views/admin/domain_blocks/confirm_suspension.html.haml
+++ b/app/views/admin/domain_blocks/confirm_suspension.html.haml
@@ -19,4 +19,4 @@
 
   .actions
     = link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
-    = f.button :submit, t('.confirm'), class: 'button negative', name: :confirm
+    = f.button :submit, t('.confirm'), class: 'button button--dangerous', name: :confirm
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index b5f084f880..79cd5a38f5 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -42,7 +42,7 @@
 
       .actions
         %button.button= t('admin.accounts.search')
-        = link_to t('admin.accounts.reset'), admin_instances_path, class: 'button negative'
+        = link_to t('admin.accounts.reset'), admin_instances_path, class: 'button button--dangerous'
 
 %hr.spacer/
 
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index e3e5d32542..fcaf5fc616 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -3,7 +3,7 @@
     .input-copy
       .input-copy__wrapper
         = copyable_input value: public_invite_url(invite_code: invite.code)
-      %button{ type: :button }= t('generic.copy')
+      %button.button{ type: :button }= t('generic.copy')
 
   %td
     .name-tag
diff --git a/app/views/admin/relays/index.html.haml b/app/views/admin/relays/index.html.haml
index 47f8d6f360..d9c23f2de7 100644
--- a/app/views/admin/relays/index.html.haml
+++ b/app/views/admin/relays/index.html.haml
@@ -3,7 +3,7 @@
 
 .simple_form
   %p.hint= t('admin.relays.description_html')
-  = link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'block-button'
+  = link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'button button--block'
 
 - unless @relays.empty?
   %hr.spacer
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index b476c6ccfa..6f762d94eb 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -28,7 +28,7 @@
 
     .actions
       %button.button= t('admin.accounts.search')
-      = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'
+      = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button button--dangerous'
 
 - @reports.group_by(&:target_account_id).each_value do |reports|
   - target_account = reports.first.target_account
diff --git a/app/views/admin/tags/index.html.haml b/app/views/admin/tags/index.html.haml
index cf265e22ad..3d0c844eb0 100644
--- a/app/views/admin/tags/index.html.haml
+++ b/app/views/admin/tags/index.html.haml
@@ -25,7 +25,7 @@
 
   .actions
     %button.button= t('admin.tags.search')
-    = link_to t('admin.tags.reset'), admin_tags_path, class: 'button negative'
+    = link_to t('admin.tags.reset'), admin_tags_path, class: 'button button--dangerous'
 
 %hr.spacer/
 
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index afeeef0c6d..5e9aa02d68 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -72,7 +72,7 @@
   .fields-group
     = f.input :agreement,
               as: :boolean,
-              label: t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path),
+              label: TermsOfService.live.exists? ? t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path) : t('auth.user_privacy_agreement_html', privacy_policy_path: privacy_policy_path),
               required: false,
               wrapper: :with_label
 
diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 7c94062de4..88479c4cad 100644
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -3,7 +3,7 @@
     .input-copy
       .input-copy__wrapper
         = copyable_input value: public_invite_url(invite_code: invite.code)
-      %button{ type: :button }= t('generic.copy')
+      %button.button{ type: :button }= t('generic.copy')
 
   - if invite.valid_for_use?
     %td
diff --git a/app/views/mail_subscriptions/show.html.haml b/app/views/mail_subscriptions/show.html.haml
index a09dacc4d3..78de486457 100644
--- a/app/views/mail_subscriptions/show.html.haml
+++ b/app/views/mail_subscriptions/show.html.haml
@@ -16,4 +16,5 @@
     = form.hidden_field :type,
                         value: params[:type]
     = form.button t('mail_subscriptions.unsubscribe.action'),
-                  type: :submit
+                  type: :submit,
+                  class: 'btn'
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index ca9d12a676..17228d3cae 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -35,7 +35,8 @@
         = form.hidden_field :scope,
                             value: @pre_auth.scope
         = form.button t('doorkeeper.authorizations.buttons.authorize'),
-                      type: :submit
+                      type: :submit,
+                      class: 'btn'
 
       = form_with url: oauth_authorization_path, method: :delete do |form|
         = form.hidden_field :client_id,
@@ -52,4 +53,4 @@
                             value: @pre_auth.scope
         = form.button t('doorkeeper.authorizations.buttons.deny'),
                       type: :submit,
-                      class: 'negative'
+                      class: 'btn negative'
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
index bdff336368..f014a1052f 100644
--- a/app/views/oauth/authorizations/show.html.haml
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -4,4 +4,4 @@
     .input-copy
       .input-copy__wrapper
         = copyable_input value: params[:code], class: 'oauth-code'
-      %button{ type: :button }= t('generic.copy')
+      %button.button{ type: :button }= t('generic.copy')
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 08cfea5a4f..8fd7a85def 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -71,6 +71,7 @@
     .fields-group
       = 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')
+      = ff.input :'web.missing_alt_text_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_missing_alt_text_modal')
 
     %h4= t 'appearance.sensitive_content'
 
diff --git a/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
index d069ba12a9..0ba4ad6893 100644
--- a/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
+++ b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
@@ -6,4 +6,4 @@
 
   %hr.spacer/
 
-  = link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'block-button'
+  = link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'button button--block'
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
index 3ea5810207..728e08e2bf 100644
--- a/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
@@ -14,4 +14,4 @@
 %hr.spacer/
 
 .simple_form
-  = link_to t('webauthn_credentials.add'), new_settings_webauthn_credential_path, class: 'block-button'
+  = link_to t('webauthn_credentials.add'), new_settings_webauthn_credential_path, class: 'button button--block'
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
index 8b670283b9..8088b4423a 100644
--- a/app/views/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -38,4 +38,4 @@
 %hr.spacer/
 
 .simple_form
-  = link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'block-button'
+  = link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'button button--block'
diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml
index c569843793..0243e3b806 100644
--- a/app/views/settings/verifications/show.html.haml
+++ b/app/views/settings/verifications/show.html.haml
@@ -17,7 +17,7 @@
   .input-copy.lead
     .input-copy__wrapper
       = copyable_input value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: :me)
-    %button{ type: :button }= t('generic.copy')
+    %button.button{ type: :button }= t('generic.copy')
 
   %p.lead= t('verification.extra_instructions_html')
 
@@ -60,7 +60,7 @@
   .input-copy.lead
     .input-copy__wrapper
       = copyable_input value: tag.meta(name: 'fediverse:creator', content: "@#{@account.local_username_and_domain}")
-    %button{ type: :button }= t('generic.copy')
+    %button.button{ type: :button }= t('generic.copy')
 
   %p.lead= t('author_attribution.then_instructions')
 
diff --git a/bin/prometheus_exporter b/bin/prometheus_exporter
new file mode 100755
index 0000000000..7e0304de9e
--- /dev/null
+++ b/bin/prometheus_exporter
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'prometheus_exporter' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("prometheus_exporter", "prometheus_exporter")
diff --git a/config/initializers/prometheus_exporter.rb b/config/initializers/prometheus_exporter.rb
new file mode 100644
index 0000000000..fab095658f
--- /dev/null
+++ b/config/initializers/prometheus_exporter.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
+  if ENV['MASTODON_PROMETHEUS_EXPORTER_LOCAL'] == 'true'
+    require 'prometheus_exporter'
+    require 'prometheus_exporter/server'
+    require 'prometheus_exporter/client'
+
+    # bind is the address, on which the webserver will listen
+    # port is the port that will provide the /metrics route
+    server = PrometheusExporter::Server::WebServer.new bind: ENV.fetch('MASTODON_PROMETHEUS_EXPORTER_HOST', 'localhost'), port: ENV.fetch('MASTODON_PROMETHEUS_EXPORTER_PORT', '9394').to_i
+    server.start
+
+    # wire up a default local client
+    PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
+  end
+
+  if ENV['MASTODON_PROMETHEUS_EXPORTER_WEB_DETAILED_METRICS'] == 'true'
+    # Optional, as those metrics might generate extra overhead and be redundant with what OTEL provides
+    require 'prometheus_exporter/middleware'
+
+    # Per-action/controller request stats like HTTP status and timings
+    Rails.application.middleware.unshift PrometheusExporter::Middleware
+  end
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 5b281c4339..fca0bec422 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -22,6 +22,48 @@ Sidekiq.configure_server do |config|
     end
   end
 
+  if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
+    require 'prometheus_exporter'
+    require 'prometheus_exporter/instrumentation'
+
+    config.on :startup do
+      # Ruby process metrics (memory, GC, etc)
+      PrometheusExporter::Instrumentation::Process.start type: 'sidekiq'
+
+      # Sidekiq process metrics (concurrency, busy, etc)
+      PrometheusExporter::Instrumentation::SidekiqProcess.start
+
+      # ActiveRecord metrics (connection pool usage)
+      PrometheusExporter::Instrumentation::ActiveRecord.start(
+        custom_labels: { type: 'sidekiq' },
+        config_labels: [:database, :host]
+      )
+
+      if ENV['MASTODON_PROMETHEUS_EXPORTER_SIDEKIQ_DETAILED_METRICS'] == 'true'
+        # Optional, as those metrics might generate extra overhead and be redundant with what OTEL provides
+
+        # Per-job metrics
+        config.server_middleware do |chain|
+          chain.add PrometheusExporter::Instrumentation::Sidekiq
+        end
+        config.death_handlers << PrometheusExporter::Instrumentation::Sidekiq.death_handler
+
+        # Per-queue metrics for queues handled by this process (size, latency, etc)
+        # They will be reported by every process handling those queues, so do not sum them up
+        PrometheusExporter::Instrumentation::SidekiqQueue.start
+
+        # Global Sidekiq metrics (size of the global queues, number of jobs, etc)
+        # Will be the same for every Sidekiq process
+        PrometheusExporter::Instrumentation::SidekiqStats.start
+      end
+    end
+
+    at_exit do
+      # Wait for the latest metrics to be reported before shutting down
+      PrometheusExporter::Client.default.stop(wait_timeout_seconds: 10)
+    end
+  end
+
   config.server_middleware do |chain|
     chain.add Mastodon::SidekiqMiddleware
   end
diff --git a/config/locales/activerecord.ar.yml b/config/locales/activerecord.ar.yml
index cacbf0714f..7426e21e21 100644
--- a/config/locales/activerecord.ar.yml
+++ b/config/locales/activerecord.ar.yml
@@ -15,6 +15,9 @@ ar:
       user/invite_request:
         text: الغرض
     errors:
+      attributes:
+        domain:
+          invalid: ليس بإسم نطاق صالح
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.be.yml b/config/locales/activerecord.be.yml
index e0c7b14622..f95fbd77d0 100644
--- a/config/locales/activerecord.be.yml
+++ b/config/locales/activerecord.be.yml
@@ -36,7 +36,7 @@ be:
         list_account:
           attributes:
             account_id:
-              taken: ужо ў сьпісе
+              taken: ужо ў спісе
           must_be_following: мусіць быць падпісаным уліковым запісам
         status:
           attributes:
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index a6108ec0ca..9b17b75939 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -23,6 +23,8 @@ el:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: περιέχει τιμές με ετικέτες που λείπουν
             username:
               invalid: μόνο γράμματα, αριθμοί και κάτω παύλες
               reserved: είναι δεσμευμένο
diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml
index 23bf90e4c8..4e7f7b3e20 100644
--- a/config/locales/activerecord.en-GB.yml
+++ b/config/locales/activerecord.en-GB.yml
@@ -23,6 +23,8 @@ en-GB:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: contains values with missing labels
             username:
               invalid: must contain only letters, numbers and underscores
               reserved: is reserved
@@ -38,6 +40,11 @@ en-GB:
           attributes:
             data:
               malformed: is malformed
+        list_account:
+          attributes:
+            account_id:
+              taken: is already on the list
+          must_be_following: must be a followed account
         status:
           attributes:
             reblog:
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index a2458ceb41..8b4235eb99 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -23,6 +23,8 @@ eu:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: falta diren etiketak dituzten balioak ditu
             username:
               invalid: letrak, zenbakiak eta azpimarrak soilik izan behar ditu
               reserved: erreserbatuta dago
diff --git a/config/locales/activerecord.fa.yml b/config/locales/activerecord.fa.yml
index c59890da9d..6af1a42e27 100644
--- a/config/locales/activerecord.fa.yml
+++ b/config/locales/activerecord.fa.yml
@@ -23,6 +23,8 @@ fa:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: حاوی مقادیری با برچسب های گم شده
             username:
               invalid: تنها حروف، اعداد، و زیرخط
               reserved: محفوظ است
diff --git a/config/locales/activerecord.fy.yml b/config/locales/activerecord.fy.yml
index 80727feef8..8885fd43c1 100644
--- a/config/locales/activerecord.fy.yml
+++ b/config/locales/activerecord.fy.yml
@@ -23,6 +23,8 @@ fy:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: befettet wearden mei ûntbrekkende labels
             username:
               invalid: mei allinnich letters, nûmers en ûnderstreekjes befetsje
               reserved: reservearre
diff --git a/config/locales/activerecord.ko.yml b/config/locales/activerecord.ko.yml
index 5dbd2e3d78..9442c3aae3 100644
--- a/config/locales/activerecord.ko.yml
+++ b/config/locales/activerecord.ko.yml
@@ -23,6 +23,8 @@ ko:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: 라벨 없는 값들이 존재합니다
             username:
               invalid: 영문자와 숫자, 밑줄만 사용 가능합니다
               reserved: 예약되어 있습니다
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index 06b3587008..62edc03c0e 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -23,6 +23,8 @@ pl:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: zawiera wartości z brakującymi etykietami
             username:
               invalid: może składać się tylko z liter, cyfr i podkreślników
               reserved: jest zarezerwowana
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 8769212d52..79d39a5cdc 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -23,6 +23,8 @@ ru:
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: содержит значения с отсутствующими ключами
             username:
               invalid: только буквы, цифры и символ подчёркивания
               reserved: зарезервировано
diff --git a/config/locales/activerecord.sl.yml b/config/locales/activerecord.sl.yml
index 941b847090..bba6ce6aad 100644
--- a/config/locales/activerecord.sl.yml
+++ b/config/locales/activerecord.sl.yml
@@ -15,6 +15,9 @@ sl:
       user/invite_request:
         text: Razlog
     errors:
+      attributes:
+        domain:
+          invalid: ni veljavno ime domene
       models:
         account:
           attributes:
@@ -33,6 +36,10 @@ sl:
           attributes:
             data:
               malformed: je napačno oblikovan
+        list_account:
+          attributes:
+            account_id:
+              taken: je že na seznamu
         status:
           attributes:
             reblog:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5eea1390ce..556c47b10b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -834,6 +834,7 @@ ar:
       batch:
         remove_from_report: إزالة من التقرير
         report: إبلاغ
+      contents: المحتوى
       deleted: محذوف
       favourites: المفضلة
       history: تاريخ التعديلات
@@ -910,6 +911,9 @@ ar:
       search: البحث
       title: الوسوم
       updated_msg: تم تحديث إعدادات الوسوم بنجاح
+    terms_of_service:
+      save_draft: حفظ المسودة
+      title: شروط الخدمة
     title: الإدارة
     trends:
       allow: السماح
@@ -1813,6 +1817,8 @@ ar:
       too_late: فات الأوان للطعن في هذه العقوبة
   tags:
     does_not_match_previous_name: لا يطابق الإسم السابق
+  terms_of_service:
+    title: شروط الخدمة
   themes:
     contrast: ماستدون (تباين عالٍ)
     default: ماستدون (داكن)
@@ -1873,6 +1879,8 @@ ar:
       further_actions_html: إذا لم يكن هذا أنت، نوصي لك %{action} على الفور وتمكين المصادقة ذات العاملين للحفاظ على أمان حسابك.
       subject: تم النفاذ عبر حسابك من خلال عنوان إيبي جديد
       title: تسجيل دخول جديد
+    terms_of_service_changed:
+      title: تحديث مهم
     warning:
       appeal: تقديم طعن
       appeal_description: إذا كنت تعتقد أن هذا خطأ، يمكنك تقديم طعن إلى فريق %{instance}.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 432737f8c3..65f6696ee6 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1200,6 +1200,7 @@ bg:
     too_fast: Образецът подаден пребързо, опитайте пак.
     use_security_key: Употреба на ключ за сигурност
     user_agreement_html: Прочетох и се съгласявам с <a href="%{terms_of_service_path}" target="_blank">условията на услугата</a> и <a href="%{privacy_policy_path}" target="_blank">политиката за поверителност</a>
+    user_privacy_agreement_html: Прочетох и има съгласието ми за <a href="%{privacy_policy_path}" target="_blank">политиката за поверителност</a>
   author_attribution:
     example_title: Примерен текст
     hint_html: Пишете ли новинарски статии или блогове извън Mastodon? Управлявайте как ви приписват авторството, когато са споделени в Mastodon.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index acd103a250..53f1dc6815 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -948,6 +948,9 @@ ca:
       preview:
         explanation_html: 'Aquest correu-e s''enviarà a <strong>%{display_count} usuaris</strong> que han signat abans de %{date}. S''hi inclourà aquest text:'
         send_preview: Envia una vista prèvia a %{email}
+        send_to_all:
+          one: Envia %{display_count} correu-e
+          other: Envia %{display_count} correus-e
         title: Vista prèvia de la notificació de les condicions de servei
       publish: Publica
       published_on_html: Publicada el %{date}
@@ -1206,6 +1209,7 @@ ca:
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
     use_security_key: Usa clau de seguretat
     user_agreement_html: He llegit i estic d'acord amb les <a href="%{terms_of_service_path}" target="_blank">condicions de servei</a> i la <a href="%{privacy_policy_path}" target="_blank">política de privadesa</a>
+    user_privacy_agreement_html: He llegit i estic d'acord amb la <a href="%{privacy_policy_path}" target="_blank">política de privacitat</a>
   author_attribution:
     example_title: Text d'exemple
     hint_html: Escriviu notícies o un blog fora de Mastodon? Controleu quin crèdit rebeu quan es comparteixen aquí.
@@ -1410,6 +1414,22 @@ ca:
       merge_long: Mantenir els registres existents i afegir-ne de nous
       overwrite: Sobreescriu
       overwrite_long: Reemplaça els registres actuals amb els nous
+    overwrite_preambles:
+      blocking_html:
+        one: Esteu a punt de <strong>reemplaçar la vostra llista de blocats</strong> amb fins a <strong>%{count} compte</strong> des de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>reemplaçar la vostra llista de blocats</strong> amb fins a <strong>%{count} comptes</strong> des de <strong>%{filename}</strong>.
+      bookmarks_html:
+        one: Esteu a punt de <strong>reemplaçar els vostres marcadors</strong> amb fins a <strong>%{count} publicació</strong> des de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>reemplaçar els vostres marcadors</strong> amb fins a <strong>%{count} publicacions</strong> des de <strong>%{filename}</strong>.
+      domain_blocking_html:
+        one: Esteu a punt de <strong>reemplaçar la vostra llista de dominis blocats</strong> amb fins a <strong>%{count} domini</strong> des de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>reemplaçar la vostra llista de dominis blocats</strong> amb fins a <strong>%{count} dominis</strong> des de <strong>%{filename}</strong>.
+      following_html:
+        one: Esteu a punt de <strong>seguir</strong> fins a <strong>%{count} compte</strong> des de <strong>%{filename}</strong> i <strong>deixar de seguir la resta</strong>.
+        other: Esteu a punt de <strong>seguir</strong> fins a <strong>%{count} comptes</strong> des de <strong>%{filename}</strong> i <strong>deixar de seguir la resta</strong>.
+      lists_html:
+        one: Esteu a punt de <strong>reemplaçar les vostres llistes</strong> amb contactes de <strong>%{filename}</strong>. S'afegirà <strong>%{count} compte</strong> a les noves llistes.
+        other: Esteu a punt de <strong>reemplaçar les vostres llistes</strong> amb contactes de <strong>%{filename}</strong>. S'afegiran fins a <strong>%{count} comptes</strong> a les noves llistes.
     preface: Pots importar algunes les dades que has exportat des d'un altre servidor, com ara el llistat de les persones que estàs seguint o bloquejant.
     recent_imports: Importacions recents
     states:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 135975c3c8..3ca73a3a14 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1247,6 +1247,7 @@ cs:
     too_fast: Formulář byl odeslán příliš rychle, zkuste to znovu.
     use_security_key: Použít bezpečnostní klíč
     user_agreement_html: Přečetl jsem si a souhlasím s <a href="%{terms_of_service_path}" target="_blank">podmínkami služby</a> a <a href="%{privacy_policy_path}" target="_blank">ochranou osobních údajů</a>
+    user_privacy_agreement_html: Četl jsem a souhlasím se zásadami <a href="%{privacy_policy_path}" target="_blank">ochrany osobních údajů</a>
   author_attribution:
     example_title: Ukázkový text
     hint_html: Píšete novinové články nebo blog mimo Mastodon? Kontrolujte, jak Vám bude připisováno autorství, když jsou sdíleny na Mastodonu.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index c2cf685503..f64040a267 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1285,6 +1285,7 @@ cy:
     too_fast: Cafodd y ffurflen ei chyflwyno'n rhy gyflym, ceisiwch eto.
     use_security_key: Defnyddiwch allwedd diogelwch
     user_agreement_html: Rwyf wedi darllen ac yn cytuno i <a href="%{terms_of_service_path}" target="_blank">delerau gwasanaeth</a> a'r <a href="%{privacy_policy_path}" target="_blank">polisi preifatrwydd</a>
+    user_privacy_agreement_html: Rwyf wedi darllen ac yn cytuno i'r <a href="%{privacy_policy_path}" target="_blank">polisi preifatrwydd</a>
   author_attribution:
     example_title: Testun enghreifftiol
     hint_html: Ydych chi'n ysgrifennu erthyglau newyddion neu flog y tu allan i Mastodon? Rheolwch sut y byddwch yn cael eich cydnabod pan fyddan nhw'n cael eu rhannu ar Mastodon.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c571c09902..3ed9d40db9 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -9,12 +9,12 @@ da:
   accounts:
     followers:
       one: Følger
-      other: tilhængere
+      other: Følgere
     following: Følger
     instance_actor_flash: Denne konto er en virtuel aktør repræsenterende selve serveren og ikke en individuel bruger. Den anvendes til fællesformål og bør ikke suspenderes.
     last_active: senest aktiv
     link_verified_on: Ejerskab af dette link blev tjekket %{date}
-    nothing_here: Der er intet hér!
+    nothing_here: Der er intet her!
     pin_errors:
       following: Man skal allerede følge den person, man ønsker at støtte
     posts:
@@ -108,11 +108,11 @@ da:
       not_subscribed: Abonnerer ikke
       pending: Afventende vurdering
       perform_full_suspension: Suspendér
-      previous_strikes: Tidligere anmeldelser (strikes)
+      previous_strikes: Tidligere anmeldelser
       previous_strikes_description_html:
         one: Denne konto har <strong>en</strong> anmeldelse.
         other: Denne konto har <strong>%{count}</strong> anmeldelser.
-      promote: Fremhæv
+      promote: Forfrem
       protocol: Protokol
       public: Offentlig
       push_subscription_expires: PuSH-abonnement udløber
@@ -123,9 +123,9 @@ da:
       remote_suspension_irreversible: Denne kontos data er slettet permanent.
       remote_suspension_reversible_hint_html: Kontoen er suspenderet på den pågældende server, og kontodata fjernes fuldstændig pr. %{date}. Indtil da vil fjernserveren kunne foretage en komplet reetablering af kontoen. Ønskes alle kontodata fjernet straks, kan dette gøres nedenfor.
       remove_avatar: Fjern profilbillede
-      remove_header: Fjern overskrift
+      remove_header: Fjern banner
       removed_avatar_msg: "%{username}s profilbillede fjernet"
-      removed_header_msg: "%{username}s overskriftsbillede fjernet"
+      removed_header_msg: "%{username}s banner fjernet"
       resend_confirmation:
         already_confirmed: Denne bruger er allerede bekræftet
         send: Gensend bekræftelseslink
@@ -141,8 +141,8 @@ da:
       security_measures:
         only_password: Kun adgangskode
         password_and_2fa: Adgangskode og 2FA
-      sensitive: Gennemtving sensitiv
-      sensitized: Markeret som sensitiv
+      sensitive: Gennemtving følsom
+      sensitized: Markeret som følsom
       shared_inbox_url: Delt indbakke-URL
       show:
         created_reports: Indsendte anmeldelser
@@ -160,7 +160,7 @@ da:
       unblock_email: Afblokér e-mailadresse
       unblocked_email_msg: "%{username}s e-mail-adresse afblokeret"
       unconfirmed_email: Ubekræftet e-mail
-      undo_sensitized: Fortryd gennemtving sensitiv
+      undo_sensitized: Fortryd gennemtving-følsom
       undo_silenced: Fortryd begrænsning
       undo_suspension: Fortryd suspendering
       unsilenced_msg: "%{username}s kontobegrænsning er fjernet"
@@ -169,8 +169,8 @@ da:
       username: Brugernavn
       view_domain: Vis domæneoversigt
       warn: Advar
-      web: Web
-      whitelisted: Tilladt for federering
+      web: Net
+      whitelisted: Tilladt for føderation
     action_logs:
       action_types:
         approve_appeal: Godkend appel
@@ -225,8 +225,8 @@ da:
         sensitive_account: Gennemtving sensitiv konto
         silence_account: Begræns konto
         suspend_account: Suspendér konto
-        unassigned_report: Fjer anmeldelsestildeling
-        unblock_email_account: Afblokér e-mailadresse
+        unassigned_report: Fjern anmeldelsestildeling
+        unblock_email_account: Fjern blokering af e-mailadresse
         unsensitive_account: Fjern Gennemtving sensitiv konto
         unsilence_account: Fjern kontobegrænselse
         unsuspend_account: Afsuspendér konto
@@ -374,7 +374,7 @@ da:
         other: "<strong>%{count}</strong> verserende anmeldelser"
       pending_tags_html:
         one: "<strong>%{count}</strong> afventende hashtag"
-        other: "<strong>%{count}</strong> afventende hashtags"
+        other: "<strong>%{count}</strong> afventende etiketter"
       pending_users_html:
         one: "<strong>%{count}</strong> afventende bruger"
         other: "<strong>%{count}</strong> afventende brugere"
@@ -735,7 +735,7 @@ da:
         manage_settings: Håndtere indstillinger
         manage_settings_description: Tillader brugere at ændre webstedsindstillinger
         manage_taxonomies: Håndtere taksonomier
-        manage_taxonomies_description: Tillader brugere at gennemse tenderende indhold og opdatere hashtag-indstillinger
+        manage_taxonomies_description: Tillader brugere at gennemse tenderende indhold og opdatere etiket-indstillinger
         manage_user_access: Håndtere brugeradgang
         manage_user_access_description: Tillader brugere at deaktivere andre brugeres tofaktorgodkendelse, skifte deres e-mailadresse og nulstille deres adgangskode
         manage_users: Håndtere brugere
@@ -925,7 +925,7 @@ da:
       reset: Nulstil
       review: Gennmgangsstatus
       search: Søg
-      title: Hashtags
+      title: Etiketter
       updated_msg: Hashtag-indstillinger opdateret
     terms_of_service:
       back: Tilbage til Tjenestevilkår
@@ -1014,14 +1014,14 @@ da:
           tag_servers_dimension: Topservere
           tag_servers_measure: forskellige servere
           tag_uses_measure: anvendelser i alt
-        description_html: Disse er hashtags, som pt. vises i en masse indlæg, som serveren ser. Det kan hjælpe brugerne til at finde ud af, hvad folk taler mest om pt. Ingen hashtags vises offentligt, før man godkender dem.
+        description_html: Disse er etiketter, som pt. vises i en masse indlæg, som serveren ser. Det kan hjælpe brugerne til at finde ud af, hvad folk taler mest om pt. Ingen etiketter vises offentligt, før man godkender dem.
         listable: Kan foreslås
         no_tag_selected: Intet tag ændret (da intet var valgt)
         not_listable: Foreslås ikke
         not_trendable: Vises ikke under tendenser
         not_usable: Kan ikke anvendes
         peaked_on_and_decaying: Toppede pr. %{date}, nu for nedadgående
-        title: Populære hashtags
+        title: Populære etiketter
         trendable: Kan vises under tendenser
         trending_rank: 'Populær #%{rank}'
         usable: Kan anvendes
@@ -1093,7 +1093,7 @@ da:
       new_trending_statuses:
         title: Populære opslag
       new_trending_tags:
-        title: Populære hashtags
+        title: Populære etiketter
       subject: Nye tendenser klar til gennemgang på %{instance}
   aliases:
     add_new: Opret alias
@@ -1104,7 +1104,7 @@ da:
     remove: Fjern aliaslinkning
   appearance:
     advanced_web_interface: Avanceret webgrænseflade
-    advanced_web_interface_hint: 'Ønsker du udnytte hele skærmbredden, lader den avancerede webgrænseflade dig opsætte mange forskellige kolonner for at se så meget information på samme tid som ønsket: Hjem, notifikationer, federeret tidslinje, et hvilket som helst antal lister og hashtags.'
+    advanced_web_interface_hint: 'Ønsker du udnytte hele skærmbredden, lader den avancerede netgrænseflade dig opsætte mange forskellige kolonner for at se så meget information på samme tid som ønsket: Hjem, notifikationer, fødereret tidslinje, et hvilket som helst antal lister og etiketter.'
     animations_and_accessibility: Animationer og tilgængelighed
     confirmation_dialogs: Bekræftelsesdialoger
     discovery: Opdagelse
@@ -1209,6 +1209,7 @@ da:
     too_fast: Formularen indsendt for hurtigt, forsøg igen.
     use_security_key: Brug sikkerhedsnøgle
     user_agreement_html: Jeg accepterer <a href="%{terms_of_service_path}" target="_blank">Tjenestevilkår</a> og <a href="%{privacy_policy_path}" target="_blank">Fortrolighedspolitik</a>
+    user_privacy_agreement_html: Jeg accepterer <a href="%{privacy_policy_path}" target="_blank">fortrolighedspolitikken</a>
   author_attribution:
     example_title: Eksempeltekst
     hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan man bliver krediteret, når disse deles på Mastodon.
@@ -1325,13 +1326,13 @@ da:
     csv: CSV
     domain_blocks: Domæneblokeringer
     lists: Lister
-    mutes: Du tavsgør
+    mutes: Du skjuler
     storage: Medielagerplads
   featured_tags:
     add_new: Tilføj nyt
     errors:
-      limit: Det maksimale antal hashtags er allerede fremhævet
-    hint_html: "<strong>Hvad er fremhævede hashtags?</strong> De vises i en fremtrædende position på din offentlige profil og giver folk mulighed for at gennemse dine offentlige indlæg specifikt under disse hashtags. De er et fantastisk værktøj til at holde styr på kreative værker eller langsigtede projekter."
+      limit: Det maksimale antal etiketter er allerede fremhævet
+    hint_html: "<strong>Hvad er fremhævede etiketter?</strong> De vises i en fremtrædende position på din offentlige profil og giver folk mulighed for at gennemse dine offentlige indlæg specifikt under disse etiketter. De er et fantastisk værktøj til at holde styr på kreative værker eller langsigtede projekter."
   filters:
     contexts:
       account: Profiler
@@ -1431,7 +1432,7 @@ da:
         other: Man er ved at <strong>erstatte sine lister</strong> med indhold fra <strong>%{filename}</strong>. Op til <strong>%{count} konti</strong> føjes til nye lister.
       muting_html:
         one: Man er ved at <strong>sin liste over en tavsgjort konto</strong> med <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Man er ved at <strong>sin liste over tavsgjorte konti</strong> med op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>erstatte din liste over skjulte kontoer</strong> med op til <strong>%{count} kontoer</strong> fra <strong>%{filename}</strong>.
     preambles:
       blocking_html:
         one: Man er ved at <strong>blokere</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
@@ -1450,7 +1451,7 @@ da:
         other: Man er ved at tilføje <strong>%{count} konti</strong> fra <strong>%{filename}</strong> til sine <strong>lister</strong>. Nye lister oprettes, hvis der ikke findes nogen liste at tilføje til.
       muting_html:
         one: Man er ved at <strong>tavsgøre</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Man er ved at <strong>tavsgøre</strong> op til <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>skjule</strong> op til <strong>%{count} kontoer</strong> fra <strong>%{filename}</strong>.
     preface: Du kan importere data, du har eksporteret fra en anden server, såsom en liste over folk du følger eller blokerer.
     recent_imports: Seneste importer
     states:
@@ -1467,11 +1468,11 @@ da:
       domain_blocking: Importerer blokerede konti
       following: Importerer fulgte konti
       lists: Import af lister
-      muting: Importerer tavsgjorte konti
+      muting: Importerer skjulte kontoer
     type: Importtype
     type_groups:
       constructive: Følger og Bogmærker
-      destructive: Blokeringer og tavsgjorte
+      destructive: Blokerede og skjulte kontoer
     types:
       blocking: Blokeringsliste
       bookmarks: Bogmærker
@@ -1528,7 +1529,7 @@ da:
           follow: e-mailnotifikationer om nye følgere
           follow_request: e-mailnotifikationer om følgeanmodninger
           mention: e-mailnotifikationer om omtaler
-          reblog: e-mailnotifikationer om boosts
+          reblog: e-mailnotifikationer om fremhævelser
       resubscribe_html: Har man afmeldt sig ved en fejl, kan man gentilmelde sig via <a href="%{settings_path}">indstillingerne E-mailnotifikationer</a>.
       success_html: Man vil ikke længere modtage %{type} for Mastodon på %{domain} til e-mailen %{email}.
       title: Opsig abonnement
@@ -1573,7 +1574,7 @@ da:
     title: Moderation
   move_handler:
     carry_blocks_over_text: Denne bruger er flyttet fra %{acct}, som du har haft blokeret.
-    carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft tavsgjort.
+    carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft skjult.
     copy_account_note_text: 'Denne bruger er flyttet fra %{acct}, hvor dine tidligere noter om dem var:'
   navigation:
     toggle_menu: Åbn/luk menu
@@ -1604,9 +1605,9 @@ da:
     poll:
       subject: En afstemning fra %{name} er afsluttet
     reblog:
-      body: 'Dit indlæg blev boostet af %{name}:'
-      subject: "%{name} boostede dit indlæg"
-      title: Nyt boost
+      body: 'Dit indlæg blev fremhævet af %{name}:'
+      subject: "%{name} fremhævede dit indlæg"
+      title: Ny fremhævelse
     status:
       subject: "%{name} har netop postet"
     update:
@@ -1703,7 +1704,7 @@ da:
     content_warning: 'Indholdsadvarsel:'
     descriptions:
       account: Offentlige indlæg fra @%{acct}
-      tag: 'Offentlige indlæg tagget #%{hashtag}'
+      tag: 'Offentlige indlæg etiketteret #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Den daglige grænse på %{limit} planlagte indlæg er nået
     over_total_limit: Grænsen på %{limit} planlagte indlæg er nået
@@ -1768,7 +1769,7 @@ da:
     development: Udvikling
     edit_profile: Redigér profil
     export: Eksport
-    featured_tags: Udvalgte hashtags
+    featured_tags: Udvalgte etiketter
     import: Import
     import_and_export: Import og eksport
     migrate: Kontomigrering
@@ -1804,12 +1805,12 @@ da:
       video:
         one: "%{count} video"
         other: "%{count} videoer"
-    boosted_from_html: Boostet fra %{acct_link}
+    boosted_from_html: Fremhævet fra %{acct_link}
     content_warning: 'Indholdsadvarsel: %{warning}'
     default_language: Samme som UI-sproget
     disallowed_hashtags:
-      one: 'indeholdte et ikke tilladt hashtag: %{tags}'
-      other: 'indeholdte de ikke tilladte hashtags: %{tags}'
+      one: 'indeholdte en ikke tilladt etiket: %{tags}'
+      other: 'indeholdte de ikke tilladte etiketter: %{tags}'
     edited_at_html: Redigeret %{date}
     errors:
       in_reply_not_found: Indlægget, der forsøges besvaret, ser ikke ud til at eksistere.
@@ -1818,7 +1819,7 @@ da:
       direct: Indlæg, som kun kan ses af omtalte brugere, kan ikke fastgøres
       limit: Maksimalt antal indlæg allerede fastgjort
       ownership: Andres indlæg kan ikke fastgøres
-      reblog: Et boost kan ikke fastgøres
+      reblog: En fremhævelse kan ikke fastgøres
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direkte
@@ -1834,9 +1835,9 @@ da:
     exceptions: Undtagelser
     explanation: Sletning af indlæg er en ressourcekrævende operation, hvorfor dette sker gradvist over tid, når serveren ellers ikke er optaget. Indlæg kan derfor blive slettet efter, at de reelt har passeret aldersgrænsen.
     ignore_favs: Ignorér favoritter
-    ignore_reblogs: Ignorér boosts
+    ignore_reblogs: Ignorér fremhævelser
     interaction_exceptions: Undtagelser baseret på interaktioner
-    interaction_exceptions_explanation: Bemærk, at det ikke garanteres, at indlæg slettes, hvis de når under favorit- eller boost-tærsklerne efter én gang at været nået over dem.
+    interaction_exceptions_explanation: Bemærk, at det ikke garanteres, at indlæg slettes, hvis de når under favorit- eller fremhævelses-tærsklerne efter én gang at været nået over dem.
     keep_direct: Behold direkte besked
     keep_direct_hint: Sletter ingen af dine direkte beskeder
     keep_media: Behold indlæg med medievedhæftninger
@@ -1861,8 +1862,8 @@ da:
     min_age_label: Alderstærskel
     min_favs: Behold indlæg favoritmarkeret mindst
     min_favs_hint: Sletter ingen egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tomt for at slette indlæg uanset favoritmarkeringer
-    min_reblogs: Behold indlæg boostet mindst
-    min_reblogs_hint: Sletter ingen egne indlæg, som er boostet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
+    min_reblogs: Behold indlæg fremhævet mindst
+    min_reblogs_hint: Sletter ingen af egne indlæg, som er fremhævet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
   stream_entries:
     sensitive_content: Sensitivt indhold
   strikes:
@@ -2002,8 +2003,8 @@ da:
         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
+      hashtags_title: Populære etiketter
+      hashtags_view_more: Se flere populære etiketter
       post_action: Skriv
       post_step: Sig hej til verden med tekst, fotos, videoer eller afstemninger.
       post_title: Opret det første indlæg
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d1d557432b..17c5098e20 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1209,6 +1209,7 @@ de:
     too_fast: Formular zu schnell übermittelt. Bitte versuche es erneut.
     use_security_key: Sicherheitsschlüssel verwenden
     user_agreement_html: Ich stimme den <a href="%{terms_of_service_path}" target="_blank">Nutzungsbedingungen</a> sowie der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
+    user_privacy_agreement_html: Ich stimme der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
   author_attribution:
     example_title: Beispieltext
     hint_html: Schreibst du außerhalb von Mastodon journalistische Artikel oder andere Texte, beispielsweise in einem Blog? Lege hier fest, wann auf dein Profil verwiesen werden soll, wenn Links zu deinen Werken auf Mastodon geteilt werden.
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 7ac16e0012..a10bee34df 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -130,11 +130,11 @@ da:
         crypto: Ende-til-ende kryptering
         favourites: Favoritter
         filters: Filtre
-        follow: Følger, Tavsgør og Blokerer
+        follow: Fulgte, skjjulte og blokerede kontoer
         follows: Følger
         lists: Lister
         media: Medievedhæftninger
-        mutes: Tavsgørelser
+        mutes: Skjulte kontoer
         notifications: Notifikationer
         profile: Din Mastodon-profil
         push: Push-notifikationer
@@ -177,7 +177,7 @@ da:
       read:filters: se dine filtre
       read:follows: se dine følger
       read:lists: se dine lister
-      read:mutes: se dine tavsgørelser
+      read:mutes: se dine skjulte kontoer
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
       read:search: søg på dine vegne
@@ -186,13 +186,13 @@ da:
       write:accounts: ændre din profil
       write:blocks: blokere konti og domæner
       write:bookmarks: bogmærke indlæg
-      write:conversations: tavsgøre og slette konversationer
+      write:conversations: skjul og slet samtaler
       write:favourites: favoritmarkere indlæg
       write:filters: oprette filtre
       write:follows: følge personer
       write:lists: oprette lister
       write:media: uploade mediefiler
-      write:mutes: tavsgøre personer og konversationer
+      write:mutes: skjul personer og samtaler
       write:notifications: rydde dine notifikationer
       write:reports: anmelde personer
       write:statuses: udgive indlæg
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index 36a5ed1974..ede1ef815e 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -191,7 +191,7 @@ eo:
       write:filters: krei filtrilojn
       write:follows: sekvi homojn
       write:lists: krei listojn
-      write:media: alŝuti plurmediojn
+      write:media: alŝuti aŭdovidaĵojn
       write:mutes: silentigi homojn kaj konversaciojn
       write:notifications: forigi viajn sciigojn
       write:reports: signali aliajn homojn
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index a09fe42f40..7b25004385 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -60,6 +60,7 @@ eu:
       error:
         title: Errore bat gertatu da
       new:
+        prompt_html: "%{client_name}-(e)k zure kontura sartzeko baimena nahi du. <strong>Eskaera hau onartu, iturri hori ezagutu eta harengan konfiantza baduzu</strong>"
         review_permissions: Berrikusi baimenak
         title: Baimena behar da
       show:
@@ -134,6 +135,7 @@ eu:
         media: Multimedia eranskinak
         mutes: Mututzeak
         notifications: Jakinarazpenak
+        profile: Zure Mastodon profila
         push: Push jakinarazpenak
         reports: Salaketak
         search: Bilaketak
@@ -164,6 +166,7 @@ eu:
       admin:write:reports: salaketetan moderazio ekintzak burutu
       crypto: erabili muturretik muturrerako zifraketa
       follow: aldatu kontuaren erlazioak
+      profile: irakurri soilik zure kontuaren profileko informazioa
       push: jaso push jakinarazpenak
       read: irakurri zure kontuko datu guztiak
       read:accounts: ikusi kontuaren informazioa
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 1cd14be7f9..0c40ffabdc 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1209,6 +1209,7 @@ el:
     too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
     use_security_key: Χρήση κλειδιού ασφαλείας
     user_agreement_html: Έχω διαβάσει με τους <a href="%{terms_of_service_path}" target="_blank">όρους παροχής υπηρεσιών</a> και την <a href="%{privacy_policy_path}" target="_blank">πολιτική απορρήτου</a>
+    user_privacy_agreement_html: Έχω διαβάσει και συμφωνώ με την πολιτική απορρήτου <a href="%{privacy_policy_path}" target="_blank"></a>
   author_attribution:
     example_title: Δείγμα κειμένου
     hint_html: Γράφεις ειδήσεις ή blog άρθρα εκτός του Mastodon; Έλεγξε πώς μπορείς να πάρεις τα εύσημα όταν μοιράζονται στο Mastodon.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 20f134c959..c8c3e486b7 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -214,6 +214,7 @@ en-GB:
         enable_user: Enable User
         memorialize_account: Memorialise Account
         promote_user: Promote User
+        publish_terms_of_service: Publish Terms of Service
         reject_appeal: Reject Appeal
         reject_user: Reject User
         remove_avatar_user: Remove Avatar
@@ -278,6 +279,7 @@ en-GB:
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
+        publish_terms_of_service_html: "%{name} published updates to the terms of service"
         reject_appeal_html: "%{name} rejected moderation decision appeal from %{target}"
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
@@ -925,6 +927,35 @@ en-GB:
       search: Search
       title: Hashtags
       updated_msg: Hashtag settings updated successfully
+    terms_of_service:
+      back: Back to terms of service
+      changelog: What's changed
+      create: Use your own
+      current: Current
+      draft: Draft
+      generate: Use template
+      generates:
+        action: Generate
+        chance_to_review_html: "<strong>The generated terms of service will not be published automatically.</strong> You will have a chance to review the results. Please fill in the necessary details to proceed."
+        explanation_html: The terms of service template provided is for informational purposes only, and should not be construed as legal advice on any subject matter. Please consult with your own legal counsel on your situation and specific legal questions you have.
+        title: Terms of Service Setup
+      history: History
+      live: Live
+      no_history: There are no recorded changes of the terms of service yet.
+      no_terms_of_service_html: You don't currently have any terms of service configured. Terms of service are meant to provide clarity and protect you from potential liabilities in disputes with your users.
+      notified_on_html: Users notified on %{date}
+      notify_users: Notify users
+      preview:
+        explanation_html: 'The email will be sent to <strong>%{display_count} users</strong> who have signed up before %{date}. The following text will be included in the e-mail:'
+        send_preview: Send preview to %{email}
+        send_to_all:
+          one: Send %{display_count} email
+          other: Send %{display_count} emails
+        title: Preview terms of service notification
+      publish: Publish
+      published_on_html: Published on %{date}
+      save_draft: Save draft
+      title: Terms of Service
     title: Administration
     trends:
       allow: Allow
@@ -1156,6 +1187,7 @@ en-GB:
     set_new_password: Set new password
     setup:
       email_below_hint_html: Check your spam folder, or request another one. You can correct your email address if it's wrong.
+      email_settings_hint_html: Click the link we sent to %{email} to begin using Mastodon. We'll wait right here.
       link_not_received: Didn't get a link?
       new_confirmation_instructions_sent: You will receive a new email with the confirmation link in a few minutes!
       title: Check your inbox
@@ -1164,6 +1196,7 @@ en-GB:
       title: Log in to %{domain}
     sign_up:
       manual_review: Sign-ups on %{domain} go through manual review by our moderators. To help us process your registration, write a bit about yourself and why you want an account on %{domain}.
+      preamble: With an account on this Mastodon server, you'll be able to follow any other person on the Fediverse, regardless of where their account is hosted.
       title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
@@ -1175,6 +1208,8 @@ en-GB:
       view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
+    user_agreement_html: I have read and agree to the <a href="%{terms_of_service_path}" target="_blank">terms of service</a> and <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
+    user_privacy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
   author_attribution:
     example_title: Sample text
     hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.
@@ -1673,6 +1708,7 @@ en-GB:
   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
+    too_soon: date must be in the future
   self_destruct:
     lead_html: Unfortunately, <strong>%{domain}</strong> is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.
     title: This server is closing down
@@ -1835,6 +1871,8 @@ en-GB:
       too_late: It is too late to appeal this strike
   tags:
     does_not_match_previous_name: does not match the previous name
+  terms_of_service:
+    title: Terms of Service
   themes:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
@@ -1895,6 +1933,15 @@ en-GB:
       further_actions_html: If this wasn't you, we recommend that you %{action} immediately and enable two-factor authentication to keep your account secure.
       subject: Your account has been accessed from a new IP address
       title: A new login
+    terms_of_service_changed:
+      agreement: By continuing to use %{domain}, you are agreeing to these terms. If you disagree with the updated terms, you may terminate your agreement with %{domain} at any time by deleting your account.
+      changelog: 'At a glance, here is what this update means for you:'
+      description: 'You are receiving this e-mail because we''re making some changes to our terms of service at %{domain}. We encourage you to review the updated terms in full here:'
+      description_html: You are receiving this e-mail because we're making some changes to our terms of service at %{domain}. We encourage you to review the <a href="%{path}" target="_blank">updated terms in full here</a>.
+      sign_off: The %{domain} team
+      subject: Updates to our terms of service
+      subtitle: The terms of service of %{domain} are changing
+      title: Important update
     warning:
       appeal: Submit an appeal
       appeal_description: If you believe this is an error, you can submit an appeal to the staff of %{instance}.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ab76b462ee..fdf73bad9e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1209,6 +1209,7 @@ en:
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
     user_agreement_html: I have read and agree to the <a href="%{terms_of_service_path}" target="_blank">terms of service</a> and <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
+    user_privacy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
   author_attribution:
     example_title: Sample text
     hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 400b03958e..085081b15a 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -363,7 +363,7 @@ eo:
     dashboard:
       active_users: aktivaj uzantoj
       interactions: interago
-      media_storage: Konservo de plurmedioj
+      media_storage: Konservo de aŭdovidaĵoj
       new_users: novaj uzantoj
       opened_reports: raportoj malfermitaj
       pending_appeals_html:
@@ -508,7 +508,7 @@ eo:
         description_html: Vi povas difini enhavopolitikojn al la ĉiuj kontoj.
         limited_federation_mode_description_html: Vi povas elekti, ĉu permesi federacion kun tiu domajno.
         policies:
-          reject_media: Malakcepti plurmediojn
+          reject_media: Malakcepti la vidaŭdaĵojn
           reject_reports: Malakcepti raportojn
           silence: Kaŝu
           suspend: Suspendi
@@ -1209,6 +1209,7 @@ eo:
     too_fast: Formularo sendita tro rapide, klopodu denove.
     use_security_key: Uzi sekurecan ŝlosilon
     user_agreement_html: Mi legis kaj konsentas pri la <a href="%{terms_of_service_path}" target="_blank">servokondiĉoj</a> kaj <a href="%{privacy_policy_path}" target="_blank">privateca politiko</a>
+    user_privacy_agreement_html: Mi legis kaj konsentis pri <a href="%{privacy_policy_path}" target="_blank">privatpolitiko</a>
   author_attribution:
     example_title: Ekzempla teksto
     hint_html: Ĉu vi skribas novaĵojn aŭ blogartikolojn ekster Mastodon? Kontrolu kiel vi estas kreditita kiam ili estas kunhavataj ĉe Mastodon.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index e3bcc5e5b5..2f313da8d4 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1209,6 +1209,7 @@ es-AR:
     too_fast: Formulario enviado demasiado rápido, probá de nuevo.
     use_security_key: Usar la llave de seguridad
     user_agreement_html: Leí y acepto los <a href="%{terms_of_service_path}" target="_blank">términos del servicio</a> y la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
+    user_privacy_agreement_html: Leí y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
   author_attribution:
     example_title: Texto de ejemplo
     hint_html: "¿Escribís artículos de noticias o de blog fuera de Mastodon? Controlá cómo se te acredita cuando se comparten en Mastodon."
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 6bdee869e7..135ca6cc78 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1209,6 +1209,7 @@ es-MX:
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     use_security_key: Usar la clave de seguridad
     user_agreement_html: He leído y acepto las <a href="%{terms_of_service_path}" target="_blank">condiciones del servicio</a> y la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
+    user_privacy_agreement_html: Leí y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
   author_attribution:
     example_title: Texto de ejemplo
     hint_html: "¿Estás escribiendo artículos de noticias o blogs fuera de Mastodon? Controla cómo te acreditan cuando se comparten en Mastodon."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5e3374ae8c..7f7473f18f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1209,6 +1209,7 @@ es:
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     use_security_key: Usar la clave de seguridad
     user_agreement_html: He leído y acepto los <a href="%{terms_of_service_path}" target="_blank">términos del servicio</a> y la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
+    user_privacy_agreement_html: He leído y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
   author_attribution:
     example_title: Texto de ejemplo
     hint_html: "¿Escribes noticias o artículos de blog fuera de Mastodon? Controla cómo se te acredita cuando se comparten en Mastodon."
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 8ca53d492c..97943a46bb 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -21,15 +21,19 @@ eu:
       one: Bidalketa
       other: Bidalketa
     posts_tab_heading: Bidalketa
+    self_follow_error: Zure kontua bera jarraitzea ez dago onartuta
   admin:
     account_actions:
       action: Burutu ekintza
+      already_silenced: Kontu hau dagoeneko mugatua izan da.
+      already_suspended: Kontu hau dagoeneko kanporatua izan da.
       title: Burutu moderazio ekintza %{acct} kontuan
     account_moderation_notes:
       create: Sortu oharra
       created_msg: Moderazio oharra ongi sortu da!
       destroyed_msg: Moderazio ohara ongi suntsitu da!
     accounts:
+      add_email_domain_block: Blokeatu email domeinua
       approve: Onartu
       approved_msg: "%{username} erabiltzailearen erregistratzeko eskaera behar bezala onartu da"
       are_you_sure: Ziur zaude?
@@ -44,6 +48,7 @@ eu:
         title: Aldatu %{username}(r)en eposta helbidea
       change_role:
         changed_msg: Rola ondo aldatu da!
+        edit_roles: Kudeatu erabiltzaile rolak
         label: Aldatu rola
         no_role: Rolik ez
         title: Aldatu %{username} erabiltzailearen rola
@@ -56,6 +61,7 @@ eu:
       demote: Jaitsi mailaz
       destroyed_msg: "%{username} erabiltzailearen datuak behin betiko ezabatzeko ilaran daude"
       disable: Desgaitu
+      disable_sign_in_token_auth: Desgaitu e-posta token autentifikazioa
       disable_two_factor_authentication: Desgaitu 2FA
       disabled: Desgaituta
       display_name: Pantaila-izena
@@ -64,6 +70,7 @@ eu:
       email: Eposta
       email_status: Epostaren egoera
       enable: Gaitu
+      enable_sign_in_token_auth: Gaitu e-posta token autentifikazioa
       enabled: Gaituta
       enabled_msg: "%{username} kontua behar bezala desblokeatu da"
       followers: Jarraitzaileak
@@ -128,6 +135,7 @@ eu:
       resubscribe: Berriro harpidetu
       role: Rola
       search: Bilatu
+      search_same_email_domain: E-mail domeinu bera duten beste erabiltzaileak
       search_same_ip: IP bera duten beste erabiltzaileak
       security: Segurtasuna
       security_measures:
@@ -168,21 +176,26 @@ eu:
         approve_appeal: Onartu apelazioa
         approve_user: Onartu erabiltzailea
         assigned_to_self_report: Esleitu salaketa
+        change_email_user: Aldatu erabiltzailearen emaila
         change_role_user: Aldatu erabiltzailearen rola
         confirm_user: Berretsi erabiltzailea
         create_account_warning: Sortu abisua
         create_announcement: Sortu iragarpena
+        create_canonical_email_block: Sortu email blokeoa
         create_custom_emoji: Sortu emoji pertsonalizatua
         create_domain_allow: Sortu domeinu baimena
         create_domain_block: Sortu domeinu blokeoa
+        create_email_domain_block: Sortu email domeinu blokeoa
         create_ip_block: Sortu IP araua
         create_unavailable_domain: Sortu eskuragarri ez dagoen domeinua
         create_user_role: Sortu rola
         demote_user: Jaitsi erabiltzailearen maila
         destroy_announcement: Ezabatu iragarpena
+        destroy_canonical_email_block: Ezabatu email blokeoa
         destroy_custom_emoji: Ezabatu emoji pertsonalizatua
         destroy_domain_allow: Ezabatu domeinu baimena
         destroy_domain_block: Ezabatu domeinu blokeoa
+        destroy_email_domain_block: Ezabatu email domeinu blokeoa
         destroy_instance: Ezabatu betiko domeinua
         destroy_ip_block: Ezabatu IP araua
         destroy_status: Ezabatu bidalketa
@@ -190,8 +203,10 @@ eu:
         destroy_user_role: Ezabatu rola
         disable_2fa_user: Desgaitu 2FA
         disable_custom_emoji: Desgaitu emoji pertsonalizatua
+        disable_sign_in_token_auth_user: Desgaitu email token autentifikazioa erabiltzailearentzat
         disable_user: Desgaitu erabiltzailea
         enable_custom_emoji: Gaitu emoji pertsonalizatua
+        enable_sign_in_token_auth_user: Gaitu email token autentifikazioa erabiltzailearentzat
         enable_user: Gaitu erabiltzailea
         memorialize_account: Bihurtu kontua oroigarri
         promote_user: Igo erabiltzailea mailaz
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0e3ed18809..8a5d36e1e3 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -187,6 +187,7 @@ fa:
         create_domain_block: ایجاد انسداد دامنه
         create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
         create_ip_block: ایجاد قاعدهٔ آی‌پی
+        create_relay: ایجاد رله
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
         create_user_role: ایجاد نقش
         demote_user: تنزل کاربر
@@ -198,14 +199,17 @@ fa:
         destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
         destroy_instance: پاکسازی دامنه
         destroy_ip_block: حذف قاعدهٔ آی‌پی
+        destroy_relay: حذف رله
         destroy_status: حذف وضعیت
         destroy_unavailable_domain: حذف دامنهٔ ناموجود
         destroy_user_role: نابودی نقش
         disable_2fa_user: از کار انداختن ورود دومرحله‌ای
         disable_custom_emoji: از کار انداختن اموجی سفارشی
+        disable_relay: غیرفعال‌سازی رله
         disable_sign_in_token_auth_user: از کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         disable_user: از کار انداختن کاربر
         enable_custom_emoji: به کار انداختن اموجی سفارشی
+        enable_relay: فعال‌سازی رله
         enable_sign_in_token_auth_user: به کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         enable_user: به کار انداختن کاربر
         memorialize_account: یادسپاری حساب
@@ -248,6 +252,7 @@ fa:
         create_domain_block_html: "%{name} دامنهٔ %{target} را مسدود کرد"
         create_email_domain_block_html: "%{name} دامنهٔ رایانامهٔ %{target} را مسدود کرد"
         create_ip_block_html: "%{name} برای آی‌پی %{target} قانونی ایجاد کرد"
+        create_relay_html: "%{name} یک رله %{target} ایجاد کرد"
         create_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را متوقف کرد"
         create_user_role_html: "%{name} نقش %{target} را ایجاد کرد"
         demote_user_html: "%{name} کاربر %{target} را تنزل داد"
@@ -259,14 +264,17 @@ fa:
         destroy_email_domain_block_html: "%{name} انسداد دامنهٔ رایانامهٔ %{target} را برداشت"
         destroy_instance_html: "%{name} دامنه %{target} را پاکسازی کرد"
         destroy_ip_block_html: "%{name} قاعدهٔ آی‌پی %{target} را حذف کرد"
+        destroy_relay_html: "%{name} رله %{target} را حذف کرد"
         destroy_status_html: "%{name} وضعیت %{target} را برداشت"
         destroy_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را از سر گرفت"
         destroy_user_role_html: "%{name} نقش %{target} را حذف کرد"
         disable_2fa_user_html: "%{name} ضرورت ورود دو مرحله‌ای را برای کاربر %{target} غیر فعال کرد"
         disable_custom_emoji_html: "%{name} شکلک %{target} را غیرفعال کرد"
+        disable_relay_html: "%{name} رله %{target} را غیرفعال کرد"
         disable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} غیرفعال کرد"
         disable_user_html: "%{name} ورود را برای کاربر %{target} غیرفعال کرد"
         enable_custom_emoji_html: "%{name} شکلک %{target} را فعال کرد"
+        enable_relay_html: "%{name} رله %{target} را فعال کرد"
         enable_sign_in_token_auth_user_html: "%{name}، احراز هویت با توکن رایانامه را برای %{target} فعال کرد"
         enable_user_html: "%{name} ورود را برای کاربر %{target} فعال کرد"
         memorialize_account_html: "%{name} حساب %{target} را تبدیل به صفحهٔ یادمان کرد"
@@ -380,7 +388,7 @@ fa:
       website: پایگاه وب
     disputes:
       appeals:
-        empty: هیچ درخواست تجدیدنظری یافت نشد
+        empty: هیچ درخواست تجدیدنظری یافت نشد.
         title: درخواست‌های تجدیدنظر
     domain_allows:
       add_new: مجاز کردن دامنه
@@ -664,7 +672,7 @@ fa:
         actions:
           delete_html: پست های توهین آمیز را حذف کنید
           mark_as_sensitive_html: رسانه پست های توهین آمیز را به عنوان حساس علامت گذاری کنید
-          silence_html: دسترسی <strong>@%{acct}</strong> را به شدت محدود کنید و نمایه و محتویات آنها را فقط برای افرادی که قبلاً آنها را دنبال می‌کنند قابل مشاهده کنید یا به صورت دستی نمایه آن را جستجو کنید.
+          silence_html: دسترسی <strong>@%{acct}</strong> را به شدت محدود کنید و نمایه و محتویات آنها را فقط برای افرادی که قبلاً آنها را دنبال می‌کنند قابل مشاهده کنید یا به صورت دستی نمایه آن را جستجو کنید
           suspend_html: تعلیق <strong>@%{acct}</strong>، غیرقابل دسترس کردن نمایه و محتوای آنها و تعامل با آنها غیر ممکن
         close_report: 'علامت گذاری گزارش #%{id} به عنوان حل شده است'
         close_reports_html: "<strong>همه</strong> گزارش‌ها در برابر <strong>@%{acct}</strong> را به‌عنوان حل‌وفصل علامت‌گذاری کنید"
@@ -1201,6 +1209,7 @@ fa:
     too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
     use_security_key: استفاده از کلید امنیتی
     user_agreement_html: من خوانده ام و موافقم <a href="%{terms_of_service_path}" target="_blank">شرایط خدمات</a> و <a href="%{privacy_policy_path}" target="_blank">سیاست حفظ حریم خصوصی</a>
+    user_privacy_agreement_html: من <a href="%{privacy_policy_path}" target="_blank">خط‌مشی رازداری</a> را خوانده‌ام و با آن موافقم
   author_attribution:
     example_title: متن نمونه
     hint_html: آیا در خارج از ماستودون اخبار یا مقالات وبلاگ می نویسید؟ نحوه دریافت اعتبار زمانی که آنها در ماستودون به اشتراک گذاشته می شوند را کنترل کنید.
@@ -1415,21 +1424,34 @@ fa:
       domain_blocking_html:
         one: شما می‌خواهید <strong>لیست مسدودسازی دامنه خود را</strong> با حداکثر <strong>%{count} دامنه</strong> از <strong>%{filename}</strong> جایگزین کنید.
         other: شما می خواهید <strong>لیست مسدودسازی دامنه خود را</strong> با حداکثر <strong>%{count} دامنه</strong> از <strong>%{filename}</strong> جایگزین کنید.
+      following_html:
+        one: شما در شرف <strong>دنبال کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید و <strong>دنبال کردن افراد دیگری را متوقف می‌کنید</strong>.
+        other: شما در شرف <strong>دنبال کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید و <strong>دنبال کردن افراد دیگری را متوقف می‌کنید</strong>.
       lists_html:
         one: شما می خواهید <strong>لیست های خود را</strong> با محتوای <strong>%{filename}</strong> جایگزین کنید. حداکثر <strong>%{count} حساب</strong> به لیست‌های جدید اضافه می‌شود.
         other: شما می خواهید <strong>لیست های خود را</strong> با محتوای <strong>%{filename}</strong> جایگزین کنید. حداکثر <strong>%{count} حساب</strong> به لیست‌های جدید اضافه می‌شود.
+      muting_html:
+        one: شما می‌خواهید <strong>لیست حساب‌های بی‌صدا را جایگزین کنید</strong> با حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong>.
+        other: شما می‌خواهید <strong>لیست حساب‌های بی‌صدا را جایگزین کنید</strong> با حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong>.
     preambles:
       blocking_html:
-        one: شما در شرف <strong>مسدود کردن</strong> حداکثر <strong>%{count} حساب</string> از <string>%{filename}</strong> هستید.
-        other: شما در شرف <strong>مسدود کردن</strong> حداکثر <strong>%{count} حساب</string> از <string>%{filename}</string> هستید.
+        one: شما در شرف <strong>مسدود کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
+        other: شما در شرف <strong>مسدود کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
+      bookmarks_html:
+        one: شما می‌خواهید تا <strong>%{count} پست</strong> را از <strong>%{filename}</strong> به <strong>نشانک‌ها</strong> خود اضافه کنید.
+        other: شما می‌خواهید تا <strong>%{count} پست</strong> را از <strong>%{filename}</strong> به <strong>نشانک‌ها</strong> خود اضافه کنید.
+      domain_blocking_html:
+        one: شما در شرف <strong>مسدود کردن</strong> تا <strong>%{count} دامنه</strong> از <strong>%{filename}</strong> هستید.
+        other: شما در شرف <strong>مسدود کردن</strong> تا <strong>%{count} دامنه</strong> از <strong>%{filename}</strong> هستید.
+      following_html:
+        one: شما در شرف <strong>دنبال کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
+        other: شما در شرف <strong>دنبال کردن</strong> حداکثر <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
       lists_html:
         one: شما در حال افزودن <strong>%{count} حساب</strong> از <strong>%{filename}</strong> به <strong>لیست‌های</strong> خود هستید. اگر لیستی برای افزودن وجود نداشته باشد، لیست های جدیدی ایجاد می شود.
         other: شما می‌خواهید تا <strong>%{count} حساب</strong> از <strong>%{filename}</strong> را به <strong>فهرست‌های</strong> خود اضافه کنید. اگر لیستی برای افزودن وجود نداشته باشد، لیست های جدیدی ایجاد می شود.
       muting_html:
-        one: 'شما در حال انجام <strong>بی صدا</strong> تا <strong>%{count} حساب کاربری</strong> از <strong>%{filename}</strong>.
-
-          '
-        other:
+        one: شما در حال <strong>بی صدا کردن</strong> تا <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
+        other: شما در حال <strong>بی صدا کردن</strong> تا <strong>%{count} حساب</strong> از <strong>%{filename}</strong> هستید.
     preface: می‌توانید داده‌هایی را که از کارسازی دیگر برون‌ریخته‌اید، چون سیاهه‌ای از افرادی که پی گرفته یا مسدود می‌کنید را درون‌ریزی کنید.
     recent_imports: واردشده‌های اخیر
     states:
@@ -1860,7 +1882,7 @@ fa:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
-      time: "%OH:%OM"
+      time: "%H:%M"
       with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
@@ -1902,6 +1924,8 @@ fa:
       details: 'جزییات تلاش‌ها برای ورد:'
       explanation: شخصی سعی کرده است به حساب شما وارد شود اما یک عامل احراز هویت دوم نامعتبر ارائه کرده است.
       further_actions_html: اگر این شما نبودید، توصیه می کنیم فورا %{action} را انجام دهید زیرا ممکن است به خطر بیفتد.
+      subject: عدم موفقیت در تأیید هویت عامل دوم
+      title: احراز هویت عامل دوم ناموفق بود
     suspicious_sign_in:
       change_password: تغییر گذرواژه‌تان
       details: 'جزییات ورود:'
@@ -1940,7 +1964,7 @@ fa:
         none: هشدار برای %{acct}
         sensitive: فرسته‌هایتان روی %{acct} از اکنون به عنوان حسّاس علامت خواهند خورد
         silence: حساب %{acct} شما محدود شده است
-        suspend: حساب %{acct}  شما معلق شده است
+        suspend: حساب %{acct} شما معلق شده است
       title:
         delete_statuses: فرسته‌ها برداشته شدند
         disable: حساب متوقف شده است
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c4f9844679..c7148772b8 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1209,6 +1209,7 @@ fi:
     too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
     use_security_key: Käytä suojausavainta
     user_agreement_html: Olen lukenut ja hyväksyn <a href="%{terms_of_service_path}" target="_blank">käyttöehdot</a> ja <a href="%{privacy_policy_path}" target="_blank">tietosuojakäytännön</a>
+    user_privacy_agreement_html: Olen lukenut ja hyväksyn <a href="%{privacy_policy_path}" target="_blank">tietosuojakäytännön</a>
   author_attribution:
     example_title: Esimerkkiteksti
     hint_html: Kirjoitatko uutisia tai blogitekstejä Mastodonin ulkopuolella? Määrää, kuinka tulet tunnustetuksi, kun niitä jaetaan Mastodonissa.
@@ -1216,7 +1217,7 @@ fi:
     more_from_html: Lisää tekijältä %{name}
     s_blog: Käyttäjän %{name} blogi
     then_instructions: Lisää sitten julkaisun verkkotunnus seuraavaan tekstikenttään.
-    title: Tekijän tunnustus
+    title: Tekijän nimeäminen
   challenge:
     confirm: Jatka
     hint_html: "<strong>Vihje:</strong> Emme pyydä sinulta salasanaa uudelleen seuraavan tunnin aikana."
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 441217ec0e..93bf30e0ef 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -948,6 +948,9 @@ fo:
       preview:
         explanation_html: 'Teldubrævið verður sent til <strong>%{display_count} brúkarar</strong>, sum hava stovna kontu áðrenn %{date}. Fylgjandi tekstur kemur við í teldubrævið:'
         send_preview: Send undanvísing til %{email}
+        send_to_all:
+          one: Send %{display_count} teldubræv
+          other: Send %{display_count} teldubrøv
         title: Undanvís fráboðan um tænastutreytir
       publish: Útgev
       published_on_html: Útgivið %{date}
@@ -1206,6 +1209,7 @@ fo:
     too_fast: Oyðublaðið innsent ov skjótt, royn aftur.
     use_security_key: Brúka trygdarlykil
     user_agreement_html: Eg havi lisið og taki undir við <a href="%{terms_of_service_path}" target="_blank">tænastutreytunum</a> og <a href="%{privacy_policy_path}" target="_blank">privatlívspolitikkinum</a>
+    user_privacy_agreement_html: I have lisið og taki undir við <a href="%{privacy_policy_path}" target="_blank">privatlívspolitikkinum</a>
   author_attribution:
     example_title: Tekstadømi
     hint_html: Skrivar tú tíðindi ella greinar til bloggin uttanfyri Mastodon? Her kanst tú stýra, hvussu tú verður tilsipað/ur, tá ið títt tilfar verður deilt á Mastodon.
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 4fefee7ae0..37c34b7678 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1212,6 +1212,7 @@ fr-CA:
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
     use_security_key: Utiliser la clé de sécurité
     user_agreement_html: J'ai lu et j'accepte les <a href="%{terms_of_service_path}" target="_blank">conditions d'utilisation</a> et la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
+    user_privacy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
   author_attribution:
     example_title: Exemple de texte
     hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3000f9a4a9..0c1e248467 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1212,6 +1212,7 @@ fr:
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
     use_security_key: Utiliser la clé de sécurité
     user_agreement_html: J'ai lu et j'accepte les <a href="%{terms_of_service_path}" target="_blank">conditions d'utilisation</a> et la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
+    user_privacy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
   author_attribution:
     example_title: Exemple de texte
     hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 2809019bf3..a1843a111e 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1209,6 +1209,7 @@ fy:
     too_fast: Formulier is te fluch yntsjinne. Probearje it nochris.
     use_security_key: Befeiligingskaai brûke
     user_agreement_html: Ik haw de <a href="%{terms_of_service_path}" target="_blank">gebrûksbetingsten</a> en it <a href="%{privacy_policy_path}" target="_blank">privacybelied</a> lêzen en gean der mei akkoard
+    user_privacy_agreement_html: Ik haw it <a href="%{privacy_policy_path}" target="_blank">privacybelied</a> lêzen en gean dêrmei akkoard
   author_attribution:
     example_title: Faorbyldtekst
     hint_html: Skriuwe jo nijs- of blogartikelen bûten Mastodon? Bepaal hoe’t jo oahelle wurde as dizze dield wurde op Mastodon.
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 56f66609c3..9945e44c07 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1266,6 +1266,7 @@ ga:
     too_fast: Cuireadh an fhoirm isteach róthapa, triail arís.
     use_security_key: Úsáid eochair shlándála
     user_agreement_html: Léigh mé agus aontaím leis na <a href="%{terms_of_service_path}" target="_blank">téarmaí seirbhíse</a> agus <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
+    user_privacy_agreement_html: Léigh mé agus aontaím leis an <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
   author_attribution:
     example_title: Téacs samplach
     hint_html: An bhfuil tú ag scríobh altanna nuachta nó blag lasmuigh de Mastodon? Rialú conas a gheobhaidh tú creidmheas nuair a roinntear iad ar Mastodon.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 63a2b9b340..1db9b74b69 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -176,7 +176,7 @@ gl:
         approve_appeal: Aprobar apelación
         approve_user: Aprobar Usuaria
         assigned_to_self_report: Asignar denuncia
-        change_email_user: Cambiar o correo da Usuaria
+        change_email_user: Cambiar o correo da usuaria
         change_role_user: Cambiar Rol da Usuaria
         confirm_user: Confirmar usuaria
         create_account_warning: Crear aviso
@@ -1209,6 +1209,7 @@ gl:
     too_fast: Formulario enviado demasiado rápido, inténtao outra vez.
     use_security_key: Usa chave de seguridade
     user_agreement_html: Lin e acepto os <a href="%{terms_of_service_path}" target="_blank">termos do servizo</a> e a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
+    user_privacy_agreement_html: Lin e acepto a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
   author_attribution:
     example_title: Texto de mostra
     hint_html: Escribes novas ou artigos nun blog alleos a Mastodon? Xestiona o xeito en que podes dar crédito da túa autoría cando os compartes en Mastodon.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index eea4c63179..0a68d338f0 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1247,6 +1247,7 @@ he:
     too_fast: הטופס הוגש מהר מדי, נסה/י שוב.
     use_security_key: שימוש במפתח אבטחה
     user_agreement_html: קראתי וזו הסכמתי למסמך <a href="%{terms_of_service_path}" target="_blank">תנאי השירות</a> ו<a href="%{privacy_policy_path}" target="_blank">מדיניות הפרטיות</a>
+    user_privacy_agreement_html: קראתי והסכמתי ל<a href="%{privacy_policy_path}" target="_blank">מדיניות הפרטיות</a>
   author_attribution:
     example_title: טקסט לדוגמה
     hint_html: האם יש לך בלוג או טור חדשות שמתפרסם מחוץ למסטודון? ניתן לשלוט איך יוצג הקרדיט שלך כשמשתפים את הלינק במסטודון.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index da51e3b5a9..722c361710 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1209,6 +1209,7 @@ hu:
     too_fast: Túl gyorsan küldted el az űrlapot, próbáld később.
     use_security_key: Biztonsági kulcs használata
     user_agreement_html: Elolvastam és egyetértek a <a href="%{terms_of_service_path}" target="_blank">felhasználási feltételekkel</a> és az <a href="%{privacy_policy_path}" target="_blank">adatvédelmi nyilatkozattal</a>
+    user_privacy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
   author_attribution:
     example_title: Mintaszöveg
     hint_html: Mastodonon kívül írsz híreket vagy blogbejegyzéseket? Szabályozd, hogyan tüntethetnek fel szerzőként, amikor Mastodonon osztják meg őket.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index f42271d16c..838acfd4d6 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1209,6 +1209,7 @@ ia:
     too_fast: Formulario inviate troppo rapidemente. Tenta lo de novo.
     use_security_key: Usar clave de securitate
     user_agreement_html: Io ha legite e accepta le <a href="%{terms_of_service_path}" target="_blank">conditiones de servicio</a> e le <a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
+    user_privacy_agreement_html: Io ha legite e io accepta le <a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
   author_attribution:
     example_title: Texto de exemplo
     hint_html: Scribe tu articulos de novas o de blog foras de Mastodon? Controla le maniera in que tu recipe attribution quando on los condivide sur Mastodon.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 229cbb56bf..c4172f238d 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1213,6 +1213,7 @@ is:
     too_fast: Innfyllingarform sent inn of hratt, prófaðu aftur.
     use_security_key: Nota öryggislykil
     user_agreement_html: Ég hef lesið og samþykkt <a href="%{terms_of_service_path}" target="_blank">þjónustuskilmálana</a> og <a href="%{privacy_policy_path}" target="_blank">stefnuna um persónuvernd</a>
+    user_privacy_agreement_html: Ég hef lesið og samþykkt <a href="%{privacy_policy_path}" target="_blank">persónuverndarstefnuna</a>
   author_attribution:
     example_title: Sýnitexti
     hint_html: Ertu að skrifa fréttir eða bloggfærslur utan Mastodon? Stýrðu því hvernig vitnað er í þig þegar þeim er deilt á Mastodon.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a561079f3a..734860f3bb 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1211,6 +1211,7 @@ it:
     too_fast: Modulo inviato troppo velocemente, riprova.
     use_security_key: Usa la chiave di sicurezza
     user_agreement_html: Ho letto e accetto i <a href="%{terms_of_service_path}" target="_blank">termini di servizio</a> e l'<a href="%{privacy_policy_path}" target="_blank">informativa sulla privacy</a>
+    user_privacy_agreement_html: Ho letto e accetto l'<a href="%{privacy_policy_path}" target="_blank">informativa sulla privacy</a>
   author_attribution:
     example_title: Testo di esempio
     hint_html: Stai scrivendo notizie o articoli di blog al di fuori di Mastodon? Controlla come vieni accreditato quando vengono condivisi su Mastodon.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 201bdc1a08..77670f0ec3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1190,6 +1190,7 @@ ja:
     too_fast: フォームの送信が速すぎます。もう一度やり直してください。
     use_security_key: セキュリティキーを使用
     user_agreement_html: <a href="%{terms_of_service_path}" target="_blank">利用規約</a> および <a href="%{privacy_policy_path}" target="_blank">プライバシーポリシー</a>を読み、同意します。
+    user_privacy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">プライバシーポリシー</a>を読み、同意します
   author_attribution:
     example_title: サンプルテキスト
     hint_html: Mastodonの外でニュースやブログなどを執筆しているユーザーは、Mastodonで自分の記事が共有されたときに著者情報を表示させることができます。
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 314029a89e..11cc8b3318 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -413,6 +413,7 @@ kab:
       account: Ameskar
       application: Asnas
       back_to_account: Tuɣalin ɣer usebter n umiḍan
+      contents: Agbur
       deleted: Yettwakkes
       favourites: Imenyafen
       language: Tutlayt
@@ -432,6 +433,9 @@ kab:
     tags:
       search: Anadi
       title: Ihacṭagen
+    terms_of_service:
+      draft: Arewway
+      publish: Asuffeɣ
     title: Tadbelt
     trends:
       allow: Sireg
@@ -781,6 +785,7 @@ kab:
     delete: Tukksa n umiḍan
     development: Taneflit
     edit_profile: Ẓreg amaɣnu
+    export: Sifeḍ
     import: Kter
     import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f7469ce25a..9937375640 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -301,8 +301,8 @@ ko:
         update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
       deleted_account: 계정을 삭제했습니다
       empty: 로그를 찾을 수 없습니다
-      filter_by_action: 행동으로 거르기
-      filter_by_user: 사용자로 거르기
+      filter_by_action: 동작 별 필터
+      filter_by_user: 사용자 기준으로 필터
       title: 감사 로그
       unavailable_instance: "(도메인네임 사용불가)"
     announcements:
@@ -925,9 +925,12 @@ ko:
       generates:
         action: 생성
         chance_to_review_html: "<strong>생성된 이용 약관은 자동으로 게시되지 않을 것입니다.</strong> 결과를 확인할 기회가 있습니다. 진행하려면 필요한 정보들을 입력하세요."
+        explanation_html: 제공되는 이용약관 틀은 정보 제공만을 목적으로 하며 법률 조언으로 해석하면 안 됩니다. 귀하의 상황에 맞는 법률 자문을 받아주시기 바랍니다.
         title: 이용 약관 설정
       history: 역사
       live: 활성
+      no_history: 기록된 이용약관 변경이 아직 없습니다.
+      no_terms_of_service_html: 현재 설정된 이용약관이 없습니다. 이용약관은 명확성을 제공하고 귀하와 사용자간 분쟁에서 발생할 수 있는 책임으로부터 보호할 수 있습니다.
       notified_on_html: 사용자들이 %{date}에 알림을 받았습니다
       notify_users: 사용자들에게 알리기
       preview:
@@ -1189,6 +1192,7 @@ ko:
     too_fast: 너무 빠르게 양식이 제출되었습니다, 다시 시도하세요.
     use_security_key: 보안 키 사용
     user_agreement_html: <a href="%{terms_of_service_path}" target="_blank">이용 약관</a>과 <a href="%{privacy_policy_path}" target="_blank">개인정보처리방침</a>을 읽었고 동의합니다
+    user_privacy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">개인정보처리방침</a>을 읽었고 동의합니다
   author_attribution:
     example_title: 예시 텍스트
     hint_html: 마스토돈 밖에서 뉴스나 블로그 글을 쓰시나요? 마스토돈에 공유되었을 때 어떻게 표시될지를 제어하세요.
@@ -1669,7 +1673,7 @@ ko:
     over_total_limit: 예약 게시물 제한 %{limit}을 초과합니다
     too_soon: 미래의 날짜여야 합니다
   self_destruct:
-    lead_html: 안타깝게도,  <strong>%{domain}</strong> 도메인을 영구히 폐쇄합니다. 이곳의 계정을 가졌다면, 이제 이용할 수 없으며, 당분간 백업 데이터를 요청할 수 있습니다.
+    lead_html: 안타깝게도, <strong>%{domain}</strong>은 영구적으로 폐쇄됩니다. 이곳의 계정을 가지고 있었다면, 이제 이용할 수 없지만 백업 데이터는 요청할 수 있습니다.
     title: 이 서버는 폐쇄중입니다
   sessions:
     activity: 최근 활동
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index dbca48dd37..7659cfcbfb 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -456,8 +456,8 @@ lt:
       availability:
         title: Prieinamumas
         warning: Paskutinis bandymas prisijungti prie šio serverio buvo nesėkmingas
-      back_to_all: Visi
-      back_to_limited: Apribotas
+      back_to_all: Viskas
+      back_to_limited: Apribota
       back_to_warning: Įspėjimas
       by_domain: Domenas
       content_policies:
@@ -864,6 +864,7 @@ lt:
       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
     user_agreement_html: Perskaičiau ir sutinku su <a href="%{terms_of_service_path}" target="_blank">paslaugų sąlygomis</a> ir <a href="%{privacy_policy_path}" target="_blank">privatumo politika</a>
+    user_privacy_agreement_html: Perskaičiau ir sutinku su <a href="%{privacy_policy_path}" target="_blank">privatumo politika</a>
   author_attribution:
     example_title: Teksto pavyzdys
     hint_html: Ar rašote naujienas ar tinklaraščio straipsnius už „Mastodon“ ribų? Valdykite, kaip būsite nurodomi, kai jais bus bendrinama platformoje „Mastodon“.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9619b26fe1..9f05104153 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1209,6 +1209,7 @@ nl:
     too_fast: Formulier is te snel ingediend. Probeer het nogmaals.
     use_security_key: Beveiligingssleutel gebruiken
     user_agreement_html: Ik heb de <a href="%{terms_of_service_path}" target="_blank">gebruiksvoorwaarden</a> en het <a href="%{privacy_policy_path}" target="_blank">privacybeleid</a> gelezen en ga ermee akkoord
+    user_privacy_agreement_html: Ik heb het <a href="%{privacy_policy_path}" target="_blank">privacybeleid</a> gelezen en ga ermee akkoord
   author_attribution:
     example_title: Voorbeeldtekst
     hint_html: Schrijf je nieuws- of blogartikelen buiten Mastodon? Bepaal hoe je geattribueerd wordt als deze gedeeld worden op Mastodon.
@@ -1988,7 +1989,7 @@ nl:
       feature_audience_title: Bouw jouw publiek in vertrouwen op
       feature_control: Je weet zelf het beste wat je op jouw starttijdlijn 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: Mastodon ondersteunt audio-, video- en fotoberichten, toegankelijkheidsbeschrijvingen, peilingen, inhoudswaarschuwingen, geanimeerde profielfoto's, aangepaste lokale emoji's, controle over het bijwerken van miniaturen 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
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 2f652a646c..b7982e93ca 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1209,6 +1209,7 @@ nn:
     too_fast: Skjemaet ble sendt inn for raskt, prøv på nytt.
     use_security_key: Bruk sikkerhetsnøkkel
     user_agreement_html: Eg godtek <a href="%{terms_of_service_path}" target="_blank">bruksvilkåra</a> og <a href="%{privacy_policy_path}" target="_blank">personvernvllkåra</a>
+    user_privacy_agreement_html: Eg har lese og godtar <a href="%{privacy_policy_path}" target="_blank">personvernerklæringa</a>
   author_attribution:
     example_title: Eksempeltekst
     hint_html: Skriv du nyhende eller blogginnlegg utanfor Mastodon? Her kan du kontrollera korleis du blir kreditert når artiklane dine blir delte på Mastodon.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 83a9674f84..5770b4ce0c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -285,6 +285,7 @@ pl:
         enable_user_html: "%{name} przywrócił(a) możliwość logowania użytkownikowi %{target}"
         memorialize_account_html: "%{name} nadał(a) kontu %{target} status in memoriam"
         promote_user_html: "%{name} podniósł(a) uprawnienia użytkownikowi %{target}"
+        publish_terms_of_service_html: "%{name} opublikował aktualizacje warunków korzystania z usługi"
         reject_appeal_html: "%{name} zatwierdził(-a) odwołanie decyzji moderacyjnej od %{target}"
         reject_user_html: "%{name} odrzucił rejestrację od %{target}"
         remove_avatar_user_html: "%{name} usunął(-ęła) awatar użytkownikowi %{target}"
@@ -955,9 +956,36 @@ pl:
       title: Hashtagi
       updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
     terms_of_service:
+      back: Powrót do warunków świadczenia usług
+      changelog: Co się zmieniło
+      create: Użyj własnego
+      current: Aktualna wersja
       draft: Szkic
       generate: Użyj szablonu
+      generates:
+        action: Wygeneruj
+        chance_to_review_html: "<strong>Wygenerowane warunki świadczenia usług nie zostaną automatycznie opublikowane.</strong> Będziesz miał szansę je sprawdzić raz jeszcze. Wypełnij wymagane pola, aby kontynuować."
+        explanation_html: Dostarczany wzór warunków świadczenia usług służy wyłącznie celom informacyjnym i nie powinien być interpretowany jako porada prawna w odniesieniu do żadnego przedmiotu. Proszę skonsultować się ze swoim doradcą prawnym w sprawie swojej sytuacji i konkretnych kwestii prawnych, które państwo posiadają.
+        title: Warunki korzystania z usługi
+      history: Historia
+      live: Rzeczywiste
+      no_history: Nie ma jeszcze zapisanych zmian w warunkach korzystania z usługi.
+      no_terms_of_service_html: Obecnie nie masz żadnych skonfigurowanych warunków korzystania z usługi. Warunki korzystania z usługi mają zapewnić jasność i ochronę przed potencjalnymi zobowiązaniami w sporach z użytkownikami.
+      notified_on_html: Użytkownicy powiadomieni o %{date}
+      notify_users: Powiadom użytkowników
+      preview:
+        explanation_html: 'E-mail zostanie wysłany do <strong>%{display_count} użytkowników</strong>, którzy zarejestrowali się przed %{date}. Otrzymają oni wiadomość o następującej treści:'
+        send_preview: Wyślij podgląd do %{email}
+        send_to_all:
+          few: Wyślij %{display_count} wiadomości e-mail
+          many: Wyślij %{display_count} wiadomości e-mail
+          one: Wyślij %{display_count} wiadomość e-mail
+          other: Wyślij %{display_count} wiadomości e-mail
+        title: Podgląd warunków powiadomienia o usłudze
+      publish: Publikuj
+      published_on_html: Opublikowano w dniu %{date}
       save_draft: Zapisz wersję roboczą
+      title: Warunki korzystania z usługi
     title: Administracja
     trends:
       allow: Zezwól
@@ -1197,6 +1225,7 @@ pl:
     set_new_password: Ustaw nowe hasło
     setup:
       email_below_hint_html: Sprawdź folder ze spamem lub poproś o inny link potwierdzający. Możesz poprawić swój adres e-mail, jeśli jest niepoprawny.
+      email_settings_hint_html: Kliknij link, który wysłaliśmy do %{email} , aby rozpocząć korzystanie z Mastodon. Poczekamy tutaj.
       link_not_received: Nie otrzymano linku?
       new_confirmation_instructions_sent: Za kilka minut otrzymasz nowy e-mail z linkiem potwierdzającym!
       title: Sprawdź swoją skrzynkę odbiorczą
@@ -1205,6 +1234,7 @@ pl:
       title: Zaloguj się do %{domain}
     sign_up:
       manual_review: Rejestracja na %{domain} przechodzi przez ręczne sprawdzanie przez naszych moderatorów. Aby pomóc nam usprawnić ten proces, napisz coś o sobie oraz dlaczego chcesz założyć konto na %{domain}.
+      preamble: Z kontem na tym serwerze Mastodon będziesz mógł obserwować każdą inną osobę w sieci, niezależnie od miejsca przechowywania ich konta.
       title: Skonfigurujmy Twoje konto na %{domain}.
     status:
       account_status: Stan konta
@@ -1217,6 +1247,7 @@ pl:
     too_fast: Zbyt szybko przesłano formularz, spróbuj ponownie.
     use_security_key: Użyj klucza bezpieczeństwa
     user_agreement_html: Przeczytałem i akceptuję <a href="%{terms_of_service_path}" target="_blank">warunki korzystania z usługi</a> oraz <a href="%{privacy_policy_path}" target="_blank">politykę prywatności</a>
+    user_privacy_agreement_html: Przeczytałem/am/o i akceptuję <a href="%{privacy_policy_path}" target="_blank">politykę prywatności</a>
   author_attribution:
     example_title: Przykładowy tekst
     hint_html: Piszesz wiadomości albo bloga poza Mastodonem? Kontroluj jak będą ci przypisywane podczas dizielenia się nimi na Mastodonie.
@@ -1435,6 +1466,68 @@ pl:
       merge_long: Zachowaj obecne wpisy i dodaj nowe
       overwrite: Nadpisz
       overwrite_long: Zastąp obecne wpisy nowymi
+    overwrite_preambles:
+      blocking_html:
+        few: Zamierzasz <strong>zastąpić swoją listę bloków</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zastąpić swoją listę bloków</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zastąpić swoją listę bloków</strong> maksymalnie <strong>%{count} kontem</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zastąpić swoją listę bloków</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+      bookmarks_html:
+        few: Zamierzasz <strong>zastąpić swoje zakładki</strong> maksymalnie <strong>%{count} wpisami</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zastąpić swoje zakładki</strong> maksymalnie <strong>%{count} wpisami</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zastąpić swoje zakładki</strong> maksymalnie <strong>%{count} wpisem</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zastąpić swoje zakładki</strong> maksymalnie <strong>%{count} wpisami</strong> z <strong>%{filename}</strong>.
+      domain_blocking_html:
+        few: Zamierzasz <strong>zastąpić swoją listę bloków domen</strong> maksymalnie <strong>%{count} domenami</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zastąpić swoją listę bloków domen</strong> maksymalnie <strong>%{count} domenami</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zastąpić swoją listę bloków domen</strong> maksymalnie <strong>%{count} domeną</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zastąpić swoją listę bloków domen</strong> maksymalnie <strong>%{count} domenami</strong> z <strong>%{filename}</strong>.
+      following_html:
+        few: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} konta</strong> z <strong>%{filename}</strong> i <strong>przestać obserwować kogokolwiek innego</strong>.
+        many: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong> i <strong>przestać obserwować kogokolwiek innego</strong>.
+        one: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} konto</strong> z <strong>%{filename}</strong> i <strong>przestać obserwować kogokolwiek innego</strong>.
+        other: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong> i <strong>przestać obserwować kogokolwiek innego</strong>.
+      lists_html:
+        few: Zamierzasz <strong>zastąpić swoje listy</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zastąpić swoje listy</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zastąpić swoje listy</strong> maksymalnie <strong>%{count} kontem</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zastąpić swoje listy</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+      muting_html:
+        few: Zamierzasz <strong>zastąpić swoją listę wyciszonych</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zastąpić swoją listę wyciszonych</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zastąpić swoją listę wyciszonych</strong> maksymalnie <strong>%{count} kontem</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zastąpić swoją listę wyciszonych</strong> maksymalnie <strong>%{count} kontami</strong> z <strong>%{filename}</strong>.
+    preambles:
+      blocking_html:
+        few: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} konta</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} konto</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
+      bookmarks_html:
+        few: Zamierzasz dodać maksymalnie <strong>%{count} wpisy</strong> do twoich <strong>zakładek</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz dodać maksymalnie <strong>%{count} wpisów</strong> do twoich <strong>zakładek</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz dodać maksymalnie <strong>%{count} wpis</strong> do twoich <strong>zakładek</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz dodać maksymalnie <strong>%{count} wpisów</strong> do twoich <strong>zakładek</strong> z <strong>%{filename}</strong>.
+      domain_blocking_html:
+        few: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} domeny</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} domeny</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} domenę</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zablokować</strong> maksymalnie <strong>%{count} domeny</strong> z <strong>%{filename}</strong>.
+      following_html:
+        few: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} konta</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} konto</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>zaobserwować</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
+      lists_html:
+        few: Zamierzasz dodać maksymalnie <strong>%{count} konta</strong> do twoich <strong>list</strong> z <strong>%{filename}</strong>. Jeżeli nie ma list, nowe zostaną utworzone.
+        many: Zamierzasz dodać maksymalnie <strong>%{count} kont</strong> do twoich <strong>list</strong> z <strong>%{filename}</strong>. Jeżeli nie ma list, nowe zostaną utworzone.
+        one: Zamierzasz dodać maksymalnie <strong>%{count} konto</strong> do twoich <strong>list</strong> z <strong>%{filename}</strong>. Jeżeli nie ma list, nowe zostaną utworzone.
+        other: Zamierzasz dodać maksymalnie <strong>%{count} kont</strong> do twoich <strong>list</strong> z <strong>%{filename}</strong>. Jeżeli nie ma list, nowe zostaną utworzone.
+      muting_html:
+        few: Zamierzasz <strong>wyciszyć</strong> maksymalnie <strong>%{count} konta</strong> z <strong>%{filename}</strong>.
+        many: Zamierzasz <strong>wyciszyć</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
+        one: Zamierzasz <strong>wyciszyć</strong> maksymalnie <strong>%{count} konto</strong> z <strong>%{filename}</strong>.
+        other: Zamierzasz <strong>wyciszyć</strong> maksymalnie <strong>%{count} kont</strong> z <strong>%{filename}</strong>.
     preface: Możesz zaimportować pewne dane (np. lista kont, które obserwujesz lub blokujesz) do swojego konta na tym serwerze, korzystając z danych wyeksportowanych z innego serwera.
     recent_imports: Ostatnie importy
     states:
@@ -1926,6 +2019,15 @@ pl:
       further_actions_html: Jeśli to nie Ty, zalecamy %{action} natychmiastowo i włącz uwierzytelnianie dwuetapowe, aby Twoje konto było bezpieczne.
       subject: Uzyskano dostęp do twojego konta z nowego adresu IP
       title: Nowe logowanie
+    terms_of_service_changed:
+      agreement: Kontynuując używanie %{domain}, zgadzasz się na te warunki. Jeśli nie zgadzasz się ze zaktualizowanymi warunkami, możesz wypowiedzieć umowę z %{domain} w dowolnym momencie, usuwając swoje konto.
+      changelog: 'W skrócie oto co oznacza dla Ciebie ta aktualizacja:'
+      description: 'Otrzymujesz ten e-mail, ponieważ wprowadzamy pewne zmiany w naszym regulaminie usługi w %{domain}. Zachęcamy Cię do pełnego zapoznania się z aktualnymi warunkami:'
+      description_html: Otrzymujesz ten e-mail, ponieważ wprowadzamy pewne zmiany w naszym regulaminie usługi w %{domain}. Zachęcamy do zapoznania się z aktualnymi warunkami <a href="%{path}" target="_blank">w całości tutaj</a>.
+      sign_off: Zespół %{domain}
+      subject: Aktualizacja warunków korzystania z usług
+      subtitle: Warunki korzystania z %{domain} zmieniają się
+      title: Ważna aktualizacja
     warning:
       appeal: Złóż odwołanie
       appeal_description: Jeśli uważasz, że zaszło nieporozumienie, możesz złożyć odwołanie do zespołu %{instance}.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 7dcf0977f3..4015005b2d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -844,7 +844,7 @@ pt-PT:
       no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado
       open: Abrir publicação
       original_status: Publicação original
-      reblogs: Reblogues
+      reblogs: Impulsos
       replied_to_html: Respondeu a %{acct_link}
       status_changed: Publicação alterada
       status_title: Publicado por @%{name}
@@ -1209,6 +1209,7 @@ pt-PT:
     too_fast: Formulário enviado demasiado rapidamente, tenta novamente.
     use_security_key: Usar chave de segurança
     user_agreement_html: Eu li e concordo com os <a href="%{terms_of_service_path}" target="_blank">termos do serviço</a> e <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
+    user_privacy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
   author_attribution:
     example_title: Texto de exemplo
     hint_html: Estás a escrever notícias ou artigos de blogue fora do Mastodon? Controla a forma como és creditados quando estes são partilhados no Mastodon.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2db629cafc..fe0d797ff8 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1247,6 +1247,7 @@ ru:
     too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
     use_security_key: Использовать ключ безопасности
     user_agreement_html: Мной прочитаны и приняты<a href="%{terms_of_service_path}" target="_blank">пользовательское соглашение</a> и <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
+    user_privacy_agreement_html: Мной прочитана и принята <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
   author_attribution:
     example_title: Образец текста
     hint_html: Публикуете ли вы свои статьи где-либо ещё кроме Mastodon? Если да, то ваше авторство может быть упомянуто, когда ими делятся в Mastodon.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index f5be51f9c3..45b1be79b7 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -313,6 +313,11 @@ ar:
         name: الوسم
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
         usable: السماح للمنشورات باستخدام هذا الوسم محليا
+      terms_of_service:
+        text: شروط الخدمة
+      terms_of_service_generator:
+        domain: النطاق
+        jurisdiction: الاختصاص القانوني
       user:
         role: الدور
         time_zone: النطاق الزمني
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index a903a3be06..a1d0137b13 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -3,6 +3,7 @@ bg:
   simple_form:
     hints:
       account:
+        attribution_domains: Едно на ред. Защитава от фалшиви атрибути.
         discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители.
         display_name: Вашето пълно име или псевдоним.
         fields: Вашата начална страница, местоимения, години, всичко що искате.
@@ -133,6 +134,8 @@ bg:
         changelog: Може да се структурира със синтаксиса на Markdown.
         text: Може да се структурира със синтаксиса на Markdown.
       terms_of_service_generator:
+        admin_email: Правните бележки включват насрещни известия, постановления на съда, заявки за сваляне и заявки от правоохранителните органи.
+        domain: Неповторимо идентифициране на онлайн услугата, която предоставяте.
         jurisdiction: Впишете държавата, където живее всеки, който плаща сметките. Ако е дружество или друго образувание, то впишете държавата, в която е регистрирано, и градът, регионът, територията или щатът според случая.
       user:
         chosen_languages: Само публикации на отметнатите езици ще се показват в публичните часови оси
@@ -149,6 +152,7 @@ bg:
         url: До къде ще се изпращат събитията
     labels:
       account:
+        attribution_domains: Уебсайтове, позволено им да приписват авторството ви
         discoverable: Включване на профил и публикации в алгоритмите за откриване
         fields:
           name: Етикет
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index c908d07479..0abf5b1331 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -3,6 +3,7 @@ ca:
   simple_form:
     hints:
       account:
+        attribution_domains: Un per línia. Protegeix de falses atribucions.
         discoverable: El teu perfil i els teus tuts públics poden aparèixer o ser recomanats en diverses àreas de Mastodon i el teu perfil pot ser suggerit a altres usuaris.
         display_name: El teu nom complet o el teu nom divertit.
         fields: La teva pàgina d'inici, pronoms, edat, el que vulguis.
@@ -147,6 +148,7 @@ ca:
         url: On els esdeveniments seran enviats
     labels:
       account:
+        attribution_domains: Llocs web que us poden donar crèdit
         discoverable: Permet el perfil i el tuts en els algorismes de descobriment
         fields:
           name: Etiqueta
@@ -223,6 +225,7 @@ ca:
         setting_display_media_show_all: Mostra-ho tot
         setting_expand_spoilers: Desplega sempre els tuts marcats amb advertències de contingut
         setting_hide_network: Amaga la teva xarxa
+        setting_missing_alt_text_modal: Mostra un diàleg de confirmació abans de publicar contingut sense text alternatiu
         setting_reduce_motion: Redueix el moviment de les animacions
         setting_system_font_ui: Usa la lletra predeterminada del sistema
         setting_system_scrollbars_ui: Usa la barra de desplaçament predeterminada del sistema
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 515c7fb9e8..ee0a3ae561 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,6 +3,7 @@ cs:
   simple_form:
     hints:
       account:
+        attribution_domains: Jeden na řádek. Chrání před falešným připisování autorství.
         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.
@@ -155,6 +156,7 @@ cs:
         url: Kam budou události odesílány
     labels:
       account:
+        attribution_domains: Webové stránky s povolením Vám připsat autorství
         discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech
         fields:
           name: Označení
@@ -231,6 +233,7 @@ cs:
         setting_display_media_show_all: Zobrazit vše
         setting_expand_spoilers: Vždy rozbalit příspěvky označené varováními o obsahu
         setting_hide_network: Skrýt mou síť
+        setting_missing_alt_text_modal: Zobrazit potvrzovací dialog před odesláním médií bez alt textu
         setting_reduce_motion: Omezit pohyb v animacích
         setting_system_font_ui: Použít výchozí písmo systému
         setting_system_scrollbars_ui: Použít výchozí posuvník systému
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 1220ceabf3..805f8f93af 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -3,6 +3,7 @@ cy:
   simple_form:
     hints:
       account:
+        attribution_domains: Un i bob llinell. Yn amddiffyn rhag priodoli ffug.
         discoverable: Mae'n bosibl y bydd eich postiadau cyhoeddus a'ch proffil yn cael sylw neu'n cael eu hargymell mewn gwahanol feysydd o Mastodon ac efallai y bydd eich proffil yn cael ei awgrymu i ddefnyddwyr eraill.
         display_name: Eich enw llawn neu'ch enw hwyl.
         fields: Eich tudalen cartref, rhagenwau, oed, neu unrhyw beth.
@@ -155,6 +156,7 @@ cy:
         url: I ble bydd digwyddiadau'n cael eu hanfon
     labels:
       account:
+        attribution_domains: Gwefannau sy'n cael caniatâd i'ch cydnabod chi
         discoverable: Proffil nodwedd a phostiadau mewn algorithmau darganfod
         fields:
           name: Label
@@ -231,6 +233,7 @@ cy:
         setting_display_media_show_all: Dangos popeth
         setting_expand_spoilers: Dangos postiadau wedi'u marcio â rhybudd cynnwys bob tro
         setting_hide_network: Cuddio eich graff cymdeithasol
+        setting_missing_alt_text_modal: Dangos deialog cadarnhau cyn postio cyfrwng heb destun amgen
         setting_reduce_motion: Lleihau mudiant mewn animeiddiadau
         setting_system_font_ui: Defnyddio ffont rhagosodedig y system
         setting_system_scrollbars_ui: Defnyddiwch far sgrolio rhagosodedig y system
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index cc51bb7603..1548e3e24e 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -3,11 +3,12 @@ da:
   simple_form:
     hints:
       account:
+        attribution_domains: Ét pr. linje. Beskytter mod falske tilskrivninger.
         discoverable: Dine offentlige indlæg og profil kan blive fremhævet eller anbefalet i forskellige områder af Mastodon, og profilen kan blive foreslået til andre brugere.
         display_name: Dit fulde navn eller dit sjove navn.
         fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til.
         indexable: Dine offentlige indlæg vil kunne vises i Mastodon-søgeresultater. Folk, som har interageret med dem, vil kunne finde dem uanset.
-        note: 'Du kan @omtale andre personer eller #hashtags.'
+        note: 'Du kan @omtale andre personer eller #etiketter.'
         show_collections: Folk vil ikke kunne tjekke dine Følger og Følgere. Folk, du selv følger, vil stadig kunne se dette.
         unlocked: Man vil kunne følges af folk uden først at godkende dem. Ønsker man at gennemgå Følg-anmodninger og individuelt acceptere/afvise nye følgere, så fjern markeringen.
       account_alias:
@@ -15,7 +16,7 @@ da:
       account_migration:
         acct: Angiv brugernavn@domain for den konto, hvortil du vil flytte
       account_warning_preset:
-        text: Du kan bruge indlægssyntaks, såsom URL'er, hashtags og omtaler
+        text: Du kan bruge indlægssyntaks, såsom URL'er, etiketter og omtaler
         title: Valgfri. Ikke synlig for modtageren
       admin_account_action:
         include_statuses: Brugeren vil se, hvilke indlæg, som har forårsaget modereringen/advarslen
@@ -53,7 +54,7 @@ da:
         password: Brug mindst 8 tegn
         phrase: Matches uanset uanset brug af store/små bogstaver i teksten eller indholdsadvarsel for et indlæg
         scopes: De API'er, som applikationen vil kunne tilgå. Vælges en topniveaudstrækning, vil detailvalg være unødvendige.
-        setting_aggregate_reblogs: Vis ikke nye boosts for nyligt boostede indlæg (påvirker kun nyligt modtagne boosts)
+        setting_aggregate_reblogs: Vis ikke nye fremhævelser for nyligt fremhævede indlæg (påvirker kun nyligt modtagne fremhævelser)
         setting_always_send_emails: Normalt sendes ingen e-mailnotifikationer under aktivt brug af Mastodon
         setting_default_sensitive: Sensitive medier er som standard skjult og kan vises med et klik
         setting_display_media_default: Skjul medier med sensitiv-markering
@@ -70,7 +71,7 @@ da:
         domain: Dette kan være domænenavnet vist i den benyttede i e-mailadresse eller MX-post. Begge tjekkes under tilmelding.
         with_dns_records: Et forsøg på at opløse det givne domænes DNS-poster foretages, og resultaterne blokeres ligeledes
       featured_tag:
-        name: 'Her er nogle af dine hyppigst brugte hashtags:'
+        name: 'Her er nogle af dine hyppigst brugte etiketter:'
       filters:
         action: Vælg handlingen til eksekvering, når et indlæg matcher filteret
         actions:
@@ -82,7 +83,7 @@ da:
         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: 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.
+        content_cache_retention_period: Alle indlæg fra andre servere (herunder fremhævelser 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.
@@ -101,7 +102,7 @@ da:
         thumbnail: Et ca. 2:1 billede vist sammen med serveroplysningerne.
         timeline_preview: Udloggede besøgende kan gennemse serverens seneste offentlige indlæg.
         trendable_by_default: Spring manuel gennemgang af trendindhold over. Individuelle elementer kan stadig fjernes fra trends efter kendsgerningen.
-        trends: Tendenser viser, hvilke indlæg, hashtags og nyheder opnår momentum på serveren.
+        trends: Tendenser viser, hvilke indlæg, etiketter og nyheder opnår momentum på serveren.
         trends_as_landing_page: Vis tendensindhold til udloggede brugere og besøgende i stedet for en beskrivelse af denne server. Kræver, at tendenser er aktiveret.
       form_challenge:
         current_password: Du bevæger dig ind på et sikkert område
@@ -155,6 +156,7 @@ da:
         url: Hvor begivenheder sendes til
     labels:
       account:
+        attribution_domains: Websteder, man må krediteres af
         discoverable: Fremhæv profil og indlæg i opdagelsesalgoritmer
         fields:
           name: Etiket
@@ -215,10 +217,10 @@ da:
         password: Adgangskode
         phrase: Nøgleord/-sætning
         setting_advanced_layout: Aktivér avanceret webgrænseflade
-        setting_aggregate_reblogs: Gruppér boosts på tidslinjer
+        setting_aggregate_reblogs: Gruppér fremhævelser på tidslinjer
         setting_always_send_emails: Send altid e-mailnotifikationer
         setting_auto_play_gif: Autoafspil animerede GIF'er
-        setting_boost_modal: Vis bekræftelsesdialog inden boosting
+        setting_boost_modal: Vis bekræftelsesdialog inden fremhævelse
         setting_default_language: Sprog for indlæg
         setting_default_privacy: Fortrolighed for indlæg
         setting_default_sensitive: Markér altid medier som sensitive
@@ -231,6 +233,7 @@ da:
         setting_display_media_show_all: Vis alle
         setting_expand_spoilers: Ekspandér altid indlæg markeret med indholdsadvarsler
         setting_hide_network: Skjul din sociale graf
+        setting_missing_alt_text_modal: Vis bekræftelsesdialog inden medier uden alt-tekst lægges op
         setting_reduce_motion: Reducér animationsbevægelse
         setting_system_font_ui: Brug systemets standardskrifttype
         setting_system_scrollbars_ui: Brug standard systemrullebjælke
@@ -308,7 +311,7 @@ da:
         follow_request: Nogen anmodede om at følge dig
         mention: Nogen omtalte dig
         pending_account: Ny konto kræver gennemgang
-        reblog: Nogen boostede dit indlæg
+        reblog: Nogen fremhævede dit indlæg
         report: Ny anmeldelse indsendt
         software_updates:
           all: Notificér ved alle opdateringer
@@ -324,10 +327,10 @@ da:
         indexable: Inkludér profilside i søgemaskiner
         show_application: Vis, fra hvilken app et indlæg er sendt
       tag:
-        listable: Tillad visning af dette hashtag i søgninger og forslag
+        listable: Tillad visning af denne etiket i søgninger og forslag
         name: Hashtag
-        trendable: Tillad visning af dette hashtag under trends
-        usable: Tillad indlæg at benytte dette hashtag lokalt
+        trendable: Tillad visning af denne etiket under tendenser
+        usable: Tillad indlæg at benytte denne etiket lokalt
       terms_of_service:
         changelog: Hvad der er ændret?
         text: Tjenestevilkår
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 3a66001da5..9f3f84ffce 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -3,6 +3,7 @@ de:
   simple_form:
     hints:
       account:
+        attribution_domains: Eine Domain pro Zeile. Dadurch können falsche Zuschreibungen unterbunden werden.
         discoverable: Deine öffentlichen Beiträge und dein Profil können in verschiedenen Bereichen auf Mastodon angezeigt oder empfohlen werden und dein Profil kann anderen vorgeschlagen werden.
         display_name: Dein richtiger Name oder dein Fantasiename.
         fields: Deine Website, Pronomen, dein Alter – alles, was du möchtest.
@@ -155,6 +156,7 @@ de:
         url: Wohin Ereignisse gesendet werden
     labels:
       account:
+        attribution_domains: Websites, die auf dich verweisen dürfen
         discoverable: Profil und Beiträge in Suchalgorithmen berücksichtigen
         fields:
           name: Beschriftung
@@ -231,6 +233,7 @@ de:
         setting_display_media_show_all: Alle Medien anzeigen
         setting_expand_spoilers: Beiträge mit Inhaltswarnung immer ausklappen
         setting_hide_network: Follower und „Folge ich“ nicht anzeigen
+        setting_missing_alt_text_modal: Bestätigungsdialog anzeigen, bevor Medien ohne Bildbeschreibung veröffentlicht werden
         setting_reduce_motion: Bewegung in Animationen verringern
         setting_system_font_ui: Standardschriftart des Browsers verwenden
         setting_system_scrollbars_ui: Bildlaufleiste des Systems verwenden
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index e06cf7069d..4b6cc80a12 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -3,6 +3,7 @@ el:
   simple_form:
     hints:
       account:
+        attribution_domains: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες.
         discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες.
         display_name: Το πλήρες ή το αστείο σου όνομα.
         fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες.
@@ -136,6 +137,7 @@ el:
         admin_email: Οι νομικές ανακοινώσεις περιλαμβάνουν αντικρούσεις, δικαστικές αποφάσεις, αιτήματα που έχουν ληφθεί και αιτήματα επιβολής του νόμου.
         arbitration_address: Μπορεί να είναι το ίδιο με τη φυσική διεύθυνση παραπάνω, ή “N/A” εάν χρησιμοποιείται email
         arbitration_website: Μπορεί να είναι μια φόρμα ιστού, ή “N/A” εάν χρησιμοποιείται email
+        dmca_address: Για τους φορείς των ΗΠΑ, χρησιμοποιήστε τη διεύθυνση που έχει καταχωρηθεί στο DMCA Designated Agent Directory. A P.O. Η λίστα είναι διαθέσιμη κατόπιν απευθείας αιτήματος, Χρησιμοποιήστε το αίτημα απαλλαγής από την άδεια χρήσης του καθορισμένου από το DMCA Agent Post Office Box για να στείλετε email στο Γραφείο Πνευματικών Δικαιωμάτων και περιγράψτε ότι είστε συντονιστής περιεχομένου με βάση το σπίτι, ο οποίος φοβάται την εκδίκηση ή την απόδοση για τις ενέργειές σας και πρέπει να χρησιμοποιήσετε ένα P.. Box για να αφαιρέσετε τη διεύθυνση οικίας σας από τη δημόσια προβολή.
         dmca_email: Μπορεί να είναι το ίδιο email που χρησιμοποιείται για “Διεύθυνση email για νομικές ανακοινώσεις” παραπάνω
         domain: Μοναδικό αναγνωριστικό της διαδικτυακής υπηρεσίας που παρέχεις.
         jurisdiction: Ανέφερε τη χώρα όπου ζει αυτός που πληρώνει τους λογαριασμούς. Εάν πρόκειται για εταιρεία ή άλλη οντότητα, ανέφερε τη χώρα όπου υφίσταται, και την πόλη, περιοχή, έδαφος ή πολιτεία ανάλογα με την περίπτωση.
@@ -154,6 +156,7 @@ el:
         url: Πού θα σταλούν τα γεγονότα
     labels:
       account:
+        attribution_domains: Ιστοσελίδες επιτρέπεται να σας αναφέρουν
         discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης
         fields:
           name: Περιγραφή
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 6539cacb80..8a4cb247c7 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -3,6 +3,7 @@ en-GB:
   simple_form:
     hints:
       account:
+        attribution_domains: One per line. Protects from false attributions.
         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.
@@ -59,6 +60,7 @@ en-GB:
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
+        setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome
         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
         username: You can use letters, numbers, and underscores
@@ -128,6 +130,17 @@ en-GB:
         show_application: You will always be able to see which app published your post regardless.
       tag:
         name: You can only change the casing of the letters, for example, to make it more readable
+      terms_of_service:
+        changelog: Can be structured with Markdown syntax.
+        text: Can be structured with Markdown syntax.
+      terms_of_service_generator:
+        admin_email: Legal notices include counternotices, court orders, takedown requests, and law enforcement requests.
+        arbitration_address: Can be the same as Physical address above, or “N/A” if using email
+        arbitration_website: Can be a web form, or “N/A” if using email
+        dmca_address: For US operators, use the address registered in the DMCA Designated Agent Directory. A P.O. Box listing is available upon direct request, use the DMCA Designated Agent Post Office Box Waiver Request to email the Copyright Office and describe that you are a home-based content moderator who fears revenge or retribution for your actions and need to use a P.O. Box to remove your home address from public view.
+        dmca_email: Can be the same email used for “Email address for legal notices” above
+        domain: Unique identification of the online service you are providing.
+        jurisdiction: List the country where whoever pays the bills lives. If it’s a company or other entity, list the country where it’s incorporated, and the city, region, territory or state as appropriate.
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
         role: The role controls which permissions the user has.
@@ -143,6 +156,7 @@ en-GB:
         url: Where events will be sent to
     labels:
       account:
+        attribution_domains: Websites allowed to credit you
         discoverable: Feature profile and posts in discovery algorithms
         fields:
           name: Label
@@ -219,8 +233,10 @@ en-GB:
         setting_display_media_show_all: Show all
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
+        setting_missing_alt_text_modal: Show confirmation dialogue before posting media without alt text
         setting_reduce_motion: Reduce motion in animations
         setting_system_font_ui: Use system's default font
+        setting_system_scrollbars_ui: Use system's default scrollbar
         setting_theme: Site theme
         setting_trends: Show today's trends
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
@@ -315,6 +331,17 @@ en-GB:
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
         usable: Allow posts to use this hashtag locally
+      terms_of_service:
+        changelog: What's changed?
+        text: Terms of Service
+      terms_of_service_generator:
+        admin_email: Email address for legal notices
+        arbitration_address: Physical address for arbitration notices
+        arbitration_website: Website for submitting arbitration notices
+        dmca_address: Physical address for DMCA/copyright notices
+        dmca_email: Email address for DMCA/copyright notices
+        domain: Domain
+        jurisdiction: Legal jurisdiction
       user:
         role: Role
         time_zone: Time Zone
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 696ccd35dc..edf0a29a32 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -233,6 +233,7 @@ en:
         setting_display_media_show_all: Show all
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
+        setting_missing_alt_text_modal: Show confirmation dialog before posting media without alt text
         setting_reduce_motion: Reduce motion in animations
         setting_system_font_ui: Use system's default font
         setting_system_scrollbars_ui: Use system's default scrollbar
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 5de006231a..499b692a28 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -3,6 +3,7 @@ eo:
   simple_form:
     hints:
       account:
+        attribution_domains: Unu por linio. Protektas kontraŭ falsaj atribuoj.
         discoverable: Viaj publikaj afiŝoj kaj profilo povas esti prezentitaj aŭ rekomenditaj en diversaj lokoj de Mastodon kaj via profilo povas esti proponita al aliaj uzantoj.
         display_name: Via plena nomo aŭ via kromnomo.
         fields: Via retpaĝo, pronomoj, aĝo, ĉio, kion vi volas.
@@ -55,10 +56,10 @@ eo:
         scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
         setting_aggregate_reblogs: Ne montri novajn plusendojn de mesaĝoj lastatempe plusenditaj (nur efikas al nove ricevitaj plusendoj)
         setting_always_send_emails: Normale, la sciigoj per retpoŝto ne estos senditaj kiam vi uzas Mastodon aktive
-        setting_default_sensitive: Tiklaj plurmedioj estas kaŝitaj implicite, kaj povas esti montritaj per klako
+        setting_default_sensitive: Tiklaj vidaŭdaĵoj estas kaŝitaj implicite, kaj povas esti montritaj per klako
         setting_display_media_default: Kaŝi plurmediojn markitajn kiel tiklaj
-        setting_display_media_hide_all: Ĉiam kaŝi la plurmediojn
-        setting_display_media_show_all: Ĉiam montri la plurmediojn
+        setting_display_media_hide_all: Ĉiam kaŝi la vidaŭdaĵojn
+        setting_display_media_show_all: Ĉiam montri la vidaŭdaĵojn
         setting_system_scrollbars_ui: Aplikas nur por surtablaj retumiloj baziĝas de Safari kaj Chrome
         setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
         setting_use_pending_items: Kaŝi tempoliniajn ĝisdatigojn malantaŭ klako anstataŭ aŭtomate rulumi la fluon
@@ -155,6 +156,7 @@ eo:
         url: Kien eventoj sendotas
     labels:
       account:
+        attribution_domains: Retejoj permesitaj krediti vin
         discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj
         fields:
           name: Etikedo
@@ -221,16 +223,17 @@ eo:
         setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon
         setting_default_language: Publikada lingvo
         setting_default_privacy: Privateco de afiŝado
-        setting_default_sensitive: Ĉiam marki plurmediojn kiel tiklaj
+        setting_default_sensitive: Ĉiam marki la vidaŭdaĵojn kiel tiklaj
         setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
         setting_disable_hover_cards: Malebligi profilan antaŭmontron kiam oni musumas
         setting_disable_swiping: Malebligi svingajn movojn
-        setting_display_media: Montrado de plurmedioj
+        setting_display_media: Vidigo de vidaŭdaĵoj
         setting_display_media_default: Implicita
         setting_display_media_hide_all: Kaŝi ĉiujn
         setting_display_media_show_all: Montri ĉiujn
         setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
+        setting_missing_alt_text_modal: Montru konfirman dialogon antaŭ afiŝado de amaskomunikiloj sen altteksto
         setting_reduce_motion: Redukti la movecojn de la animacioj
         setting_system_font_ui: Uzi la dekomencan tiparon de la sistemo
         setting_system_scrollbars_ui: Uzu la defaŭltan rulumilon de la sistemo
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 2abefdcab6..8c582b1f26 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -3,6 +3,7 @@ es-AR:
   simple_form:
     hints:
       account:
+        attribution_domains: Uno por línea. Protege de falsas atribuciones.
         discoverable: Tu perfil y publicaciones pueden ser destacadas o recomendadas en varias áreas de Mastodon, y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu pseudónimo.
         fields: Tu sitio web, pronombres, edad, o lo que quieras.
@@ -155,6 +156,7 @@ es-AR:
         url: Adónde serán enviados los eventos
     labels:
       account:
+        attribution_domains: Sitios web autorizados a acreditarte
         discoverable: Destacar perfil y mensajes en algoritmos de descubrimiento
         fields:
           name: Nombre de campo
@@ -231,6 +233,7 @@ es-AR:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir los mensajes marcados con advertencias de contenido
         setting_hide_network: Ocultá tu gráfica social
+        setting_missing_alt_text_modal: Mostrar diálogo de confirmación antes de enviar medios sin texto alternativo
         setting_reduce_motion: Reducir el movimiento de las animaciones
         setting_system_font_ui: Utilizar la tipografía predeterminada del sistema
         setting_system_scrollbars_ui: Usar la barra de desplazamiento predeterminada del sistema operativo
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index e2f6627c96..598ed25820 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -3,6 +3,7 @@ es-MX:
   simple_form:
     hints:
       account:
+        attribution_domains: Uno por línea. Protege contra atribuciones falsas.
         discoverable: Tu perfil y las publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu apodo.
         fields: Tu página de inicio, pronombres, edad, lo que quieras.
@@ -155,6 +156,7 @@ es-MX:
         url: Donde los eventos serán enviados
     labels:
       account:
+        attribution_domains: Sitios web autorizados para acreditarte
         discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento
         fields:
           name: Etiqueta
@@ -231,6 +233,7 @@ es-MX:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
         setting_hide_network: Ocultar tu red
+        setting_missing_alt_text_modal: Mostrar cuadro de diálogo de confirmación antes de publicar contenido multimedia sin texto alternativo
         setting_reduce_motion: Reducir el movimiento de las animaciones
         setting_system_font_ui: Usar la fuente por defecto del sistema
         setting_system_scrollbars_ui: Usar la barra de desplazamiento por defecto del sistema
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 7cdbea902f..9d840abadd 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,6 +3,7 @@ es:
   simple_form:
     hints:
       account:
+        attribution_domains: Una por línea. Protege de falsas atribuciones.
         discoverable: Tu perfil y publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu apodo.
         fields: Tu carta de presentación, pronombres, edad, lo que quieras.
@@ -155,6 +156,7 @@ es:
         url: Donde los eventos serán enviados
     labels:
       account:
+        attribution_domains: Sitios web autorizados a acreditarte
         discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento
         fields:
           name: Etiqueta
@@ -231,6 +233,7 @@ es:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
         setting_hide_network: Ocultar tu red
+        setting_missing_alt_text_modal: Mostrar diálogo de confirmación antes de publicar medios sin texto alternativo
         setting_reduce_motion: Reducir el movimiento de las animaciones
         setting_system_font_ui: Utilizar la tipografía por defecto del sistema
         setting_system_scrollbars_ui: Utilizar barra de desplazamiento predeterminada del sistema
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index f6c4f14915..dfe6c0b6d7 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -3,12 +3,14 @@ eu:
   simple_form:
     hints:
       account:
+        attribution_domains: Lerroko bat. Atribuzio faltsuetatik babesten ditu.
         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.
         note: 'Beste pertsona edo #traola batzuk @aipatu ditzakezu.'
         show_collections: Pertsonek zuk jarraitzen dituzunak eta zure jarraitzaileak arakatu ahal izango dute. Jarraitzen dituzun pertsonak jarraitzen dituzula ikusi ahal izando dute, hala ere.
+        unlocked: Pertsonek zuri jarraitu ahal izango dizute onarpen-eskaerarik gabe. Desgaitu jarraipen-eskaerak berrikusi nahi badituzu eta hauek onartu edo ez erabaki nahi baduzu.
       account_alias:
         acct: Zehaztu migrazioaren jatorri den kontuaren erabiltzailea@domeinua
       account_migration:
@@ -58,6 +60,7 @@ eu:
         setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
         setting_display_media_hide_all: Ezkutatu multimedia guztia beti
         setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
+        setting_system_scrollbars_ui: Safari eta Chrome-n oinarritutako mahaigaineko nabigatzaileei bakarrik aplikatzen zaie
         setting_use_blurhash: Gradienteak ezkutatutakoaren koloreetan oinarritzen dira, baina xehetasunak ezkutatzen dituzte
         setting_use_pending_items: Ezkutatu denbora-lerroko eguneraketak klik baten atzean jarioa automatikoki korritu ordez
         username: Hizkiak, zenbakiak eta azpimarrak erabil ditzakezu
@@ -127,6 +130,11 @@ eu:
         show_application: Dena dela, beti ikusi ahal izango duzu zein aplikaziok argitaratu zuen zure bidalketa.
       tag:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
+      terms_of_service:
+        changelog: Markdown-en sintaxiarekin egitura daiteke.
+        text: Markdown-en sintaxiarekin egitura daiteke.
+      terms_of_service_generator:
+        admin_email: Legezko abisuak, kontraindikazioak, agindu judizialak, erretiratzeko eskaerak eta legea betetzeko eskaerak barne.
       user:
         chosen_languages: Markatzean, hautatutako hizkuntzetan dauden tutak besterik ez dira erakutsiko.
       user_role:
@@ -141,6 +149,7 @@ eu:
         url: Nora bidaliko diren gertaerak
     labels:
       account:
+        attribution_domains: Akreditatzeko baimendutako webguneak
         discoverable: Ezagutarazi profila eta bidalketak bilaketa algoritmoetan
         fields:
           name: Etiketa
@@ -240,11 +249,13 @@ eu:
           warn: Ezkutatu ohar batekin
       form_admin_settings:
         activity_api_enabled: Argitaratu erabiltzaile-jardueraren guztizko estatistikak APIan
+        app_icon: Aplikazio ikonoa
         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: Urruneko edukiaren atxikipen-aldia
         custom_css: CSS pertsonalizatua
+        favicon: Gune-ikurra
         mascot: Maskota pertsonalizatua (zaharkitua)
         media_cache_retention_period: Multimediaren cachea atxikitzeko epea
         peers_api_enabled: Argitaratu aurkitutako zerbitzarien zerrenda APIan
@@ -309,6 +320,12 @@ eu:
         listable: Baimendu traola hau bilaketetan agertzea eta profilen direktorioan
         name: Traola
         trendable: Baimendu traola hau joeretan agertzea
+        usable: Baimendu bidalketek traola lokal hau erabiltzea
+      terms_of_service:
+        changelog: Zer aldatu da?
+        text: Zerbitzuaren baldintzak
+      terms_of_service_generator:
+        domain: Domeinua
       user:
         role: Rola
         time_zone: Ordu zona
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 7aaa146f31..c3cf3692be 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -3,6 +3,7 @@ fa:
   simple_form:
     hints:
       account:
+        attribution_domains: در هر خط، یک مورد. از ویژگی های نادرست محافظت می کند.
         discoverable: ممکن است نمایه و فرسته‌های عمومیتان در جاهای مختلف ماستودون نمایانده و توصیه شود و نمایه‌تان به دیگر کاربران پیشنهاد شود.
         display_name: نام کامل یا باحالتان.
         fields: صفحهٔ خانگی، تلفّظ، سن و هرچیزی که دوست دارید.
@@ -155,6 +156,7 @@ fa:
         url: جایی که رویدادها فرستاده می‌شوند
     labels:
       account:
+        attribution_domains: وب‌سایت‌هایی که اجازه دارند به شما اعتبار بدهند
         discoverable: مشخص کردن مشخصات و فرسته‌ها در الگوریتم‌های اکتشاف
         fields:
           name: برچسب
@@ -243,7 +245,7 @@ fa:
         sign_in_token_attempt: کد امنیتی
         title: عنوان
         type: نوع درون‌ریزی
-        username: نام کاربری (لاتین)
+        username: نام کاربری
         username_or_email: نام کاربری یا ایمیل
         whole_word: تطابق واژهٔ کامل
       email_domain_block:
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 1103232f4e..83b32636dc 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -3,6 +3,7 @@ fi:
   simple_form:
     hints:
       account:
+        attribution_domains: Yksi riviä kohti. Suojaa vääriltä tekijän nimeämisiltä.
         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: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
@@ -155,6 +156,7 @@ fi:
         url: Mihin tapahtumat lähetetään
     labels:
       account:
+        attribution_domains: Verkkosivustot, jotka voivat antaa sinulle tunnustusta
         discoverable: Pidä profiiliasi ja julkaisujasi esillä löytämisalgoritmeissa
         fields:
           name: Nimike
@@ -231,6 +233,7 @@ fi:
         setting_display_media_show_all: Näytä kaikki
         setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt julkaisut
         setting_hide_network: Piilota verkostotietosi
+        setting_missing_alt_text_modal: Näytä vahvistusikkuna ennen kuin julkaistaan mediaa ilman vaihtoehtoista tekstiä
         setting_reduce_motion: Vähennä animaatioiden liikettä
         setting_system_font_ui: Käytä järjestelmän oletusfonttia
         setting_system_scrollbars_ui: Käytä järjestelmän oletusarvoista vierityspalkkia
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index a3b7a56729..aaa1cbdeee 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -3,6 +3,7 @@ fo:
   simple_form:
     hints:
       account:
+        attribution_domains: Eitt á hvørja reglu. Tað verjir fyri skeivum tilsipingum.
         discoverable: Tínir almennu postar og tín vangi kunnu vera drigin fram og viðmæld ymsa staðni í Mastodon og vangin hjá tær kann vera viðmæltur øðrum brúkarum.
         display_name: Títt fulla navn og títt stuttliga navn.
         fields: Heimasíðan hjá tær, fornøvn, aldur ella hvat tú vil.
@@ -155,6 +156,7 @@ fo:
         url: Hvar hendingar verða sendar til
     labels:
       account:
+        attribution_domains: Heimasíður, sum hava loyvi at sipa til tín
         discoverable: Framheva vanga og postar í uppdagingar-algoritmum
         fields:
           name: Spjaldur
@@ -231,6 +233,7 @@ fo:
         setting_display_media_show_all: Vís alt
         setting_expand_spoilers: Víðka altíð postar, sum eru merktir við innihaldsávaringum
         setting_hide_network: Fjal sosiala grafin hjá tær
+        setting_missing_alt_text_modal: Spyr um góðkenning áðrenn miðlar uttan alternativan tekst verða postaðir
         setting_reduce_motion: Minka um rørslu í teknimyndum
         setting_system_font_ui: Brúka vanliga skriftaslagið hjá skipanini
         setting_system_scrollbars_ui: Brúka vanliga skrullibjálkan hjá skipanini
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 01893eefc9..5cd87c1235 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -3,6 +3,7 @@ fr-CA:
   simple_form:
     hints:
       account:
+        attribution_domains: Un par ligne. Protège contre les fausses attributions.
         discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
         display_name: Votre nom complet ou votre nom cool.
         fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez.
@@ -155,6 +156,7 @@ fr-CA:
         url: Là où les événements seront envoyés
     labels:
       account:
+        attribution_domains: Sites web autorisés à vous citer
         discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
         fields:
           name: Étiquette
@@ -231,6 +233,7 @@ fr-CA:
         setting_display_media_show_all: Montrer tout
         setting_expand_spoilers: Toujours déplier les messages marqués d’un avertissement de contenu
         setting_hide_network: Cacher votre réseau
+        setting_missing_alt_text_modal: Afficher une fenêtre de confirmation avant de poster un média sans texte alternatif
         setting_reduce_motion: Réduire la vitesse des animations
         setting_system_font_ui: Utiliser la police par défaut du système
         setting_system_scrollbars_ui: Utiliser la barre de défilement par défaut du système
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 9332c5d606..9572bbf440 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -3,6 +3,7 @@ fr:
   simple_form:
     hints:
       account:
+        attribution_domains: Un par ligne. Protège contre les fausses attributions.
         discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
         display_name: Votre nom complet ou votre nom rigolo.
         fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez.
@@ -155,6 +156,7 @@ fr:
         url: Là où les événements seront envoyés
     labels:
       account:
+        attribution_domains: Sites web autorisés à vous citer
         discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
         fields:
           name: Étiquette
@@ -231,6 +233,7 @@ fr:
         setting_display_media_show_all: Montrer tout
         setting_expand_spoilers: Toujours déplier les messages marqués d’un avertissement de contenu
         setting_hide_network: Cacher votre réseau
+        setting_missing_alt_text_modal: Afficher une fenêtre de confirmation avant de poster un média sans texte alternatif
         setting_reduce_motion: Réduire la vitesse des animations
         setting_system_font_ui: Utiliser la police par défaut du système
         setting_system_scrollbars_ui: Utiliser la barre de défilement par défaut du système
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 52ef178aec..ffe2f49ef4 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -3,6 +3,7 @@ fy:
   simple_form:
     hints:
       account:
+        attribution_domains: Ien per rigel. Beskermet tsjin falske attribúsjes.
         discoverable: Jo iepenbiere berjochten kinne útljochte wurde op ferskate plakken binnen Mastodon en jo account kin oanrekommandearre wurde oan oare brûkers.
         display_name: Jo folsleine namme of in aardige bynamme.
         fields: Jo website, persoanlike foarnammewurden, leeftiid, alles wat jo mar kwyt wolle.
@@ -155,6 +156,7 @@ fy:
         url: Wêr’t eveneminten nei ta stjoerd wurde
     labels:
       account:
+        attribution_domains: Websites dy’t jo wurdearring jaan meie
         discoverable: Profyl en bydragen yn sykalgoritmen opnimme litte
         fields:
           name: Label
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 93eff4a89d..93a1090cf8 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -3,6 +3,7 @@ ga:
   simple_form:
     hints:
       account:
+        attribution_domains: Ceann in aghaidh an líne. Cosnaíonn sé ó sannadh bréagach.
         discoverable: Seans go mbeidh do phostálacha poiblí agus do phróifíl le feiceáil nó molta i réimsí éagsúla de Mastodon agus is féidir do phróifíl a mholadh d’úsáideoirí eile.
         display_name: D'ainm iomlán nó d'ainm spraoi.
         fields: Do leathanach baile, forainmneacha, aois, rud ar bith is mian leat.
@@ -155,6 +156,7 @@ ga:
         url: An áit a seolfar imeachtaí chuig
     labels:
       account:
+        attribution_domains: Tá cead ag suíomhanna Gréasáin creidmheas a thabhairt duit
         discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana
         fields:
           name: Lipéad
@@ -231,6 +233,7 @@ ga:
         setting_display_media_show_all: Taispeáin uile
         setting_expand_spoilers: Méadaigh postálacha atá marcáilte le rabhaidh inneachair i gcónaí
         setting_hide_network: Folaigh do ghraf sóisialta
+        setting_missing_alt_text_modal: Taispeáin dialóg deimhnithe sula bpostálann tú meán gan alt téacs
         setting_reduce_motion: Laghdú ar an tairiscint i beochan
         setting_system_font_ui: Úsáid cló réamhshocraithe an chórais
         setting_system_scrollbars_ui: Bain úsáid as scrollbharra réamhshocraithe an chórais
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index ec7786f509..1c3fa2278d 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -3,6 +3,7 @@ gl:
   simple_form:
     hints:
       account:
+        attribution_domains: Un por liña. Como protección para falsas atribucións.
         discoverable: As túas publicacións públicas e perfil poden mostrarse ou recomendarse en varias zonas de Mastodon e o teu perfil ser suxerido a outras usuarias.
         display_name: O teu nome completo ou un nome divertido.
         fields: Páxina web, pronome, idade, o que ti queiras.
@@ -155,6 +156,7 @@ gl:
         url: A onde se enviarán os eventos
     labels:
       account:
+        attribution_domains: Sitios web que dan fe sobre ti
         discoverable: Perfil destacado e publicacións nos algoritmos de descubrimento
         fields:
           name: Etiqueta
@@ -231,6 +233,7 @@ gl:
         setting_display_media_show_all: Mostrar todo
         setting_expand_spoilers: Despregar sempre as publicacións marcadas con avisos de contido
         setting_hide_network: Non mostrar contactos
+        setting_missing_alt_text_modal: Mostrar mensaxe de confirmación antes de publicar multimedia sen texto descritivo
         setting_reduce_motion: Reducir o movemento nas animacións
         setting_system_font_ui: Utilizar a tipografía por defecto do sistema
         setting_system_scrollbars_ui: Usar barras de desprazamento predeterminadas no sistema
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 2699f5e962..6bf767adb3 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -3,6 +3,7 @@ he:
   simple_form:
     hints:
       account:
+        attribution_domains: אחד בכל שורה. יגן מפני יחוסים מטעים.
         discoverable: הפוסטים והפרופיל שלך עשויים להיות מוצגים או מומלצים באזורים שונים באתר וייתכן שהפרופיל שלך יוצע למשתמשים אחרים.
         display_name: שמך המלא או שם הכיף שלך.
         fields: עמוד הבית שלך, לשון הפנייה, גיל, וכל מידע אחר לפי העדפתך האישית.
@@ -155,6 +156,7 @@ he:
         url: היעד שאליו יישלחו אירועים
     labels:
       account:
+        attribution_domains: אתרים המורשים לייחס אליך מאמרים
         discoverable: הצג משתמש ופוסטים בעמוד התגליות
         fields:
           name: תווית
@@ -231,6 +233,7 @@ he:
         setting_display_media_show_all: להציג הכול
         setting_expand_spoilers: להרחיב תמיד הודעות מסומנות באזהרת תוכן
         setting_hide_network: להחביא את הגרף החברתי שלך
+        setting_missing_alt_text_modal: הצג כרטיס אישור לפני פרסום קובץ גרפי ללא תיאור מילולי
         setting_reduce_motion: הפחתת תנועה בהנפשות
         setting_system_font_ui: להשתמש בגופן ברירת המחדל של המערכת
         setting_system_scrollbars_ui: להשתמש בפס הגלילה שהוא ברירת המחדל של המערכת
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index cc9fa61abf..1b236b9356 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -3,6 +3,7 @@ hu:
   simple_form:
     hints:
       account:
+        attribution_domains: Soronként egy. Megvéd a hamis forrásmegjelölésektől.
         discoverable: A nyilvános bejegyzéseid és a profilod kiemelhető vagy ajánlható a Mastodon különböző területein, a profilod más felhasználóknak is javasolható.
         display_name: Teljes neved vagy vicces neved.
         fields: Weboldalad, megszólításaid, korod, bármi, amit szeretnél.
@@ -152,6 +153,7 @@ hu:
         url: Ahová az eseményket küldjük
     labels:
       account:
+        attribution_domains: Weboldalak, melyek szerzőként tüntethetnek fel
         discoverable: Profil és bejegyzések szerepeltetése a felfedezési algoritmusokban
         fields:
           name: Címke
@@ -228,6 +230,7 @@ hu:
         setting_display_media_show_all: Mindent mutat
         setting_expand_spoilers: Tartalmi figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
         setting_hide_network: Hálózatod elrejtése
+        setting_missing_alt_text_modal: Megerősítési párbeszédablak megjelenítése a helyettesítő szöveg nélküli média közzététele előtt
         setting_reduce_motion: Animációk mozgásának csökkentése
         setting_system_font_ui: Rendszer betűtípusának használata
         setting_system_scrollbars_ui: Rendszer alapértelmezett görgetősávjának használata
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index bcab4f9d80..2f9ed5eacc 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -3,6 +3,7 @@ ia:
   simple_form:
     hints:
       account:
+        attribution_domains: Un per linea. Protege contra false attributiones.
         discoverable: Tu messages public e tu profilo pote esser mittite in evidentia 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, tote lo que tu vole.
@@ -45,30 +46,30 @@ ia:
         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 o JPG. Al maximo %{size}. Sera reducite a %{dimensions}px
+        email: Tu recipera un e-mail de confirmation
+        header: WEBP, PNG, GIF o JPG. Al maximo %{size}. Essera reducite 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
+        irreversible: Le messages filtrate disparera irreversibilemente, mesmo si le filtro es removite plus tarde
         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.
+        phrase: Se applicara independentemente de majusculas/minusculas in le texto o del aviso de contento de un message
+        scopes: Le APIs al quales le application habera accesso. Si tu selige un ambito de nivello superior, non es necessari seliger ambitos individual.
         setting_aggregate_reblogs: Non monstrar nove impulsos pro messages que ha essite recentemente impulsate (affecta solmente le impulsos novemente recipite)
-        setting_always_send_emails: Normalmente le avisos de email non sera inviate quando tu activemente usa Mastodon
+        setting_always_send_emails: Normalmente, le notificationes de e-mail non es 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_display_media_hide_all: Sempre celar contento multimedial
+        setting_display_media_show_all: Sempre monstrar contento multimedial
         setting_system_scrollbars_ui: Se applica solmente al navigatores de scriptorio basate sur Safari e Chrome
         setting_use_blurhash: Le imagines degradate se basa sur le colores del visuales celate, ma illos offusca tote le detalios
         setting_use_pending_items: Requirer un clic pro monstrar nove messages in vice de rolar automaticamente 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
+        whole_word: Quando le parola-clave o phrase es alphanumeric, illo essera solmente applicate si illo corresponde a tote le parola
       domain_allow:
         domain: Iste dominio potera extraher datos de iste servitor e le datos entrante de illo essera 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
+        domain: Isto pote esser le nomine de dominio que apparera in le adresse de e-mail o le registro MX que illo usa. Illos essera verificate durante le inscription.
+        with_dns_records: Un tentativa de resolver le registros DNS del dominio date essera facite e le resultatos essera equalmente blocate
       featured_tag:
         name: 'Ecce alcun del hashtags que tu usava le plus recentemente:'
       filters:
@@ -79,16 +80,16 @@ ia:
       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.
+        backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Si iste option es definite a un valor positive, iste archivos essera automaticamente delite de tu immagazinage post le numero specificate de dies.
+        bootstrap_timeline_accounts: Iste contos essera fixate al initio del recommendationes de sequimento de nove usatores.
         closed_registrations_message: Monstrate quando le inscriptiones es claudite
         content_cache_retention_period: Tote le messages de altere servitores (includite impulsos e responsas) essera delite post le numero de dies specificate, independentemente de tote interaction de usatores local con ille messages. Isto include le messages addite al marcapaginas o marcate como favorite per un usator local. Le mentiones private inter usatores de differente instantias tamben essera irrecuperabilemente perdite. Le uso de iste parametro es intendite pro instantias con scopos specific e viola multe expectationes de usatores si es 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.
+        media_cache_retention_period: Le files multimedial de messages producite per usatores distante se immagazina in cache sur tu servitor. Quando iste option es definite a un valor positive, tal files essera delite post le numero specificate de dies. Si alcuno requesta le datos multimedial post lor deletion, illos essera re-discargate si le contento original es ancora disponibile. Debite a limitationes sur le frequentia con que le cartas de previsualisation de ligamines se connecte al sitos de tertios, il es recommendate definir iste valor a al minus 14 dies, alteremente le previsualisationes de ligamines non essera actualisate sur demanda ante ille tempore.
+        peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Iste datos non indica si tu es in federation con un servitor date, ma solmente que tu servitor lo cognosce. Isto es usate per servicios que collige statisticas general sur le federation.
+        profile_directory: Le directorio de profilos lista tote le usatores que ha optate pro esser discoperibile.
         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.
@@ -99,7 +100,7 @@ ia:
         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 de circa 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.
+        timeline_preview: Le visitatores foras de session potera percurrer le messages public le plus recente 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.
@@ -115,7 +116,7 @@ ia:
         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_block: Nove inscriptiones non essera possibile
           sign_up_requires_approval: Nove inscriptiones requirera tu approbation
         severity: Seliger que evenira con requestas ab iste IP
       rule:
@@ -139,9 +140,9 @@ ia:
         dmca_address: Pro operatores in le SUA, usa le adresse registrate in le Directorio de Agentes Designate pro le DMCA (DMCA Designated Agent Directory). Un adresse de cassa postal es disponibile per requesta directe; usa le Requesta de Exemption de Cassa Postal pro Agentes Designate del DMCA (DMCA Designated Agent Post Office Box Waiver Request) pro inviar un message electronic al Officio del Derecto de Autor (Copyright Office) e describer que tu es un moderator de contento que travalia de casa e qui time vengiantias o represalias pro tu actiones, necessitante le uso un cassa postal pro remover tu adresse personal del vista public.
         dmca_email: Pote esser le mesme adresse de e-mail usate pro “Adresse de e-mail pro avisos juridic” supra
         domain: Identification unic del servicio in linea que tu forni.
-        jurisdiction: Vermeldt het land waar de persoon woont die de rekeningen betaalt. Als het een bedrijf of een andere entiteit is, vermeldt het land waar het is opgenomen en de stad, regio, grondgebied of staat, voor zover van toepassing.
+        jurisdiction: Indica le pais ubi vive le persona qui paga le facturas. Si se tracta de un interprisa o altere organisation, indica le pais ubi illo es incorporate, e le citate, region, territorio o stato del maniera appropriate pro le pais.
       user:
-        chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
+        chosen_languages: Si marcate, solmente le messages in le linguas seligite apparera in chronologias public
         role: Le rolo controla qual permissos le usator ha.
       user_role:
         color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
@@ -152,9 +153,10 @@ ia:
       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
+        url: A ubi le eventos essera inviate
     labels:
       account:
+        attribution_domains: Sitos web autorisate a accreditar te
         discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
         fields:
           name: Etiquetta
@@ -231,6 +233,7 @@ ia:
         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_missing_alt_text_modal: Monstrar un dialogo de confirmation ante de publicar multimedia sin texto alternative
         setting_reduce_motion: Reducer movimento in animationes
         setting_system_font_ui: Usar typo de litteras predefinite del systema
         setting_system_scrollbars_ui: Usar le barra de rolamento predefinite del systema
@@ -270,7 +273,7 @@ ia:
         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
+        show_domain_blocks_rationale: Monstrar proque le dominios ha essite blocate
         site_contact_email: Adresse de e-mail de contacto
         site_contact_username: Nomine de usator de contacto
         site_extended_description: Description extense
@@ -286,8 +289,8 @@ ia:
         trends_as_landing_page: Usar tendentias como pagina de destination
       interactions:
         must_be_follower: Blocar notificationes de personas qui non te seque
-        must_be_following: Blocar notificationes de gente que tu non sequer
-        must_be_following_dm: Blocar messages directe de gente que tu non seque
+        must_be_following: Blocar notificationes de personas que tu non seque
+        must_be_following_dm: Blocar messages directe de personas que tu non seque
       invite:
         comment: Commento
       invite_request:
@@ -301,12 +304,12 @@ ia:
           sign_up_requires_approval: Limitar inscriptiones
         severity: Regula
       notification_emails:
-        appeal: Alcuno appella un decision de moderator
+        appeal: Alcuno appella contra 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
+        favourite: Alcuno ha appreciate tu message
+        follow: Alcuno ha comenciate a sequer te
+        follow_request: Alcuno ha demandate de sequer te
+        mention: Alcuno te ha mentionate
         pending_account: Nove conto besonia de revision
         reblog: Alcuno ha impulsate tu message
         report: Un nove reporto es inviate
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index f0232602bb..ad755e5bb9 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -3,6 +3,7 @@ is:
   simple_form:
     hints:
       account:
+        attribution_domains: Eitt á hverja línu. Ver fyrir röngum tilvísunum.
         discoverable: Opinberar færslur og notandasnið þitt geta birst eða verið mælt með á hinum ýmsu svæðum í Mastodon auk þess sem hægt er að mæla með þér við aðra notendur.
         display_name: Fullt nafn þitt eða eitthvað til gamans.
         fields: Heimasíðan þín, fornöfn, aldur eða eitthvað sem þú vilt koma á framfæri.
@@ -155,6 +156,7 @@ is:
         url: Hvert atburðir verða sendir
     labels:
       account:
+        attribution_domains: Vefsvæði sem mega vitna í þig
         discoverable: Hafa notandasnið og færslur með í reikniritum leitar
         fields:
           name: Skýring
@@ -231,6 +233,7 @@ is:
         setting_display_media_show_all: Birta allt
         setting_expand_spoilers: Alltaf útfella færslur sem eru með aðvörun vegna efnisins
         setting_hide_network: Fela félagsnetið þitt
+        setting_missing_alt_text_modal: Birta staðfestingarglugga áður en myndefni án ALT-hjálpartexta er birt
         setting_reduce_motion: Minnka hreyfingu í hreyfimyndum
         setting_system_font_ui: Nota sjálfgefið letur kerfisins
         setting_system_scrollbars_ui: Nota sjálfgefna skrunstiku kerfisins
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f0448bba4b..96f7881012 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -3,6 +3,7 @@ it:
   simple_form:
     hints:
       account:
+        attribution_domains: Uno per riga. Protegge da false attribuzioni.
         discoverable: I tuoi post pubblici e il tuo profilo potrebbero essere presenti o consigliati in varie aree di Mastodon e il tuo profilo potrebbe essere suggerito ad altri utenti.
         display_name: Il tuo nome completo o il tuo soprannome.
         fields: La tua homepage, i pronomi, l'età, tutto quello che vuoi.
@@ -155,6 +156,7 @@ it:
         url: Dove gli eventi saranno inviati
     labels:
       account:
+        attribution_domains: Siti web autorizzati ad accreditarti
         discoverable: Include il profilo e i post negli algoritmi di scoperta
         fields:
           name: Etichetta
@@ -231,6 +233,7 @@ it:
         setting_display_media_show_all: Mostra tutti
         setting_expand_spoilers: Espandi sempre post con content warning
         setting_hide_network: Nascondi la tua rete
+        setting_missing_alt_text_modal: Chiedi di confermare prima di pubblicare media senza testo alternativo
         setting_reduce_motion: Riduci movimento nelle animazioni
         setting_system_font_ui: Usa il carattere predefinito del sistema
         setting_system_scrollbars_ui: Utilizza la barra di scorrimento predefinita del sistema
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index d40ca7ebf8..9d0b55c9bc 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -3,6 +3,7 @@ ko:
   simple_form:
     hints:
       account:
+        attribution_domains: 한 줄에 하나씩. 가짜 기여로부터 보호합니다.
         discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다
         display_name: 진짜 이름 또는 재미난 이름.
         fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들.
@@ -133,8 +134,12 @@ ko:
         changelog: 마크다운 문법을 사용할 수 있습니다.
         text: 마크다운 문법을 사용할 수 있습니다.
       terms_of_service_generator:
+        admin_email: 법적 고지에는 이의 제기, 법원 명령, 게시 중단 요청, 법 집행 요청이 포함됩니다.
+        arbitration_address: 위의 실제 주소와 같을 수 있으며, 이메일을 사용한다면 "N/A"로 두세요
         arbitration_website: 웹 형태를 사용할 수 있습니다. 이메일을 사용한다면 "N/A"로 둘 수 있습니다
         dmca_email: 상단의 "법적 통지를 위한 이메일 주소"와 같은 주소를 사용할 수 있습니다
+        domain: 귀하가 제공하는 온라인 서비스의 고유 식별정보입니다.
+        jurisdiction: 요금을 지불하는 사람이 거주하는 국가를 기재하세요. 회사나 기타 법인인 경우 해당 법인이 설립된 국가와 도시, 지역, 영토 또는 주를 적절히 기재하세요.
       user:
         chosen_languages: 체크하면, 선택 된 언어로 작성된 게시물들만 공개 타임라인에 보여집니다
         role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다.
@@ -150,6 +155,7 @@ ko:
         url: 이벤트가 어디로 전송될 지
     labels:
       account:
+        attribution_domains: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들
         discoverable: 발견하기 알고리즘에 프로필과 게시물을 추천하기
         fields:
           name: 라벨
@@ -213,11 +219,11 @@ ko:
         setting_aggregate_reblogs: 타임라인의 부스트를 그룹화
         setting_always_send_emails: 항상 이메일 알림 보내기
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
-        setting_boost_modal: 부스트 전 확인 창을 표시
+        setting_boost_modal: 부스트 전 확인창을 띄웁니다
         setting_default_language: 게시물 언어
         setting_default_privacy: 게시물 프라이버시
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
-        setting_delete_modal: 게시물 삭제 전 확인 창을 표시
+        setting_delete_modal: 게시물 삭제 전 확인창을 띄웁니다
         setting_disable_hover_cards: 호버시 프로필 미리보기를 비활성화
         setting_disable_swiping: 스와이프 모션 비활성화
         setting_display_media: 미디어 표시
@@ -226,6 +232,7 @@ ko:
         setting_display_media_show_all: 모두 보이기
         setting_expand_spoilers: 내용 경고로 표시된 게시물을 항상 펼치기
         setting_hide_network: 내 인맥 숨기기
+        setting_missing_alt_text_modal: 대체 텍스트 없이 미디어를 게시하려고 할 때 확인창을 띄웁니다
         setting_reduce_motion: 애니메이션 줄이기
         setting_system_font_ui: 시스템의 기본 글꼴을 사용
         setting_system_scrollbars_ui: 시스템 기본 스크롤바 사용
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index c7aaeab906..454179d0bd 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -3,6 +3,7 @@ lt:
   simple_form:
     hints:
       account:
+        attribution_domains: Po vieną eilutėje. Apsaugo nuo klaidingų atributų.
         discoverable: Tavo vieši įrašai ir profilis gali būti rodomi arba rekomenduojami įvairiose Mastodon vietose, o profilis gali būti siūlomas kitiems naudotojams.
         display_name: Tavo pilnas vardas arba smagus vardas.
         fields: Tavo pagrindinis puslapis, įvardžiai, amžius, bet kas, ko tik nori.
@@ -118,6 +119,7 @@ lt:
         role: Vaidmuo valdo, kokius leidimus naudotojas turi.
     labels:
       account:
+        attribution_domains: Svetainės, kuriuose leidžiama jus įvardyti
         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
@@ -158,6 +160,7 @@ lt:
         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_missing_alt_text_modal: Rodyti patvirtinimo dialogo langą prieš skelbiant mediją be alternatyvaus teksto.
         setting_reduce_motion: Sumažinti judėjimą animacijose
         setting_system_font_ui: Naudoti numatytąjį sistemos šriftą
         setting_system_scrollbars_ui: Naudoti numatytąją sistemos slankjuostę
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 771dc3d6ed..7079b25c6b 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -233,6 +233,7 @@ nl:
         setting_display_media_show_all: Alles tonen
         setting_expand_spoilers: Berichten met inhoudswaarschuwingen altijd uitklappen
         setting_hide_network: Jouw volgers en wie je volgt verbergen
+        setting_missing_alt_text_modal: Bevestigingsvenster tonen voor het plaatsen van media zonder alt-tekst
         setting_reduce_motion: Beweging in animaties verminderen
         setting_system_font_ui: Standaardlettertype van het systeem gebruiken
         setting_system_scrollbars_ui: Standaard scrollbalk van het systeem gebruiken
@@ -281,7 +282,7 @@ nl:
         site_title: Servernaam
         status_page_url: URL van statuspagina
         theme: Standaardthema
-        thumbnail: Serverthumbnail
+        thumbnail: Server-miniatuur
         timeline_preview: Toegang tot de openbare tijdlijnen zonder in te loggen toestaan
         trendable_by_default: Trends goedkeuren zonder voorafgaande beoordeling
         trends: Trends inschakelen
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index b9e30c565d..b42fdc86f5 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -231,6 +231,7 @@ nn:
         setting_display_media_show_all: Vis alle
         setting_expand_spoilers: Vid alltid ut tut som er merka med innhaldsåtvaringar
         setting_hide_network: Gøym nettverket ditt
+        setting_missing_alt_text_modal: Vis stadfestingsdialog før du legg ut media utan alt-tekst
         setting_reduce_motion: Minsk rørsle i animasjonar
         setting_system_font_ui: Bruk standardskrifttypen på systemet
         setting_system_scrollbars_ui: Bruk standardrullefeltet til systemet
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index d7f3829af2..74dc8218a9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -3,6 +3,7 @@ pl:
   simple_form:
     hints:
       account:
+        attribution_domains: Jedna na linię.
         discoverable: Twój profil i publiczne wpisy mogą być promowane lub polecane na Mastodonie i twój profil może być sugerowany innym użytkownikom.
         display_name: Twoje imię lub pseudonim.
         fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek…
@@ -129,6 +130,17 @@ pl:
         show_application: Ty zawsze widzisz program użyty do zamieszczenia.
       tag:
         name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
+      terms_of_service:
+        changelog: Może być stworzony przy pomocy składni Markdown.
+        text: Może być stworzony przy pomocy składni Markdown.
+      terms_of_service_generator:
+        admin_email: Zawiadomienia prawne obejmują środki zapobiegawcze, nakazy sądowe, wnioski o popełnienie sprawy oraz wnioski organów ścigania.
+        arbitration_address: Może być taki sam jak adres fizyczny powyżej lub „N/A” jeśli używasz adresu e-mail
+        arbitration_website: Może być formularzem internetowym lub „N/A”, jeśli używasz adresu e-mail
+        dmca_address: W przypadku operatorów z USA należy użyć adresu zarejestrowanego w DMCA Designated Agent Directory. Lista skrytek pocztowych dostępna jest na bezpośrednią prośbę użytkownika. Użyj DMCA Agent Post Office Box Waiver Request, aby wysłać email do Copyright Office z informacją, że jesteś domowym administratorm treści i z powodu obawy o zemstę lub odwetu za swoje działania, musisz użyć skrytki pocztowej, żeby usunąć swój adres domowy z dostępu publicznego.
+        dmca_email: Adres email może być taki sam jak wcześniejszy "adres e-mail przeznaczony do celów prawnych"
+        domain: Unikalny numer identyfikacji świadczonej przez Ciebie usługi online.
+        jurisdiction: Wymień państwo, w którym mieszkają osoby płacące rachunki. Jeżeli jest to spółka lub inny zarejestrowany podmiot, w zależności od przypadku podaj państwo, w którym jest zarejestrowany, a także miasto, region czy województwo.
       user:
         chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
         role: Rola kontroluje uprawnienia użytkownika.
@@ -144,6 +156,7 @@ pl:
         url: Dokąd będą wysłane zdarzenia
     labels:
       account:
+        attribution_domains: Strony które mogą ci przypisywać autorstwo
         discoverable: Udostępniaj profil i wpisy funkcjom odkrywania
         fields:
           name: Nazwa
@@ -220,6 +233,7 @@ pl:
         setting_display_media_show_all: Pokaż wszystko
         setting_expand_spoilers: Zawsze rozwijaj wpisy oznaczone ostrzeżeniem o zawartości
         setting_hide_network: Ukryj swoją sieć
+        setting_missing_alt_text_modal: Pokaż okno potwierdzenia przed opublikowaniem materiałów bez pomocniczego opisu obrazów
         setting_reduce_motion: Ogranicz ruch w animacjach
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         setting_system_scrollbars_ui: Używaj domyślnego paska przewijania systemu
@@ -321,6 +335,11 @@ pl:
         changelog: Co się zmieniło?
         text: Warunki korzystania z usługi
       terms_of_service_generator:
+        admin_email: Adres e-mail przeznaczony do celów prawnych
+        arbitration_address: Adres fizyczny powiadomień arbitrażowych
+        arbitration_website: Strona internetowa do składania zgłoszeń arbitrażowych
+        dmca_address: Adres fizyczny dla zgłoszeń naruszenia DMCA/praw autorskich
+        dmca_email: Adres e-mail dla zgłoszeń naruszenia DMCA/praw autorskich
         domain: Domena
         jurisdiction: Jurysdykcja
       user:
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index ba41612042..74edba7cda 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -3,6 +3,7 @@ pt-PT:
   simple_form:
     hints:
       account:
+        attribution_domains: Um por linha. Protege contra falsas atribuições.
         discoverable: As suas publicações e perfil públicos podem ser destacados ou recomendados em várias áreas do Mastodon e o seu perfil pode ser sugerido a outros utilizadores.
         display_name: O seu nome completo ou o seu nome divertido.
         fields: A sua página inicial, os seus pronomes, idade e tudo o que quiser.
@@ -62,7 +63,7 @@ pt-PT:
         setting_system_scrollbars_ui: Aplica-se apenas a navegadores de desktop baseados no Safari e Chrome
         setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
         setting_use_pending_items: Ocultar as atualizações da cronologia após um clique em vez de percorrer automaticamente a cronologia
-        username: Pode utilizar letras, números e traços inferiores (_)
+        username: Podes utilizar letras, números e traços inferiores (_)
         whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
       domain_allow:
         domain: Este domínio será capaz de obter dados desta instância e os dados dele recebidos serão processados e armazenados
@@ -155,6 +156,7 @@ pt-PT:
         url: Para onde os eventos serão enviados
     labels:
       account:
+        attribution_domains: Websites autorizados a atribuir-lhe crédito
         discoverable: Destacar perfil e publicações nos algoritmos de descoberta
         fields:
           name: Rótulo
@@ -231,6 +233,7 @@ pt-PT:
         setting_display_media_show_all: Mostrar todos
         setting_expand_spoilers: Expandir sempre as publicações marcadas com avisos de conteúdo
         setting_hide_network: Esconder a tua rede
+        setting_missing_alt_text_modal: Mostrar janela de confirmação antes de publicar multimédia sem texto alternativo
         setting_reduce_motion: Reduzir movimento em animações
         setting_system_font_ui: Usar o tipo de letra padrão do sistema
         setting_system_scrollbars_ui: Utilizar a barra de deslocação predefinida do sistema
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 64db162ea6..e8a83f06d7 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -3,6 +3,7 @@ ru:
   simple_form:
     hints:
       account:
+        attribution_domains: По одному на строку. Защищает от ложных атрибуций.
         discoverable: Ваши публичные сообщения и профиль могут быть показаны или рекомендованы в различных разделах Mastodon, и ваш профиль может быть предложен другим пользователям.
         display_name: Ваше полное имя или псевдоним.
         fields: Ваша домашняя страница, местоимения, возраст - все, что угодно.
@@ -155,6 +156,7 @@ ru:
         url: Куда события будут отправляться
     labels:
       account:
+        attribution_domains: Веб-сайты, которым разрешено ссылаться на вас
         discoverable: Профиль и сообщения в алгоритмах обнаружения
         fields:
           name: Пункт
@@ -231,6 +233,7 @@ ru:
         setting_display_media_show_all: Показывать все
         setting_expand_spoilers: Всегда раскрывать посты, имеющие предупреждение о содержании
         setting_hide_network: Скрыть свои связи
+        setting_missing_alt_text_modal: Всегда спрашивать перед публикацией медиафайлов без альтернативного текста
         setting_reduce_motion: Уменьшить движение в анимации
         setting_system_font_ui: Использовать шрифт системы по умолчанию
         setting_system_scrollbars_ui: Использовать системные полосы прокрутки
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 7389512896..fb5e510e70 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -3,6 +3,7 @@ sq:
   simple_form:
     hints:
       account:
+        attribution_domains: Një për rresht. Kjo mbron nga atribuime të rreme.
         discoverable: Postimet dhe profili juaj publik mund të shfaqen, ose rekomandohen në zona të ndryshme të Mastodon-it dhe profili juaj mund të sugjerohet përdoruesve të tjerë.
         display_name: Emri juaj i plotë, ose emri juaj lojcak.
         fields: Faqja juaj hyrëse, përemra, moshë, ç’të keni qejf.
@@ -154,6 +155,7 @@ sq:
         url: Ku do të dërgohen aktet
     labels:
       account:
+        attribution_domains: Sajte të lejuar t’ju japin hakë
         discoverable: Profilin dhe postimet bëji objekt të algoritmeve të zbulimit
         fields:
           name: Etiketë
@@ -230,6 +232,7 @@ sq:
         setting_display_media_show_all: Shfaqi krejt
         setting_expand_spoilers: Mesazhet me sinjalizime mbi lëndën, zgjeroji përherë
         setting_hide_network: Fshiheni rrjetin tuaj
+        setting_missing_alt_text_modal: Shfaq dialog ripohimi, para postimi mediash pa tekst alternativ
         setting_reduce_motion: Zvogëlo lëvizjen në animacione
         setting_system_font_ui: Përdor shkronja parazgjedhje të sistemit
         setting_system_scrollbars_ui: Përdor shtyllë rrëshqitjesh parazgjedhje të sistemit
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 7c7c08380b..a3be7ae5e3 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -233,6 +233,7 @@ tr:
         setting_display_media_show_all: Tümünü göster
         setting_expand_spoilers: İçerik uyarılarıyla işaretli gönderileri her zaman genişlet
         setting_hide_network: Sosyal grafiğini gizle
+        setting_missing_alt_text_modal: Alternatif metni olmayan medya göndermeden önce onay sorusu göster
         setting_reduce_motion: Animasyonlarda hareketi azalt
         setting_system_font_ui: Sistemin varsayılan yazı tipini kullan
         setting_system_scrollbars_ui: Sistemin varsayılan kaydırma çubuğunu kullan
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 4fc8665b91..83881a8dfa 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -3,6 +3,7 @@ uk:
   simple_form:
     hints:
       account:
+        attribution_domains: Один на рядок. Захищає від фальшивих атрибутів.
         discoverable: Ваші дописи та профіль можуть бути рекомендовані в різних частинах Mastodon і ваш профіль може бути запропонований іншим користувачам.
         display_name: Ваше повне ім'я або ваш псевдонім.
         fields: Ваша домашня сторінка, займенники, вік, все, що вам заманеться.
@@ -231,9 +232,10 @@ uk:
         setting_display_media_show_all: Показати всі
         setting_expand_spoilers: Завжди розгортати дописи з попередженнями про вміст
         setting_hide_network: Сховати вашу мережу
+        setting_missing_alt_text_modal: Запитувати перед розміщенням медіа без альтернативного тексту
         setting_reduce_motion: Менше руху в анімаціях
         setting_system_font_ui: Використовувати типовий системний шрифт
-        setting_system_scrollbars_ui: Використовувати системну прокрутку
+        setting_system_scrollbars_ui: Використовувати системну панель гортання
         setting_theme: Тема сайту
         setting_trends: Показувати популярні сьогодні дописи
         setting_unfollow_modal: Показувати діалог підтвердження під час відписки від когось
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 84cc4af817..e0cafd160a 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -3,6 +3,7 @@ vi:
   simple_form:
     hints:
       account:
+        attribution_domains: Bảo vệ khỏi những sự gán ghép sai.
         discoverable: Hồ sơ và tút công khai của bạn được đề xuất cho những người dùng Mastodon khác.
         display_name: Tên đầy đủ hoặc biệt danh đều được.
         fields: Trang blog của bạn, nghề nghiệp, tuổi hoặc bất cứ thứ gì.
@@ -155,6 +156,7 @@ vi:
         url: Nơi những sự kiện được gửi đến
     labels:
       account:
+        attribution_domains: Các trang web được phép ghi nhận bạn
         discoverable: Cho phép khám phá hồ sơ
         fields:
           name: Nhãn
@@ -231,6 +233,7 @@ vi:
         setting_display_media_show_all: Hiện toàn bộ
         setting_expand_spoilers: Luôn mở rộng tút chứa nội dung ẩn
         setting_hide_network: Ẩn quan hệ của bạn
+        setting_missing_alt_text_modal: Hiện xác nhận trước khi đăng media không có văn bản thay thế
         setting_reduce_motion: Giảm chuyển động ảnh GIF
         setting_system_font_ui: Dùng phông chữ mặc định hệ thống
         setting_system_scrollbars_ui: Dùng scrollbar mặc định hệ thống
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 0c6be357ce..1c4e8bec31 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -3,6 +3,7 @@ zh-CN:
   simple_form:
     hints:
       account:
+        attribution_domains: 每行一个域名。这样就可以保护作品免受虚假署名。
         discoverable: 你的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，你的个人资料可能会被推荐给其他用户。
         display_name: 你的全名或昵称。
         fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
@@ -46,7 +47,7 @@ zh-CN:
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录，且收到了私信时发送
         email: 我们会向你发送一封确认邮件
-        header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。分辨率将被压缩至 %{dimensions}px
+        header: 支持 WEBP、PNG、GIF 或 JPG。最大 %{size}。分辨率将被压缩至 %{dimensions}px
         inbox_url: 从你想要使用的中继站的主页上复制 URL
         irreversible: 被过滤的嘟文会永久消失，移除过滤规则后也不会恢复
         locale: 在用户界面、电子邮件和推送通知中使用的语言
@@ -155,6 +156,7 @@ zh-CN:
         url: 事件将被发往的目的地
     labels:
       account:
+        attribution_domains: 授权展示你的署名的网站
         discoverable: 在发现算法中展示你的账号与嘟文
         fields:
           name: 标签
@@ -231,6 +233,7 @@ zh-CN:
         setting_display_media_show_all: 显示全部
         setting_expand_spoilers: 一律展开具有内容警告的嘟文
         setting_hide_network: 隐藏你的社交网络
+        setting_missing_alt_text_modal: 发布媒体时若未为其设置替代文本，则显示确认对话框
         setting_reduce_motion: 降低过渡动画效果
         setting_system_font_ui: 使用系统默认字体
         setting_system_scrollbars_ui: 使用系统默认样式的滚动条
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 1861ee1559..6b33277674 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -3,6 +3,7 @@ zh-TW:
   simple_form:
     hints:
       account:
+        attribution_domains: 每行一個。以保護偽造署名。
         discoverable: 公開嘟文及個人檔案可能於各 Mastodon 功能中被推薦，並且您的個人檔案可能被推薦至其他使用者。
         display_name: 完整名稱或暱稱。
         fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
@@ -155,6 +156,7 @@ zh-TW:
         url: 事件會被傳送至何處
     labels:
       account:
+        attribution_domains: 允許對您予與信譽之網站
         discoverable: 於探索演算法中推薦個人檔案及嘟文
         fields:
           name: 標籤
@@ -231,6 +233,7 @@ zh-TW:
         setting_display_media_show_all: 全部顯示
         setting_expand_spoilers: 永遠展開標有內容警告的嘟文
         setting_hide_network: 隱藏您的社交網路
+        setting_missing_alt_text_modal: 發表未包含說明文字之多媒體嘟文前先詢問我
         setting_reduce_motion: 減少過渡動畫效果
         setting_system_font_ui: 使用系統預設字型
         setting_system_scrollbars_ui: 使用系統預設捲動軸
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e7fb218e2d..afc77db563 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -391,6 +391,7 @@ sk:
     email_domain_blocks:
       add_new: Pridaj nový
       allow_registrations_with_approval: Povoľ registrovanie so schválením
+      created_msg: Úspešne zablokovaná emailová doména
       delete: Vymaž
       dns:
         types:
@@ -399,6 +400,7 @@ sk:
       new:
         create: Pridaj doménu
         resolve: Preveď doménu
+        title: Blokovať novú emailovú doménu
       not_permitted: Nepovolená
       resolved_through_html: Prevedená cez %{domain}
       title: Blokované e-mailové domény
@@ -1365,6 +1367,7 @@ sk:
       explanation: Tu nájdeš nejaké tipy do začiatku
       feature_action: Zisti viac
       follow_action: Nasleduj
+      follow_title: Prispôsob svoj domáci kanál
       follows_title: Koho nasledovať
       post_title: Vytvor svoj prvý príspevok
       share_action: Zdieľaj
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 24aa67e7ae..e6a6c4a08b 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -840,6 +840,7 @@ sl:
       batch:
         remove_from_report: Odstrani iz prijave
         report: Poročaj
+      contents: Vsebina
       deleted: Izbrisano
       favourites: Priljubljeni
       history: Zgodovina različic
@@ -926,6 +927,13 @@ sl:
       search: Išči
       title: Ključniki
       updated_msg: Nastavitve ključnikov uspešno posodobljene
+    terms_of_service:
+      draft: Osnutek
+      generate: Uporabi predlogo
+      history: Zgodovina
+      publish: Objavi
+      save_draft: Shrani osnutek
+      title: Pogoji uporabe
     title: Upravljanje
     trends:
       allow: Dovoli
@@ -1184,6 +1192,8 @@ sl:
       view_strikes: Pokaži pretekle ukrepe proti mojemu računu
     too_fast: Obrazec oddan prehitro, poskusite znova.
     use_security_key: Uporabi varnostni ključ
+  author_attribution:
+    example_title: Vzorčno besedilo
   challenge:
     confirm: Nadaljuj
     hint_html: "<strong>Namig:</strong> naslednjo uro vas ne bomo več vprašali po vašem geslu."
@@ -1710,6 +1720,7 @@ sl:
     delete: Brisanje računa
     development: Razvoj
     edit_profile: Uredi profil
+    export: Izvozi
     featured_tags: Vključeni ključniki
     import: Uvozi
     import_and_export: Uvoz in izvoz
@@ -1820,6 +1831,8 @@ sl:
       too_late: Prepozno je, da bi se pritožili na ta ukrep
   tags:
     does_not_match_previous_name: se ne ujema s prejšnjim imenom
+  terms_of_service:
+    title: Pogoji uporabe
   themes:
     contrast: Mastodon (Visok kontrast)
     default: Mastodon (Temna)
@@ -1880,6 +1893,8 @@ sl:
       further_actions_html: Če to niste bili vi, priporočamo da takoj ukrepate (%{action}) in omogočite dvo-ravensko overjanje (2FA), da ohranite račun varen.
       subject: Do vašega računa je bil opravljen dostop z novega naslova IP
       title: Nova prijava
+    terms_of_service_changed:
+      title: Pomembna posodobitev
     warning:
       appeal: Pošlji pritožbo
       appeal_description: Če menite, da gre za napako, lahko pošljete pritožbo osebju %{instance}.
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 4ac12b67a4..0697bb0a99 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1203,6 +1203,7 @@ sq:
     too_fast: Formulari u parashtrua shumë shpejt, riprovoni.
     use_security_key: Përdor kyç sigurie
     user_agreement_html: I kam lexuar dhe pajtohen me <a href="%{terms_of_service_path}" target="_blank">kushtet e shërbimit</a> dhe <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
+    user_privacy_agreement_html: I kam lexuar dhe pajtohem me <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
   author_attribution:
     example_title: Tekst shembull
     hint_html: Shkruani lajme, apo artikuj blogu jashtë Mastodon-it? Kontrolloni se si ju jepet hakë, kur ndahen me të tjerët në Mastodon.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 65ec6ef58a..7470f88c50 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1209,6 +1209,7 @@ tr:
     too_fast: Form çok hızlı gönderildi, tekrar deneyin.
     use_security_key: Güvenlik anahtarını kullan
     user_agreement_html: <a href="%{terms_of_service_path}" target="_blank">hizmet şartları</a> ve <a href="%{privacy_policy_path}" target="_blank">gizlilik politikasını</a> okudum ve kabul ediyorum
+    user_privacy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Gizlilik politikasını</a> okudum ve kabul ettim
   author_attribution:
     example_title: Örnek metin
     hint_html: Mastodon dışında haber veya günlük yazıları mı yazıyorsunuz? Bu yazılar Mastodon'da paylaşıldığında size nasıl atıf yapılacağını denetleyin.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 6f0ddbd81f..801d32b1ab 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1220,7 +1220,7 @@ uk:
     set_new_password: Встановити новий пароль
     setup:
       email_below_hint_html: Перевірте теку "Спам", або зробіть ще один запит. Ви можете виправити свою електронну адресу, якщо вона неправильна.
-      email_settings_hint_html: Натисніть посилання, надіслане на %{email} щоб почати використання Mastodon. Ми чекатимемо тут.
+      email_settings_hint_html: Натисніть посилання, надіслане на %{email}, щоб почати користуватися Mastodon. Ми чекатимемо тут.
       link_not_received: Не отримали посилання?
       new_confirmation_instructions_sent: Ви отримаєте новий лист із посиланням для підтвердження протягом кількох хвилин!
       title: Перевірте вашу поштову скриньку
@@ -1242,6 +1242,7 @@ uk:
     too_fast: Форму подано занадто швидко, спробуйте ще раз.
     use_security_key: Використовувати ключ безпеки
     user_agreement_html: Я прочитав і приймаю <a href="%{terms_of_service_path}" target="_blank">умови використання</a> та <a href="%{privacy_policy_path}" target="_blank">політику конфіденційності< /a>
+    user_privacy_agreement_html: Мною прочитано і я погоджуюся з <a href="%{privacy_policy_path}" target="_blank">політикою приватності</a>
   author_attribution:
     example_title: Зразок тексту
     hint_html: Ви пишете новини чи статті в блозі за межами Mastodon? Контролюйте, як вони підписуються, коли ними діляться на Mastodon.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 33c743188d..2f7ae6752c 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1190,6 +1190,7 @@ vi:
     too_fast: Nghi vấn đăng ký spam, xin thử lại.
     use_security_key: Dùng khóa bảo mật
     user_agreement_html: Tôi đã đọc và đồng ý với <a href="%{terms_of_service_path}" target="_blank">điều khoản dịch vụ</a> và <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
+    user_privacy_agreement_html: Tôi đã đọc và đồng ý <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
   author_attribution:
     example_title: Văn bản mẫu
     hint_html: Bạn là nhà báo hoặc blogger bên ngoài Mastodon? Kiểm soát cách bài viết của bạn được ghi nhận khi chia sẻ trên Mastodon.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index e6da2ee8d3..a7fbfa3de2 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 ---
 zh-CN:
   about:
-    about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！加入 Mastodon，掌控自己的数据！
+    about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！使用 Mastodon 夺回你的数据！
     contact_missing: 未设定
     contact_unavailable: 未公开
     hosted_on: 运行在 %{domain} 上的 Mastodon 实例
@@ -1190,6 +1190,7 @@ zh-CN:
     too_fast: 表单提交过快，请重试。
     use_security_key: 使用安全密钥
     user_agreement_html: 我已阅读并同意 <a href="%{terms_of_service_path}" target="_blank">服务条款</a> 与 <a href="%{privacy_policy_path}" target="_blank">隐私政策</a>
+    user_privacy_agreement_html: 我已阅读并同意<a href="%{privacy_policy_path}" target="_blank">隐私政策</a>
   author_attribution:
     example_title: 示例文本
     hint_html: 你是否在 Mastodon 之外撰写新闻或博客文章？控制它们被分享到 Mastodon 时的署名方式。
@@ -1830,10 +1831,10 @@ zh-CN:
   terms_of_service:
     title: 服务条款
   themes:
-    contrast: Mastodon (高对比度)
-    default: Mastodon (暗色)
-    mastodon-light: Mastodon (亮色)
-    system: 自动切换 (使用系统主题)
+    contrast: Mastodon（高对比度）
+    default: Mastodon（暗色主题）
+    mastodon-light: Mastodon（亮色主题）
+    system: 自动切换（使用系统主题）
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index cf215240e9..4a3ab2ba23 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1192,6 +1192,7 @@ zh-TW:
     too_fast: 送出表單的速度太快跟不上，請稍後再試。
     use_security_key: 使用安全金鑰
     user_agreement_html: 我已閱讀並同意 <a href="%{terms_of_service_path}" target="_blank">服務條款</a> 與 <a href="%{privacy_policy_path}" target="_blank">隱私權政策</a>
+    user_privacy_agreement_html: 我已閱讀並同意 <a href="%{privacy_policy_path}" target="_blank">隱私權政策</a>
   author_attribution:
     example_title: 範例文字
     hint_html: 您是否正於 Mastodon 之外撰寫新聞或部落格文章？控制當它們於 Mastodon 上分享時您如何獲得信譽。
diff --git a/config/puma.rb b/config/puma.rb
index ac9ccac209..4fe8f802b9 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -17,6 +17,27 @@ workers     ENV.fetch('WEB_CONCURRENCY') { 2 }.to_i
 
 preload_app!
 
+if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
+  require 'prometheus_exporter'
+  require 'prometheus_exporter/instrumentation'
+
+  on_worker_boot do
+    # Ruby process metrics (memory, GC, etc)
+    PrometheusExporter::Instrumentation::Process.start(type: 'puma')
+
+    # ActiveRecord metrics (connection pool usage)
+    PrometheusExporter::Instrumentation::ActiveRecord.start(
+      custom_labels: { type: 'puma' }, # optional params
+      config_labels: [:database, :host] # optional params
+    )
+  end
+
+  after_worker_boot do
+    # Puma metrics
+    PrometheusExporter::Instrumentation::Puma.start unless PrometheusExporter::Instrumentation::Puma.started?
+  end
+end
+
 on_worker_boot do
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Base.establish_connection
diff --git a/config/templates/terms-of-service.md b/config/templates/terms-of-service.md
index cb81a22e84..4b11a9897c 100644
--- a/config/templates/terms-of-service.md
+++ b/config/templates/terms-of-service.md
@@ -58,16 +58,18 @@ attempt to):
   or limit the functionality of the Instance, launch a denial of service attack,
   or in any other way attempt to interfere with the functioning and availability
   of the Instance;
-- Except as may be the result of standard search engine or Internet browser
-  usage, use, launch, develop, or distribute any automated system, including
-  without limitation, any spider, robot, cheat utility, scraper, offline reader,
-  or any data mining or similar data gathering extraction tools to access the
-  Instance, or use or launch any unauthorized script or other software;
+- Use, launch, develop, or distribute any automated system, including without
+  limitation, any spider, robot, cheat utility, scraper, offline reader, or any
+  data mining or similar data gathering extraction tools to access the Instance,
+  except in each case as may be the result of standard search engine or Internet
+  browser and local caching or for human review and interaction with Content on
+  the Instance;
+- Use or launch any unauthorized script or other software;
 - Interfere with, disable, vandalize or disrupt the Instance or servers or
   networks connected to the Instance;
 - Hack into, penetrate, disable, or otherwise circumvent the security measures
   of the Instance or servers or networks connected to the Instance;
-- or otherwise use the Instance in any way that violates any applicable
+- Otherwise use the Instance in any way that violates any applicable
   national, federal, state, local or international law or regulation.
 
 ## Intellectual Property
diff --git a/config/webpack/rules/babel.js b/config/webpack/rules/babel.js
index 902b823e1f..f1b53c3606 100644
--- a/config/webpack/rules/babel.js
+++ b/config/webpack/rules/babel.js
@@ -4,7 +4,7 @@ const { env, settings } = require('../configuration');
 
 // Those modules contain modern ES code that need to be transpiled for Webpack to process it
 const nodeModulesToProcess = [
-  '@reduxjs', 'fuzzysort'
+  '@reduxjs', 'fuzzysort', 'toygrad'
 ];
 
 module.exports = {
diff --git a/config/webpack/rules/tesseract.js b/config/webpack/rules/tesseract.js
index de647c8d10..746fa55dfe 100644
--- a/config/webpack/rules/tesseract.js
+++ b/config/webpack/rules/tesseract.js
@@ -1,9 +1,8 @@
 module.exports = {
   test: [
     /tesseract\.js\/dist\/worker\.min\.js$/,
-    /tesseract\.js\/dist\/worker\.min\.js.map$/,
-    /tesseract\.js-core\/tesseract-core\.wasm$/,
-    /tesseract\.js-core\/tesseract-core\.wasm.js$/,
+    /tesseract\.js\/dist\/worker\.min\.js\.map$/,
+    /tesseract\.js-core\/tesseract-core\.wasm\.js$/,
   ],
   use: {
     loader: 'file-loader',
diff --git a/config/webpacker.yml b/config/webpacker.yml
index e07f577c5e..ac4bca2916 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -13,8 +13,8 @@ default: &default
   # ['app/assets', 'engine/foo/app/assets']
   resolved_paths: []
 
-  # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: false
+  # Cache manifest.json for performance
+  cache_manifest: true
 
   # Extract and emit a css file
   extract_css: true
@@ -55,6 +55,9 @@ development:
 
   compile: true
 
+  # Reload manifest in development environment so we pick up changes
+  cache_manifest: false
+
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server:
     https: false
@@ -89,6 +92,3 @@ production:
 
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
-
-  # Cache manifest.json for performance
-  cache_manifest: true
diff --git a/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb b/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb
new file mode 100644
index 0000000000..82cc9128b6
--- /dev/null
+++ b/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddNewPublicIndexToStatuses < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250129, 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))' # rubocop:disable Naming/VariableNumber
+  end
+end
diff --git a/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb b/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb
new file mode 100644
index 0000000000..18a4991c46
--- /dev/null
+++ b/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveOldPublicIndexToStatuses < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_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))' # rubocop:disable Naming/VariableNumber
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 13abd5c0cd..6c4af6aa19 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[8.0].define(version: 2025_01_08_111200) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_29_144813) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -1056,7 +1056,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_01_08_111200) do
     t.index ["account_id"], name: "index_statuses_on_account_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", "language", "account_id"], name: "index_statuses_public_20250129", 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 ["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 ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c44977562..93e5bd4ecd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 # This file is designed for production server deployment, not local development work
-# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
 
 services:
   db:
diff --git a/lib/devise/strategies/two_factor_ldap_authenticatable.rb b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
index c8258deb16..2efd1323a8 100644
--- a/lib/devise/strategies/two_factor_ldap_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
@@ -23,7 +23,7 @@ module Devise
       protected
 
       def valid_params?
-        params[scope] && params[scope][:password].present?
+        params[scope].is_a?(Hash) && params[scope][:password].present?
       end
     end
   end
diff --git a/lib/devise/strategies/two_factor_pam_authenticatable.rb b/lib/devise/strategies/two_factor_pam_authenticatable.rb
index a9db1b6a29..2164b03234 100644
--- a/lib/devise/strategies/two_factor_pam_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_pam_authenticatable.rb
@@ -22,7 +22,7 @@ module Devise
       protected
 
       def valid_params?
-        params[scope] && params[scope][:password].present?
+        params[scope].is_a?(Hash) && params[scope][:password].present?
       end
     end
   end
diff --git a/lib/mastodon/cli/feeds.rb b/lib/mastodon/cli/feeds.rb
index 3879751d0e..324e493e28 100644
--- a/lib/mastodon/cli/feeds.rb
+++ b/lib/mastodon/cli/feeds.rb
@@ -11,17 +11,21 @@ module Mastodon::CLI
     option :concurrency, type: :numeric, default: 5, aliases: [:c]
     option :verbose, type: :boolean, aliases: [:v]
     option :dry_run, type: :boolean, default: false
+    option :skip_filled_timelines
     desc 'build [USERNAME]', 'Build home and list feeds for one or all users'
     long_desc <<-LONG_DESC
       Build home and list feeds that are stored in Redis from the database.
 
+      With the --skip-filled-timelines, timelines which contain more than half
+      the maximum number of posts will be skipped.
+
       With the --all option, all active users will be processed.
       Otherwise, a single user specified by USERNAME.
     LONG_DESC
     def build(username = nil)
       if options[:all] || username.nil?
         processed, = parallelize_with_progress(active_user_accounts) do |account|
-          PrecomputeFeedService.new.call(account) unless dry_run?
+          PrecomputeFeedService.new.call(account, skip_filled_timelines: options[:skip_filled_timelines]) unless dry_run?
         end
 
         say("Regenerated feeds for #{processed} accounts #{dry_run_mode_suffix}", :green, true)
@@ -30,7 +34,7 @@ module Mastodon::CLI
 
         fail_with_message 'No such account' if account.nil?
 
-        PrecomputeFeedService.new.call(account) unless dry_run?
+        PrecomputeFeedService.new.call(account, skip_filled_timelines: options[:skip_filled_timelines]) unless dry_run?
 
         say("OK #{dry_run_mode_suffix}", :green, true)
       else
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index 3efffa355a..47e3f9f547 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -52,8 +52,8 @@ module Paperclip
           @output_options['bufsize'] = bitrate * 5
 
           if high_vfr?(metadata)
+            # TODO: change to `fps_mode` in the future, as `vsync` is being deprecated
             @output_options['vsync'] = 'vfr'
-            @output_options['r'] = @vfr_threshold
           end
         end
       end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 0081b4a8f6..61dba4eb52 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -8,6 +8,12 @@ namespace :mastodon do
     prompt = TTY::Prompt.new
     env    = {}
 
+    if ENV['LOCAL_DOMAIN']
+      prompt.warn "It looks like you already configured Mastodon for domain '#{ENV['LOCAL_DOMAIN']}'."
+      prompt.warn 'Never re-run this task on an already-configured running server.'
+      next prompt.warn 'Nothing saved. Bye!' if prompt.no?('Continue anyway?')
+    end
+
     clear_environment!
 
     begin
diff --git a/package.json b/package.json
index 6cb314db34..c086078ee5 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "imports-loader": "^1.2.0",
     "intl-messageformat": "^10.3.5",
     "js-yaml": "^4.1.0",
+    "lande": "^1.0.10",
     "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
@@ -122,7 +123,7 @@
     "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
     "terser-webpack-plugin": "^4.2.3",
-    "tesseract.js": "^2.1.5",
+    "tesseract.js": "^6.0.0",
     "tiny-queue": "^0.2.1",
     "twitter-text": "3.1.0",
     "use-debounce": "^10.0.0",
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 4d48a0d9d3..f3f08c7940 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -48,15 +48,11 @@ RSpec.describe Admin::DomainBlocksController do
         post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
       end
 
-      it 'records a block' do
+      it 'records a block, calls a worker, redirects' do
         expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
-      end
 
-      it 'calls DomainBlockWorker' do
         expect(DomainBlockWorker).to have_received(:perform_async)
-      end
 
-      it 'redirects with a success message' do
         expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
         expect(response).to redirect_to(admin_instances_path(limited: '1'))
       end
@@ -68,15 +64,11 @@ RSpec.describe Admin::DomainBlocksController do
         post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
       end
 
-      it 'does not record a block' do
+      it 'does not record a block or call worker, renders new' do
         expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be false
-      end
 
-      it 'does not call DomainBlockWorker' do
         expect(DomainBlockWorker).to_not have_received(:perform_async)
-      end
 
-      it 'renders new' do
         expect(response).to render_template :new
       end
     end
@@ -87,15 +79,11 @@ RSpec.describe Admin::DomainBlocksController do
           post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
         end
 
-        it 'does not record a block' do
+        it 'does not record a block or call worker, renders confirm suspension' do
           expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
-        end
 
-        it 'does not call DomainBlockWorker' do
           expect(DomainBlockWorker).to_not have_received(:perform_async)
-        end
 
-        it 'renders confirm_suspension' do
           expect(response).to render_template :confirm_suspension
         end
       end
@@ -105,15 +93,11 @@ RSpec.describe Admin::DomainBlocksController do
           post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
         end
 
-        it 'records a block' do
+        it 'records a block and calls worker and redirects' do
           expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
-        end
 
-        it 'calls DomainBlockWorker' do
           expect(DomainBlockWorker).to have_received(:perform_async)
-        end
 
-        it 'redirects with a success message' do
           expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
           expect(response).to redirect_to(admin_instances_path(limited: '1'))
         end
@@ -130,15 +114,11 @@ RSpec.describe Admin::DomainBlocksController do
           post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
         end
 
-        it 'does not record a block' do
+        it 'does not record a block or call worker, renders confirm suspension' do
           expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
-        end
 
-        it 'does not call DomainBlockWorker' do
           expect(DomainBlockWorker).to_not have_received(:perform_async)
-        end
 
-        it 'renders confirm_suspension' do
           expect(response).to render_template :confirm_suspension
         end
       end
@@ -148,15 +128,11 @@ RSpec.describe Admin::DomainBlocksController do
           post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
         end
 
-        it 'updates the record' do
+        it 'updates the record and calls worker, redirects' do
           expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
-        end
 
-        it 'calls DomainBlockWorker' do
           expect(DomainBlockWorker).to have_received(:perform_async)
-        end
 
-        it 'redirects with a success message' do
           expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
           expect(response).to redirect_to(admin_instances_path(limited: '1'))
         end
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
deleted file mode 100644
index c7460c2110..0000000000
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::EmailDomainBlocksController do
-  render_views
-
-  before do
-    sign_in Fabricate(:admin_user), scope: :user
-  end
-
-  describe 'GET #index' do
-    around do |example|
-      default_per_page = EmailDomainBlock.default_per_page
-      EmailDomainBlock.paginates_per 2
-      example.run
-      EmailDomainBlock.paginates_per default_per_page
-    end
-
-    it 'returns http success' do
-      2.times { Fabricate(:email_domain_block) }
-      Fabricate(:email_domain_block, allow_with_approval: true)
-      get :index, params: { page: 2 }
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'GET #new' do
-    it 'returns http success' do
-      get :new
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'POST #create' do
-    context 'when resolve button is pressed' do
-      before 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)
-
-        post :create, params: { email_domain_block: { domain: 'example.com' } }
-      end
-
-      it 'renders new template' do
-        expect(response).to render_template(:new)
-      end
-    end
-
-    context 'when save button is pressed' do
-      before do
-        post :create, params: { email_domain_block: { domain: 'example.com' }, save: '' }
-      end
-
-      it 'blocks the domain' do
-        expect(EmailDomainBlock.find_by(domain: 'example.com')).to_not be_nil
-      end
-
-      it 'redirects to e-mail domain blocks' do
-        expect(response).to redirect_to(admin_email_domain_blocks_path)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
deleted file mode 100644
index 4012204de1..0000000000
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::ReportsController do
-  render_views
-
-  let(:user) { Fabricate(:admin_user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    it 'returns http success with no filters' do
-      specified = Fabricate(:report, action_taken_at: nil, comment: 'First report')
-      other = Fabricate(:report, action_taken_at: Time.now.utc, comment: 'Second report')
-
-      get :index
-
-      expect(response).to have_http_status(200)
-      expect(response.body)
-        .to include(specified.comment)
-        .and not_include(other.comment)
-    end
-
-    it 'returns http success with resolved filter' do
-      specified = Fabricate(:report, action_taken_at: Time.now.utc, comment: 'First report')
-      other = Fabricate(:report, action_taken_at: nil, comment: 'Second report')
-
-      get :index, params: { resolved: '1' }
-
-      expect(response).to have_http_status(200)
-      expect(response.body)
-        .to include(specified.comment)
-        .and not_include(other.comment)
-    end
-  end
-
-  describe 'GET #show' do
-    it 'renders report' do
-      report = Fabricate(:report, comment: 'A big problem')
-
-      get :show, params: { id: report }
-
-      expect(response).to have_http_status(200)
-      expect(response.body)
-        .to include(report.comment)
-    end
-
-    describe 'account moderation notes' do
-      let(:report) { Fabricate(:report) }
-
-      it 'includes moderation notes' do
-        note1 = Fabricate(:report_note, report: report)
-        note2 = Fabricate(:report_note, report: report)
-
-        get :show, params: { id: report }
-
-        expect(response).to have_http_status(200)
-
-        report_notes = assigns(:report_notes).to_a
-
-        expect(report_notes.size).to be 2
-        expect(report_notes).to eq [note1, note2]
-      end
-    end
-  end
-
-  describe 'POST #resolve' do
-    it 'resolves the report' do
-      report = Fabricate(:report)
-
-      put :resolve, params: { id: report }
-      expect(response).to redirect_to(admin_reports_path)
-      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
-
-  describe 'POST #reopen' do
-    it 'reopens the report' do
-      report = Fabricate(:report, action_taken_at: 3.days.ago)
-
-      put :reopen, params: { id: report }
-      expect(response).to redirect_to(admin_report_path(report))
-      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
-
-  describe 'POST #assign_to_self' do
-    it 'reopens the report' do
-      report = Fabricate(:report)
-
-      put :assign_to_self, params: { id: report }
-      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
-
-  describe 'POST #unassign' do
-    it 'reopens the report' do
-      report = Fabricate(:report, assigned_account_id: Account.last.id)
-
-      put :unassign, params: { id: report }
-      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/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 2c43a0ca87..173a89e5d5 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -68,11 +68,9 @@ RSpec.describe Admin::RolesController do
         let(:selected_position) { 1 }
         let(:selected_permissions_as_keys) { %w(manage_roles) }
 
-        it 'redirects to roles page' do
+        it 'redirects to roles page and creates role' do
           expect(response).to redirect_to(admin_roles_path)
-        end
 
-        it 'creates new role' do
           expect(UserRole.find_by(name: 'Bar')).to_not be_nil
         end
       end
@@ -81,11 +79,9 @@ RSpec.describe Admin::RolesController do
         let(:selected_position) { 100 }
         let(:selected_permissions_as_keys) { %w(manage_roles) }
 
-        it 'renders new template' do
+        it 'renders new template and does not create role' do
           expect(response).to render_template(:new)
-        end
 
-        it 'does not create new role' do
           expect(UserRole.find_by(name: 'Bar')).to be_nil
         end
       end
@@ -94,11 +90,9 @@ RSpec.describe Admin::RolesController do
         let(:selected_position) { 1 }
         let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
 
-        it 'renders new template' do
+        it 'renders new template and does not create role' do
           expect(response).to render_template(:new)
-        end
 
-        it 'does not create new role' do
           expect(UserRole.find_by(name: 'Bar')).to be_nil
         end
       end
@@ -109,11 +103,9 @@ RSpec.describe Admin::RolesController do
         let(:selected_position) { 1 }
         let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
 
-        it 'redirects to roles page' do
+        it 'redirects to roles page and creates new role' do
           expect(response).to redirect_to(admin_roles_path)
-        end
 
-        it 'creates new role' do
           expect(UserRole.find_by(name: 'Bar')).to_not be_nil
         end
       end
@@ -166,11 +158,9 @@ RSpec.describe Admin::RolesController do
     end
 
     context 'when user does not have permission to manage roles' do
-      it 'returns http forbidden' do
+      it 'returns http forbidden and does not update role' do
         expect(response).to have_http_status(403)
-      end
 
-      it 'does not update the role' do
         expect(role.reload.name).to eq 'Bar'
       end
     end
@@ -179,11 +169,9 @@ RSpec.describe Admin::RolesController do
       let(:permissions) { UserRole::FLAGS[:manage_roles] }
 
       context 'when role has permissions the user doesn\'t' do
-        it 'renders edit template' do
+        it 'renders edit template and does not update role' do
           expect(response).to render_template(:edit)
-        end
 
-        it 'does not update the role' do
           expect(role.reload.name).to eq 'Bar'
         end
       end
@@ -192,11 +180,9 @@ RSpec.describe Admin::RolesController do
         let(:permissions) { UserRole::FLAGS[:manage_roles] | UserRole::FLAGS[:manage_users] }
 
         context 'when user outranks the role' do
-          it 'redirects to roles page' do
+          it 'redirects to roles page and updates role' do
             expect(response).to redirect_to(admin_roles_path)
-          end
 
-          it 'updates the role' do
             expect(role.reload.name).to eq 'Baz'
           end
         end
@@ -204,11 +190,9 @@ RSpec.describe Admin::RolesController do
         context 'when role outranks user' do
           let(:role_position) { current_role.position + 1 }
 
-          it 'returns http forbidden' do
+          it 'returns http forbidden and does not update role' do
             expect(response).to have_http_status(403)
-          end
 
-          it 'does not update the role' do
             expect(role.reload.name).to eq 'Bar'
           end
         end
diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb
index 843021469e..6b3621bb8a 100644
--- a/spec/controllers/admin/settings/branding_controller_spec.rb
+++ b/spec/controllers/admin/settings/branding_controller_spec.rb
@@ -16,7 +16,8 @@ RSpec.describe Admin::Settings::BrandingController do
 
         patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
 
-        expect(response).to redirect_to(admin_settings_branding_path)
+        expect(response)
+          .to have_http_status(400)
         expect(Setting.new_setting_key).to be_nil
       end
     end
diff --git a/spec/controllers/admin/users/roles_controller_spec.rb b/spec/controllers/admin/users/roles_controller_spec.rb
index bfc2bb151f..a7d59181d6 100644
--- a/spec/controllers/admin/users/roles_controller_spec.rb
+++ b/spec/controllers/admin/users/roles_controller_spec.rb
@@ -44,11 +44,9 @@ RSpec.describe Admin::Users::RolesController do
       let(:permissions) { UserRole::FLAGS[:manage_roles] }
       let(:position) { 1 }
 
-      it 'updates user role' do
+      it 'updates user role and redirects' do
         expect(user.reload.role_id).to eq selected_role&.id
-      end
 
-      it 'redirects back to account page' do
         expect(response).to redirect_to(admin_account_path(user.account_id))
       end
     end
@@ -57,11 +55,9 @@ RSpec.describe Admin::Users::RolesController do
       let(:permissions) { UserRole::FLAGS[:administrator] }
       let(:position) { 100 }
 
-      it 'does not update user role' do
+      it 'does not update user role and renders edit' do
         expect(user.reload.role_id).to eq previous_role&.id
-      end
 
-      it 'renders edit form' do
         expect(response).to render_template(:show)
       end
     end
@@ -71,11 +67,9 @@ RSpec.describe Admin::Users::RolesController do
       let(:permissions) { UserRole::FLAGS[:manage_roles] }
       let(:position) { 1 }
 
-      it 'does not update user role' do
+      it 'does not update user role and returns http forbidden' do
         expect(user.reload.role_id).to eq previous_role&.id
-      end
 
-      it 'returns http forbidden' do
         expect(response).to have_http_status(403)
       end
     end
diff --git a/spec/controllers/auth/passwords_controller_spec.rb b/spec/controllers/auth/passwords_controller_spec.rb
deleted file mode 100644
index 90095ac4b8..0000000000
--- a/spec/controllers/auth/passwords_controller_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Auth::PasswordsController do
-  include Devise::Test::ControllerHelpers
-
-  describe 'GET #new' do
-    it 'returns http success' do
-      request.env['devise.mapping'] = Devise.mappings[:user]
-      get :new
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'GET #edit' do
-    let(:user) { Fabricate(:user) }
-
-    before do
-      request.env['devise.mapping'] = Devise.mappings[:user]
-    end
-
-    context 'with valid reset_password_token' do
-      it 'returns http success' do
-        token = user.send_reset_password_instructions
-
-        get :edit, params: { reset_password_token: token }
-
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    context 'with invalid reset_password_token' do
-      it 'redirects to #new' do
-        get :edit, params: { reset_password_token: 'some_invalid_value' }
-        expect(response).to redirect_to subject.new_password_path(subject.send(:resource_name))
-      end
-    end
-  end
-
-  describe 'POST #update' do
-    let(:user) { Fabricate(:user) }
-    let(:password) { 'reset0password' }
-
-    before do
-      request.env['devise.mapping'] = Devise.mappings[:user]
-    end
-
-    context 'with valid reset_password_token' do
-      let!(:session_activation) { Fabricate(:session_activation, user: user) }
-      let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
-      let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
-
-      before do
-        token = user.send_reset_password_instructions
-
-        post :update, params: { user: { password: password, password_confirmation: password, reset_password_token: token } }
-      end
-
-      it 'resets the password' do
-        expect(response)
-          .to redirect_to '/auth/sign_in'
-
-        # Change password
-        expect(User.find(user.id))
-          .to be_present
-          .and be_valid_password(password)
-
-        # Deactivate session
-        expect(user.session_activations.count)
-          .to eq 0
-        expect { session_activation.reload }
-          .to raise_error(ActiveRecord::RecordNotFound)
-
-        # Revoke tokens
-        expect(Doorkeeper::AccessToken.active_for(user).count)
-          .to eq 0
-
-        # Remove push subs
-        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
-
-    context 'with invalid reset_password_token' do
-      before do
-        post :update, params: { user: { password: password, password_confirmation: password, reset_password_token: 'some_invalid_value' } }
-      end
-
-      it 'renders reset password and retains password' do
-        expect(response)
-          .to render_template(:new)
-
-        expect(User.find(user.id))
-          .to be_present
-          .and be_external_or_valid_password(user.password)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/concerns/api/rate_limit_headers_spec.rb b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
index 74ed81f5da..dd16531350 100644
--- a/spec/controllers/concerns/api/rate_limit_headers_spec.rb
+++ b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
@@ -40,15 +40,11 @@ RSpec.describe Api::RateLimitHeaders do
         end
       end
 
-      it 'applies rate limiting limit header' do
+      it 'provides rate limit information in headers' do
         expect(response.headers['X-RateLimit-Limit']).to eq '100'
-      end
 
-      it 'applies rate limiting remaining header' do
         expect(response.headers['X-RateLimit-Remaining']).to eq '80'
-      end
 
-      it 'applies rate limiting reset header' do
         expect(response.headers['X-RateLimit-Reset']).to eq (start_time + 10.seconds).iso8601(6)
       end
     end
diff --git a/spec/controllers/filters/statuses_controller_spec.rb b/spec/controllers/filters/statuses_controller_spec.rb
index f1fed76fca..7bad403571 100644
--- a/spec/controllers/filters/statuses_controller_spec.rb
+++ b/spec/controllers/filters/statuses_controller_spec.rb
@@ -23,11 +23,9 @@ RSpec.describe Filters::StatusesController do
           get :index, params: { filter_id: filter }
         end
 
-        it 'returns http success' do
+        it 'returns http success and private cache control headers' do
           expect(response).to have_http_status(200)
-        end
 
-        it 'returns private cache control headers' do
           expect(response.headers['Cache-Control']).to include('private, no-store')
         end
       end
diff --git a/spec/controllers/relationships_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb
index 323fcc995d..75b5e71f35 100644
--- a/spec/controllers/relationships_controller_spec.rb
+++ b/spec/controllers/relationships_controller_spec.rb
@@ -14,11 +14,9 @@ RSpec.describe RelationshipsController do
         get :show, params: { page: 2, relationship: 'followed_by' }
       end
 
-      it 'returns http success' do
+      it 'returns http success and private cache control headers' do
         expect(response).to have_http_status(200)
-      end
 
-      it 'returns private cache control headers' do
         expect(response.headers['Cache-Control']).to include('private, no-store')
       end
     end
diff --git a/spec/flatware_helper.rb b/spec/flatware_helper.rb
index 57a7c1f56a..a1bcb62340 100644
--- a/spec/flatware_helper.rb
+++ b/spec/flatware_helper.rb
@@ -3,7 +3,7 @@
 if defined?(Flatware)
   Flatware.configure do |config|
     config.after_fork do |test_env_number|
-      unless ENV.fetch('DISABLE_SIMPLECOV', nil) == 'true'
+      if ENV.fetch('COVERAGE', false)
         require 'simplecov'
         SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results
       end
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index b1a8dc5c49..8128fdd070 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -13,10 +13,13 @@ RSpec.describe ActivityPub::LinkedDataSignature do
     {
       '@context' => 'https://www.w3.org/ns/activitystreams',
       'id' => 'http://example.com/hello-world',
+      'type' => 'Note',
+      'content' => 'Hello world',
     }
   end
 
-  let(:json) { raw_json.merge('signature' => signature) }
+  let(:signed_json) { raw_json.merge('signature' => signature) }
+  let(:json) { signed_json }
 
   describe '#verify_actor!' do
     context 'when signature matches' do
@@ -90,6 +93,54 @@ RSpec.describe ActivityPub::LinkedDataSignature do
         expect(subject.verify_actor!).to be_nil
       end
     end
+
+    context 'when an attribute has been removed from the document' do
+      let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+      let(:json) { signed_json.without('content') }
+
+      let(:raw_signature) do
+        {
+          'creator' => 'http://example.com/alice',
+          'created' => '2017-09-23T20:21:34Z',
+        }
+      end
+
+      it 'returns nil' do
+        expect(subject.verify_actor!).to be_nil
+      end
+    end
+
+    context 'when an attribute has been added to the document' do
+      let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+      let(:json) { signed_json.merge('attributedTo' => 'http://example.com/bob') }
+
+      let(:raw_signature) do
+        {
+          'creator' => 'http://example.com/alice',
+          'created' => '2017-09-23T20:21:34Z',
+        }
+      end
+
+      it 'returns nil' do
+        expect(subject.verify_actor!).to be_nil
+      end
+    end
+
+    context 'when an existing attribute has been changed' do
+      let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+      let(:json) { signed_json.merge('content' => 'oops') }
+
+      let(:raw_signature) do
+        {
+          'creator' => 'http://example.com/alice',
+          'created' => '2017-09-23T20:21:34Z',
+        }
+      end
+
+      it 'returns nil' do
+        expect(subject.verify_actor!).to be_nil
+      end
+    end
   end
 
   describe '#sign!' do
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 1d3123d343..0d0c817b6c 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -196,6 +196,28 @@ RSpec.describe FeedManager do
       end
     end
 
+    context 'with list feed' do
+      let(:list) { Fabricate(:list, account: bob) }
+
+      before do
+        bob.follow!(alice)
+        list.list_accounts.create!(account: alice)
+      end
+
+      it "returns false for followee's status" do
+        status = Fabricate(:status, text: 'Hello world', account: alice)
+
+        expect(subject.filter?(:list, status, list)).to be false
+      end
+
+      it 'returns false for reblog by followee' do
+        status = Fabricate(:status, text: 'Hello world', account: jeff)
+        reblog = Fabricate(:status, reblog: status, account: alice)
+
+        expect(subject.filter?(:list, reblog, list)).to be false
+      end
+    end
+
     context 'with mentions feed' do
       it 'returns true for status that mentions blocked account' do
         bob.block!(jeff)
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 36d6f22b00..cb072c4870 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -249,6 +249,44 @@ RSpec.describe LinkDetailsExtractor do
         expect(subject.author_name).to eq 'Author 1, Author 2'
       end
     end
+
+    context 'with embedded arrays' do
+      let(:ld_json) do
+        {
+          '@context' => 'https://schema.org',
+          '@type' => 'NewsArticle',
+          'headline' => 'A lot of authors',
+          'description' => 'But we decided to cram them into one',
+          'author' => [[{
+            '@type' => 'Person',
+            'name' => ['Author 1'],
+          }]],
+          'publisher' => [[{
+            '@type' => 'NewsMediaOrganization',
+            'name' => 'Pet News',
+            'url' => 'https://example.com',
+          }]],
+        }.to_json
+      end
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
+
+      it 'gives correct author_name' do
+        expect(subject.author_name).to eq 'Author 1'
+      end
+
+      it 'gives provider_name' do
+        expect(subject.provider_name).to eq 'Pet News'
+      end
+    end
   end
 
   context 'when Open Graph protocol data is present' do
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index f17cf637b9..79c400e098 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -60,16 +60,12 @@ RSpec.describe Request do
         expect(a_request(:get, 'http://example.com')).to have_been_made.once
       end
 
-      it 'sets headers' do
-        expect { |block| subject.perform(&block) }.to yield_control
-        expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
-      end
-
-      it 'closes underlying connection' do
+      it 'makes a request with expected headers, yields, and closes the underlying connection' do
         allow(subject.send(:http_client)).to receive(:close)
 
         expect { |block| subject.perform(&block) }.to yield_control
 
+        expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
         expect(subject.send(:http_client)).to have_received(:close)
       end
 
@@ -80,6 +76,29 @@ RSpec.describe Request do
       end
     end
 
+    context 'with a redirect and HTTP signatures' do
+      let(:account) { Fabricate(:account) }
+
+      before do
+        stub_request(:get, 'http://example.com').to_return(status: 301, headers: { Location: 'http://redirected.example.com/foo' })
+        stub_request(:get, 'http://redirected.example.com/foo').to_return(body: 'lorem ipsum')
+      end
+
+      it 'makes a request with expected headers and follows redirects' do
+        expect { |block| subject.on_behalf_of(account).perform(&block) }.to yield_control
+
+        # request.headers includes the `Signature` sent for the first request
+        expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made.once
+
+        # request.headers includes the `Signature`, but it has changed
+        expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.merge({ 'Host' => 'redirected.example.com' }))).to_not have_been_made
+
+        # `with(headers: )` matching tests for inclusion, so strip `Signature`
+        # This doesn't actually test that there is a signature, but it tests that the original signature is not passed
+        expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.without('Signature').merge({ 'Host' => 'redirected.example.com' }))).to have_been_made.once
+      end
+    end
+
     context 'with private host' do
       around do |example|
         WebMock.disable!
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6564f17372..7d63ea6300 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -2,7 +2,7 @@
 
 ENV['RAILS_ENV'] ||= 'test'
 
-unless ENV['DISABLE_SIMPLECOV'] == 'true'
+if ENV.fetch('COVERAGE', false)
   require 'simplecov'
 
   SimpleCov.start 'rails' do
diff --git a/spec/requests/admin/account_actions_spec.rb b/spec/requests/admin/account_actions_spec.rb
new file mode 100644
index 0000000000..5bf8f3e9b2
--- /dev/null
+++ b/spec/requests/admin/account_actions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Actions' do
+  describe 'POST /admin/accounts/:account_id/action' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:account) { Fabricate :account }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_account_action_path(account.id, admin_account_action: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/account_moderation_notes_spec.rb b/spec/requests/admin/account_moderation_notes_spec.rb
new file mode 100644
index 0000000000..857bec1e09
--- /dev/null
+++ b/spec/requests/admin/account_moderation_notes_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Moderation Notes' do
+  describe 'POST /admin/account_moderation_notes' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_account_moderation_notes_path(account_moderation_note: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/accounts_spec.rb b/spec/requests/admin/accounts_spec.rb
new file mode 100644
index 0000000000..de655f0d36
--- /dev/null
+++ b/spec/requests/admin/accounts_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Accounts' do
+  describe 'POST /admin/accounts/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_accounts_path(form_account_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_accounts_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/announcements_spec.rb b/spec/requests/admin/announcements_spec.rb
new file mode 100644
index 0000000000..46d1b6a096
--- /dev/null
+++ b/spec/requests/admin/announcements_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Announcements' do
+  describe 'POST /admin/announcements' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_announcements_path(announcement: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/change_emails_spec.rb b/spec/requests/admin/change_emails_spec.rb
new file mode 100644
index 0000000000..3df29eb77b
--- /dev/null
+++ b/spec/requests/admin/change_emails_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Change Email' do
+  describe 'PUT /admin/accounts/:account_id/change_email' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:account) { Fabricate :account }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_account_change_email_path(account.id, user: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/custom_emojis_spec.rb b/spec/requests/admin/custom_emojis_spec.rb
new file mode 100644
index 0000000000..0c142f11f2
--- /dev/null
+++ b/spec/requests/admin/custom_emojis_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Custom Emojis' do
+  describe 'POST /admin/custom_emojis' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_custom_emojis_path(custom_emoji: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/domain_allows_spec.rb b/spec/requests/admin/domain_allows_spec.rb
new file mode 100644
index 0000000000..0d1f6d0248
--- /dev/null
+++ b/spec/requests/admin/domain_allows_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Domain Allows' do
+  describe 'POST /admin/domain_allows' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_domain_allows_path(domain_allow: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/domain_blocks_spec.rb b/spec/requests/admin/domain_blocks_spec.rb
new file mode 100644
index 0000000000..3b18a8ece1
--- /dev/null
+++ b/spec/requests/admin/domain_blocks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Domain Blocks' do
+  describe 'POST /admin/domain_blocks/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_domain_blocks_path(form_domain_block_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_instances_path(limited: '1'))
+    end
+  end
+end
diff --git a/spec/requests/admin/email_domain_blocks_spec.rb b/spec/requests/admin/email_domain_blocks_spec.rb
new file mode 100644
index 0000000000..7bccb3166b
--- /dev/null
+++ b/spec/requests/admin/email_domain_blocks_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Email Domain Blocks' do
+  describe 'POST /admin/email_domain_blocks' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_email_domain_blocks_path(email_domain_block: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+
+  describe 'POST /admin/email_domain_blocks/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_email_domain_blocks_path(form_email_domain_block_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_email_domain_blocks_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/export_domain_allows_spec.rb b/spec/requests/admin/export_domain_allows_spec.rb
new file mode 100644
index 0000000000..761c39984e
--- /dev/null
+++ b/spec/requests/admin/export_domain_allows_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Export Domain Allows' do
+  describe 'POST /admin/export_domain_allows/import' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post import_admin_export_domain_allows_path(admin_import: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_instances_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/export_domain_blocks_spec.rb b/spec/requests/admin/export_domain_blocks_spec.rb
new file mode 100644
index 0000000000..d7fed5287f
--- /dev/null
+++ b/spec/requests/admin/export_domain_blocks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Export Domain Blocks' do
+  describe 'POST /admin/export_domain_blocks/import' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post import_admin_export_domain_blocks_path(admin_import: 'invalid')
+
+      expect(response.body)
+        .to include(I18n.t('admin.export_domain_blocks.no_file'))
+    end
+  end
+end
diff --git a/spec/requests/admin/follow_recommendations_spec.rb b/spec/requests/admin/follow_recommendations_spec.rb
new file mode 100644
index 0000000000..146c26448c
--- /dev/null
+++ b/spec/requests/admin/follow_recommendations_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Follow Recommendations' do
+  describe 'PUT /admin/follow_recommendations' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_follow_recommendations_path(form_account_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_follow_recommendations_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/invites_spec.rb b/spec/requests/admin/invites_spec.rb
new file mode 100644
index 0000000000..c027fd30cf
--- /dev/null
+++ b/spec/requests/admin/invites_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Invites' do
+  describe 'POST /admin/invites' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_invites_path(invite: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/ip_blocks_spec.rb b/spec/requests/admin/ip_blocks_spec.rb
new file mode 100644
index 0000000000..e74961aa3c
--- /dev/null
+++ b/spec/requests/admin/ip_blocks_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin IP Blocks' do
+  describe 'POST /admin/ip_blocks' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_ip_blocks_path(ip_block: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+
+  describe 'POST /admin/ip_blocks/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_ip_blocks_path(form_ip_block_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_ip_blocks_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/relays_spec.rb b/spec/requests/admin/relays_spec.rb
new file mode 100644
index 0000000000..5dcdfe9892
--- /dev/null
+++ b/spec/requests/admin/relays_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Relays' do
+  describe 'POST /admin/relays' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_relays_path(relay: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/report_notes_spec.rb b/spec/requests/admin/report_notes_spec.rb
new file mode 100644
index 0000000000..170648a714
--- /dev/null
+++ b/spec/requests/admin/report_notes_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Report Notes' do
+  describe 'POST /admin/report_notes' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_report_notes_path(report_note: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/roles_spec.rb b/spec/requests/admin/roles_spec.rb
new file mode 100644
index 0000000000..785da5a0ff
--- /dev/null
+++ b/spec/requests/admin/roles_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Roles' do
+  describe 'POST /admin/roles' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_roles_path(user_role: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/rules_spec.rb b/spec/requests/admin/rules_spec.rb
new file mode 100644
index 0000000000..9382b38e59
--- /dev/null
+++ b/spec/requests/admin/rules_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Rules' do
+  describe 'POST /admin/rules' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_rules_path(rule: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/settings/about_spec.rb b/spec/requests/admin/settings/about_spec.rb
new file mode 100644
index 0000000000..28be2c252d
--- /dev/null
+++ b/spec/requests/admin/settings/about_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Settings About' do
+  describe 'PUT /admin/settings/about' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_settings_about_path(form_admin_settings: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/statuses_spec.rb b/spec/requests/admin/statuses_spec.rb
new file mode 100644
index 0000000000..9fa732e178
--- /dev/null
+++ b/spec/requests/admin/statuses_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Statuses' do
+  describe 'POST /admin/accounts/:account_id/statuses/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:account) { Fabricate :account }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_account_statuses_path(account.id, admin_status_batch_action: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_account_statuses_path(account.id))
+    end
+  end
+end
diff --git a/spec/requests/admin/tags_spec.rb b/spec/requests/admin/tags_spec.rb
new file mode 100644
index 0000000000..653c5bd935
--- /dev/null
+++ b/spec/requests/admin/tags_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Tags' do
+  describe 'PUT /admin/tags/:id' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:tag) { Fabricate :tag }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_tag_path(tag.id, tag: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/terms_of_service/drafts_spec.rb b/spec/requests/admin/terms_of_service/drafts_spec.rb
new file mode 100644
index 0000000000..2c3c77193e
--- /dev/null
+++ b/spec/requests/admin/terms_of_service/drafts_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Terms Drafts' do
+  describe 'PUT /admin/terms_of_service/draft' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_terms_of_service_draft_path(terms_of_service: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/terms_of_service/generates_spec.rb b/spec/requests/admin/terms_of_service/generates_spec.rb
new file mode 100644
index 0000000000..b8c51fdf2c
--- /dev/null
+++ b/spec/requests/admin/terms_of_service/generates_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Terms Generates' do
+  describe 'POST /admin/terms_of_service/generates' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_terms_of_service_generate_path(terms_of_service_generator: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/trends/links/preview_card_providers_spec.rb b/spec/requests/admin/trends/links/preview_card_providers_spec.rb
new file mode 100644
index 0000000000..69bf479c68
--- /dev/null
+++ b/spec/requests/admin/trends/links/preview_card_providers_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Links Preview Card Providers' do
+  describe 'POST /admin/trends/links/publishers/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_trends_links_preview_card_providers_path(trends_preview_card_provider_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_trends_links_preview_card_providers_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/trends/links_spec.rb b/spec/requests/admin/trends/links_spec.rb
new file mode 100644
index 0000000000..9fbfd56704
--- /dev/null
+++ b/spec/requests/admin/trends/links_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Links' do
+  describe 'POST /admin/trends/links/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_trends_links_path(trends_preview_card_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_trends_links_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/trends/statuses_spec.rb b/spec/requests/admin/trends/statuses_spec.rb
new file mode 100644
index 0000000000..ceae24ec8f
--- /dev/null
+++ b/spec/requests/admin/trends/statuses_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Statuses' do
+  describe 'POST /admin/trends/statuses/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_trends_statuses_path(trends_status_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_trends_statuses_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/trends/tags_spec.rb b/spec/requests/admin/trends/tags_spec.rb
new file mode 100644
index 0000000000..e505be7a19
--- /dev/null
+++ b/spec/requests/admin/trends/tags_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Tags' do
+  describe 'POST /admin/trends/tags/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_trends_tags_path(trends_tag_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_trends_tags_path)
+    end
+  end
+end
diff --git a/spec/requests/admin/users/roles_spec.rb b/spec/requests/admin/users/roles_spec.rb
new file mode 100644
index 0000000000..b39e3f8bae
--- /dev/null
+++ b/spec/requests/admin/users/roles_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Users Roles' do
+  describe 'PUT /admin/users/:user_id/role' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:user) { Fabricate :user }
+
+    it 'gracefully handles invalid nested params' do
+      put admin_user_role_path(user.id, user: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/warning_presets_spec.rb b/spec/requests/admin/warning_presets_spec.rb
new file mode 100644
index 0000000000..6527cec30f
--- /dev/null
+++ b/spec/requests/admin/warning_presets_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Warning Presets' do
+  describe 'POST /admin/warning_presets' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_warning_presets_path(account_warning_preset: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/admin/webhooks_spec.rb b/spec/requests/admin/webhooks_spec.rb
new file mode 100644
index 0000000000..fe047abd3c
--- /dev/null
+++ b/spec/requests/admin/webhooks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Webhooks' do
+  describe 'POST /admin/webhooks' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_webhooks_path(webhook: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 15d469d7a9..f2b457705e 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -107,6 +107,13 @@ RSpec.describe 'API V1 Push Subscriptions' do
 
       it_behaves_like 'validation error'
     end
+
+    it 'gracefully handles invalid nested params' do
+      post api_v1_push_subscription_path, params: { subscription: 'invalid' }, headers: headers
+
+      expect(response)
+        .to have_http_status(400)
+    end
   end
 
   describe 'PUT /api/v1/push/subscription' do
@@ -133,6 +140,13 @@ RSpec.describe 'API V1 Push Subscriptions' do
           policy: alerts_payload[:data][:policy]
         )
     end
+
+    it 'gracefully handles invalid nested params' do
+      put api_v1_push_subscription_path(endpoint_push_subscription), params: { data: 'invalid' }, headers: headers
+
+      expect(response)
+        .to have_http_status(400)
+    end
   end
 
   describe 'GET /api/v1/push/subscription' do
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index bdccfdb626..788d30fa69 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe 'Instances' do
             description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH
           ),
           polls: include(
-            max_options: PollValidator::MAX_OPTIONS
+            max_options: PollOptionsValidator::MAX_OPTIONS
           )
         )
       )
diff --git a/spec/requests/api/v2/notifications_spec.rb b/spec/requests/api/v2/notifications_spec.rb
index aa4a861557..b2f6d71b51 100644
--- a/spec/requests/api/v2/notifications_spec.rb
+++ b/spec/requests/api/v2/notifications_spec.rb
@@ -153,7 +153,7 @@ RSpec.describe 'Notifications' do
         it 'returns a notification group covering all notifications' do
           subject
 
-          notification_ids = user.account.notifications.reload.pluck(:id)
+          notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
 
           expect(response).to have_http_status(200)
           expect(response.content_type)
@@ -175,7 +175,7 @@ RSpec.describe 'Notifications' do
         it 'returns a notification group covering all notifications' do
           subject
 
-          notification_ids = user.account.notifications.reload.pluck(:id)
+          notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
 
           expect(response).to have_http_status(200)
           expect(response.content_type)
diff --git a/spec/requests/api/web/push_subscriptions_spec.rb b/spec/requests/api/web/push_subscriptions_spec.rb
index a903dc6f89..42545b3d6e 100644
--- a/spec/requests/api/web/push_subscriptions_spec.rb
+++ b/spec/requests/api/web/push_subscriptions_spec.rb
@@ -52,4 +52,28 @@ RSpec.describe 'API Web Push Subscriptions' do
       end
     end
   end
+
+  describe 'POST /api/web/push_subscriptions' do
+    before { sign_in Fabricate :user }
+
+    it 'gracefully handles invalid nested params' do
+      post api_web_push_subscriptions_path, params: { subscription: 'invalid' }
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+
+  describe 'PUT /api/web/push_subscriptions' do
+    before { sign_in Fabricate :user }
+
+    let(:subscription) { Fabricate :web_push_subscription }
+
+    it 'gracefully handles invalid nested params' do
+      put api_web_push_subscription_path(subscription), params: { data: 'invalid' }
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
 end
diff --git a/spec/requests/auth/challenges_spec.rb b/spec/requests/auth/challenges_spec.rb
index 628bfe499b..8769216657 100644
--- a/spec/requests/auth/challenges_spec.rb
+++ b/spec/requests/auth/challenges_spec.rb
@@ -33,5 +33,14 @@ RSpec.describe 'Auth Challenges' do
           .to be_nil
       end
     end
+
+    context 'with invalid params' do
+      it 'gracefully handles invalid nested params' do
+        post auth_challenge_path(form_challenge: 'invalid')
+
+        expect(response)
+          .to have_http_status(400)
+      end
+    end
   end
 end
diff --git a/spec/requests/auth/passwords_spec.rb b/spec/requests/auth/passwords_spec.rb
new file mode 100644
index 0000000000..feefd94587
--- /dev/null
+++ b/spec/requests/auth/passwords_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Passwords' do
+  describe 'GET /auth/password/edit' do
+    context 'with invalid reset_password_token' do
+      it 'redirects to #new' do
+        get edit_user_password_path, params: { reset_password_token: 'some_invalid_value' }
+
+        expect(response)
+          .to redirect_to new_user_password_path
+      end
+    end
+  end
+
+  describe 'PUT /auth/password' do
+    let(:user) { Fabricate(:user) }
+    let(:password) { 'reset0password' }
+
+    context 'with invalid reset_password_token' do
+      it 'renders reset password and retains password' do
+        put user_password_path, params: { user: { password: password, password_confirmation: password, reset_password_token: 'some_invalid_value' } }
+
+        expect(response.body)
+          .to include(I18n.t('auth.set_new_password'))
+
+        expect(User.find(user.id))
+          .to be_present
+          .and be_external_or_valid_password(user.password)
+      end
+    end
+  end
+end
diff --git a/spec/requests/auth/sessions_spec.rb b/spec/requests/auth/sessions_spec.rb
new file mode 100644
index 0000000000..246c3794cc
--- /dev/null
+++ b/spec/requests/auth/sessions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Sessions' do
+  describe 'POST /auth/sign_in' do
+    # The rack-attack check has issues with the non-nested invalid param used here
+    before { Rack::Attack.enabled = false }
+    after { Rack::Attack.enabled = true }
+
+    it 'gracefully handles invalid nested params' do
+      post user_session_path(user: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/auth/setup_spec.rb b/spec/requests/auth/setup_spec.rb
index fa3c196805..72413e1740 100644
--- a/spec/requests/auth/setup_spec.rb
+++ b/spec/requests/auth/setup_spec.rb
@@ -24,4 +24,15 @@ RSpec.describe 'Auth Setup' do
       end
     end
   end
+
+  describe 'PUT /auth/setup' do
+    before { sign_in Fabricate(:user, confirmed_at: nil) }
+
+    it 'gracefully handles invalid nested params' do
+      put '/auth/setup?user=invalid'
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
 end
diff --git a/spec/requests/disputes/appeals_spec.rb b/spec/requests/disputes/appeals_spec.rb
new file mode 100644
index 0000000000..4eff09c800
--- /dev/null
+++ b/spec/requests/disputes/appeals_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Disputes Appeals' do
+  describe 'POST /disputes/appeals' do
+    before { sign_in strike.target_account.user }
+
+    let(:strike) { Fabricate :account_warning }
+
+    it 'gracefully handles invalid nested params' do
+      post disputes_strike_appeal_path(strike, appeal: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/filters/statuses_spec.rb b/spec/requests/filters/statuses_spec.rb
new file mode 100644
index 0000000000..aa1d049da7
--- /dev/null
+++ b/spec/requests/filters/statuses_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Filters Statuses' do
+  describe 'POST /filters/:filter_id/statuses/batch' do
+    before { sign_in(user) }
+
+    let(:filter) { Fabricate :custom_filter, account: user.account }
+    let(:user) { Fabricate :user }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_filter_statuses_path(filter.id, form_status_filter_batch_action: 'invalid')
+
+      expect(response)
+        .to redirect_to(edit_filter_path(filter))
+    end
+  end
+end
diff --git a/spec/requests/filters_spec.rb b/spec/requests/filters_spec.rb
index a7b2eddc1b..e9d7436b0b 100644
--- a/spec/requests/filters_spec.rb
+++ b/spec/requests/filters_spec.rb
@@ -13,4 +13,28 @@ RSpec.describe 'Filters' do
       end
     end
   end
+
+  describe 'POST /filters' do
+    before { sign_in Fabricate :user }
+
+    it 'gracefully handles invalid nested params' do
+      post filters_path(custom_filter: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+
+  describe 'PUT /filters/:id' do
+    before { sign_in(filter.account.user) }
+
+    let(:filter) { Fabricate :custom_filter }
+
+    it 'gracefully handles invalid nested params' do
+      put filter_path(filter, custom_filter: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
 end
diff --git a/spec/requests/invites_spec.rb b/spec/requests/invites_spec.rb
index 8a5ad2ccd1..2fc0161c8c 100644
--- a/spec/requests/invites_spec.rb
+++ b/spec/requests/invites_spec.rb
@@ -28,4 +28,13 @@ RSpec.describe 'Invites' do
       end
     end
   end
+
+  describe 'POST /invites' do
+    it 'gracefully handles invalid nested params' do
+      post invites_path(invite: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
 end
diff --git a/spec/requests/relationships_spec.rb b/spec/requests/relationships_spec.rb
new file mode 100644
index 0000000000..ee6b321c46
--- /dev/null
+++ b/spec/requests/relationships_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Relationships' do
+  describe 'PUT /relationships' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put relationships_path(form_account_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(relationships_path)
+    end
+  end
+end
diff --git a/spec/requests/settings/aliases_spec.rb b/spec/requests/settings/aliases_spec.rb
new file mode 100644
index 0000000000..6d905aa4c6
--- /dev/null
+++ b/spec/requests/settings/aliases_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Aliases' do
+  describe 'POST /settings/aliases' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      post settings_aliases_path(account_alias: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/applications_spec.rb b/spec/requests/settings/applications_spec.rb
index 8a5b3de895..d2d91f03b1 100644
--- a/spec/requests/settings/applications_spec.rb
+++ b/spec/requests/settings/applications_spec.rb
@@ -40,5 +40,23 @@ RSpec.describe 'Settings / Exports' do
       expect(response)
         .to redirect_to(settings_applications_path)
     end
+
+    it 'gracefully handles invalid nested params' do
+      post settings_applications_path(doorkeeper_application: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+
+  describe 'PUT /settings/applications/:id' do
+    let(:application) { Fabricate :application, owner: user }
+
+    it 'gracefully handles invalid nested params' do
+      put settings_application_path(application.id, doorkeeper_application: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
   end
 end
diff --git a/spec/requests/settings/deletes_spec.rb b/spec/requests/settings/deletes_spec.rb
new file mode 100644
index 0000000000..4563f639d5
--- /dev/null
+++ b/spec/requests/settings/deletes_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Deletes' do
+  describe 'DELETE /settings/delete' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      delete settings_delete_path(form_delete_confirmation: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/featured_tags_spec.rb b/spec/requests/settings/featured_tags_spec.rb
new file mode 100644
index 0000000000..2c7f907e80
--- /dev/null
+++ b/spec/requests/settings/featured_tags_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Aliases' do
+  describe 'POST /settings/featured_tags' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      post settings_featured_tags_path(featured_tag: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/imports_spec.rb b/spec/requests/settings/imports_spec.rb
new file mode 100644
index 0000000000..e2051e015f
--- /dev/null
+++ b/spec/requests/settings/imports_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Imports' do
+  describe 'POST /settings/imports' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      post settings_imports_path(form_import: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/migration/redirects_spec.rb b/spec/requests/settings/migration/redirects_spec.rb
new file mode 100644
index 0000000000..f417fbb0b2
--- /dev/null
+++ b/spec/requests/settings/migration/redirects_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Migration Redirects' do
+  describe 'POST /settings/migration/redirect' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      post settings_migration_redirect_path(form_redirect: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/migrations_spec.rb b/spec/requests/settings/migrations_spec.rb
index 4103d6b320..0aca7fde5b 100644
--- a/spec/requests/settings/migrations_spec.rb
+++ b/spec/requests/settings/migrations_spec.rb
@@ -18,4 +18,15 @@ RSpec.describe 'Settings Migrations' do
       it { is_expected.to redirect_to new_user_session_path }
     end
   end
+
+  context 'when user is signed in' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      post settings_migration_path(account_migration: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
 end
diff --git a/spec/requests/settings/preferences/appearance_spec.rb b/spec/requests/settings/preferences/appearance_spec.rb
new file mode 100644
index 0000000000..cfdc4dafc9
--- /dev/null
+++ b/spec/requests/settings/preferences/appearance_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Preferences Appearance' do
+  describe 'PUT /settings/preferences/appearance' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put settings_preferences_appearance_path(user: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/privacy_spec.rb b/spec/requests/settings/privacy_spec.rb
new file mode 100644
index 0000000000..d02b534b74
--- /dev/null
+++ b/spec/requests/settings/privacy_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Privacy' do
+  describe 'PUT /settings/privacy' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put settings_privacy_path(account: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/profiles_spec.rb b/spec/requests/settings/profiles_spec.rb
new file mode 100644
index 0000000000..a19f321f14
--- /dev/null
+++ b/spec/requests/settings/profiles_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Profiles' do
+  describe 'PUT /settings/profile' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put settings_profile_path(account: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/two_factor_authentication/confirmations_spec.rb b/spec/requests/settings/two_factor_authentication/confirmations_spec.rb
new file mode 100644
index 0000000000..bf443a5e62
--- /dev/null
+++ b/spec/requests/settings/two_factor_authentication/confirmations_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings 2FA Confirmations' do
+  describe 'POST /settings/two_factor_authentication/confirmations' do
+    before do
+      sign_in Fabricate(:user, encrypted_password: '') # Empty encrypted password avoids challengable flow
+      post settings_otp_authentication_path # Sets `session[:new_otp_secret]` which is needed for next step
+    end
+
+    it 'gracefully handles invalid nested params' do
+      post settings_two_factor_authentication_confirmation_path(form_two_factor_confirmation: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/settings/verifications_spec.rb b/spec/requests/settings/verifications_spec.rb
new file mode 100644
index 0000000000..5acfe64836
--- /dev/null
+++ b/spec/requests/settings/verifications_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Verifications' do
+  describe 'PUT /settings/verification' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put settings_verification_path(account: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/statuses_cleanup_spec.rb b/spec/requests/statuses_cleanup_spec.rb
new file mode 100644
index 0000000000..17a1c190ad
--- /dev/null
+++ b/spec/requests/statuses_cleanup_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Statuses Cleanup' do
+  describe 'PUT /statuses_cleanup' do
+    before { sign_in Fabricate(:user) }
+
+    it 'gracefully handles invalid nested params' do
+      put statuses_cleanup_path(account_statuses_cleanup_policy: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+  end
+end
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index aeff56aebf..b4aeb65320 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -116,19 +116,13 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
       perform_request!
     end
 
-    it 'returns http success' do
+    it 'returns http success with expect headers and media type' 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 internal account' do
       expect(response.parsed_body)
         .to include(
           subject: 'acct:mastodon.internal@cb6e6126.ngrok.io',
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 1a8ea2d170..caaca2fe7c 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -268,7 +268,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
 
       it 'updates tags and featured tags' do
         expect { subject.call(status, json, json) }
-          .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar))
+          .to change { status.tags.reload.pluck(:name) }.from(contain_exactly('test', 'foo')).to(contain_exactly('foo', 'bar'))
           .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
           .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
           .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present)
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 935b94c709..9d9d4eed3d 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -319,6 +319,16 @@ RSpec.describe NotifyService do
           end
         end
 
+        context 'when sender is a moderator' do
+          let(:sender_role) { Fabricate(:user_role, highlighted: true, permissions: UserRole::FLAGS[:manage_users]) }
+          let(:sender) { Fabricate(:user, role: sender_role).account }
+          let(:activity) { Fabricate(:mention, status: Fabricate(:status, account: sender)) }
+
+          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)
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 9b2c6c280f..8019ffadda 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -7,31 +7,69 @@ RSpec.describe PrecomputeFeedService do
 
   describe 'call' do
     let(:account) { Fabricate(:account) }
+    let!(:list) { Fabricate(:list, account: account, exclusive: false) }
 
-    it 'fills a user timeline with statuses' do
-      account = Fabricate(:account)
-      status = Fabricate(:status, account: account)
+    context 'when no eligible status exist' do
+      it 'raises no error and results in an empty timeline' do
+        expect { subject.call(account) }.to_not raise_error
 
-      subject.call(account)
-
-      expect(redis.zscore(FeedManager.instance.key(:home, account.id), status.id)).to be_within(0.1).of(status.id.to_f)
+        expect(redis.zcard(FeedManager.instance.key(:home, account.id))).to eq(0)
+      end
     end
 
-    it 'does not raise an error even if it could not find any status' do
-      account = Fabricate(:account)
-      expect { subject.call(account) }.to_not raise_error
-    end
+    context 'with eligible statuses' do
+      let(:muted_account) { Fabricate(:account) }
+      let!(:followed_account) { Fabricate(:account) }
+      let!(:requested_account) { Fabricate(:account) }
+      let!(:own_status) { Fabricate(:status, account: account) }
+      let!(:followed_status) { Fabricate(:status, account: followed_account) }
+      let!(:unreadable_dm_from_followed) { Fabricate(:status, account: followed_account, visibility: :direct) }
+      let!(:requested_status) { Fabricate(:status, account: requested_account) }
+      let!(:muted_status) { Fabricate(:status, account: muted_account) }
+      let!(:muted_reblog) { Fabricate(:status, account: followed_account, reblog: muted_status) }
+      let!(:known_reply) { Fabricate(:status, account: followed_account, in_reply_to_id: own_status.id) }
+      let!(:unknown_reply) { Fabricate(:status, account: followed_account, in_reply_to_id: requested_status.id) }
+
+      before do
+        account.follow!(followed_account)
+        account.request_follow!(requested_account)
+        account.mute!(muted_account)
+
+        AddAccountsToListService.new.call(list, [followed_account])
+      end
+
+      it "fills a user's home and list timelines with the expected posts" do
+        subject.call(account)
+
+        home_timeline_ids = redis.zrevrangebyscore(FeedManager.instance.key(:home, account.id), '(+inf', '(-inf', limit: [0, 30], with_scores: true).map { |id| id.first.to_i }
+        list_timeline_ids = redis.zrevrangebyscore(FeedManager.instance.key(:list, list.id), '(+inf', '(-inf', limit: [0, 30], with_scores: true).map { |id| id.first.to_i }
+
+        expect(home_timeline_ids).to include(
+          own_status.id,
+          followed_status.id,
+          known_reply.id
+        )
 
-    it 'filters statuses' do
-      account = Fabricate(:account)
-      muted_account = Fabricate(:account)
-      Fabricate(:mute, account: account, target_account: muted_account)
-      reblog = Fabricate(:status, account: muted_account)
-      Fabricate(:status, account: account, reblog: reblog)
+        expect(list_timeline_ids).to include(
+          followed_status.id
+        )
 
-      subject.call(account)
+        expect(home_timeline_ids).to_not include(
+          requested_status.id,
+          unknown_reply.id,
+          unreadable_dm_from_followed.id,
+          muted_status.id,
+          muted_reblog.id
+        )
 
-      expect(redis.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to be_nil
+        expect(list_timeline_ids).to_not include(
+          requested_status.id,
+          unknown_reply.id,
+          unreadable_dm_from_followed.id,
+          muted_status.id,
+          muted_reblog.id
+        )
+      end
     end
   end
 end
diff --git a/spec/support/domain_helpers.rb b/spec/support/domain_helpers.rb
index 9977702099..051cdaa7d2 100644
--- a/spec/support/domain_helpers.rb
+++ b/spec/support/domain_helpers.rb
@@ -28,6 +28,25 @@ module DomainHelpers
       .and_yield(resolver)
   end
 
+  def configure_dns(domain:, results:)
+    resolver = instance_double(Resolv::DNS, :timeouts= => nil)
+
+    allow(resolver).to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::MX)
+      .and_return(results)
+    allow(resolver)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::A)
+      .and_return(results)
+    allow(resolver)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::AAAA)
+      .and_return(results)
+    allow(Resolv::DNS)
+      .to receive(:open)
+      .and_yield(resolver)
+  end
+
   private
 
   def double_mx(exchange)
diff --git a/spec/system/admin/email_domain_blocks_spec.rb b/spec/system/admin/email_domain_blocks_spec.rb
index 807cfb3768..e88811ac49 100644
--- a/spec/system/admin/email_domain_blocks_spec.rb
+++ b/spec/system/admin/email_domain_blocks_spec.rb
@@ -7,6 +7,43 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
 
   before { sign_in current_user }
 
+  describe 'Managing email domain blocks' do
+    before { configure_dns(domain: 'example.com', results: []) }
+
+    let!(:email_domain_block) { Fabricate :email_domain_block }
+
+    it 'views and creates new blocks' do
+      visit admin_email_domain_blocks_path
+      expect(page)
+        .to have_content(I18n.t('admin.email_domain_blocks.title'))
+        .and have_content(email_domain_block.domain)
+
+      click_on I18n.t('admin.email_domain_blocks.add_new')
+      expect(page)
+        .to have_content(I18n.t('admin.email_domain_blocks.new.title'))
+
+      fill_in I18n.t('admin.email_domain_blocks.domain'), with: 'example.com'
+      expect { submit_resolve }
+        .to_not change(EmailDomainBlock, :count)
+      expect(page)
+        .to have_content(I18n.t('admin.email_domain_blocks.new.title'))
+
+      expect { submit_create }
+        .to change(EmailDomainBlock.where(domain: 'example.com'), :count).by(1)
+      expect(page)
+        .to have_content(I18n.t('admin.email_domain_blocks.title'))
+        .and have_content(I18n.t('admin.email_domain_blocks.created_msg'))
+    end
+
+    def submit_resolve
+      click_on I18n.t('admin.email_domain_blocks.new.resolve')
+    end
+
+    def submit_create
+      click_on I18n.t('admin.email_domain_blocks.new.create')
+    end
+  end
+
   describe 'Performing batch updates' do
     before do
       visit admin_email_domain_blocks_path
diff --git a/spec/system/admin/reports_spec.rb b/spec/system/admin/reports_spec.rb
new file mode 100644
index 0000000000..90845a02f7
--- /dev/null
+++ b/spec/system/admin/reports_spec.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Reports' do
+  let(:user) { Fabricate(:admin_user) }
+
+  before { sign_in(user) }
+
+  describe 'Viewing existing reports' do
+    let!(:unresolved_report) { Fabricate(:report, action_taken_at: nil, comment: 'First report') }
+    let!(:resolved_report) { Fabricate(:report, action_taken_at: Time.now.utc, comment: 'Second report') }
+    let!(:report_note) { Fabricate :report_note, report: resolved_report, content: 'Note about resolved report' }
+
+    it 'Shows basic report details' do
+      visit admin_reports_path
+
+      expect(page)
+        .to have_content(unresolved_report.comment)
+        .and have_no_content(resolved_report.comment)
+
+      click_on I18n.t('admin.reports.resolved')
+      expect(page)
+        .to have_content(resolved_report.comment)
+        .and have_no_content(unresolved_report.comment)
+
+      click_on resolved_report.comment
+      expect(page)
+        .to have_title(I18n.t('admin.reports.report', id: resolved_report.id))
+        .and have_content(resolved_report.comment)
+        .and have_content(report_note.content)
+    end
+  end
+
+  describe 'Resolving reports' do
+    let!(:report) { Fabricate :report }
+
+    it 'resolves an open report' do
+      visit admin_report_path(report)
+      within '.content__heading__actions' do
+        click_on I18n.t('admin.reports.mark_as_resolved')
+      end
+
+      expect(page)
+        .to have_title(I18n.t('admin.reports.title'))
+        .and have_content(I18n.t('admin.reports.resolved_msg'))
+
+      report.reload
+      expect(report.action_taken_by_account)
+        .to eq user.account
+      expect(report)
+        .to be_action_taken
+      expect(last_action_log.target)
+        .to eq(report)
+    end
+  end
+
+  describe 'Reopening reports' do
+    let!(:report) { Fabricate :report, action_taken_at: 3.days.ago }
+
+    it 'reopens a resolved report' do
+      visit admin_report_path(report)
+      within '.content__heading__actions' do
+        click_on I18n.t('admin.reports.mark_as_unresolved')
+      end
+
+      expect(page)
+        .to have_title(I18n.t('admin.reports.report', id: report.id))
+
+      report.reload
+      expect(report.action_taken_by_account)
+        .to be_nil
+      expect(report)
+        .to_not be_action_taken
+      expect(last_action_log.target)
+        .to eq(report)
+    end
+  end
+
+  describe 'Assigning reports' do
+    let!(:report) { Fabricate :report }
+
+    it 'assigns report to user and then unassigns' do
+      visit admin_report_path(report)
+
+      click_on I18n.t('admin.reports.assign_to_self')
+
+      expect(page)
+        .to have_title(I18n.t('admin.reports.report', id: report.id))
+      report.reload
+      expect(report.assigned_account)
+        .to eq user.account
+      expect(last_action_log.target)
+        .to eq(report)
+
+      click_on I18n.t('admin.reports.unassign')
+      expect(page)
+        .to have_title(I18n.t('admin.reports.report', id: report.id))
+      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/system/auth/passwords_spec.rb b/spec/system/auth/passwords_spec.rb
new file mode 100644
index 0000000000..42733b2521
--- /dev/null
+++ b/spec/system/auth/passwords_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Passwords' do
+  let(:user) { Fabricate :user }
+  let!(:session_activation) { Fabricate(:session_activation, user: user) }
+  let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
+  let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
+
+  describe 'Resetting a password', :inline_jobs do
+    let(:new_password) { 'New.Pass.123' }
+
+    before { allow(Devise).to receive(:pam_authentication).and_return(false) } # Avoid the "seamless external" path
+
+    it 'initiates reset, sends link, resets password from form, clears data' do
+      visit new_user_password_path
+      expect(page)
+        .to have_title(I18n.t('auth.reset_password'))
+
+      submit_email_reset
+      expect(page)
+        .to have_title(I18n.t('auth.set_new_password'))
+
+      set_new_password
+      expect(page)
+        .to have_title(I18n.t('auth.login'))
+
+      # Change password
+      expect(User.find(user.id))
+        .to be_present
+        .and be_valid_password(new_password)
+
+      # Deactivate session
+      expect(user_session_count)
+        .to eq(0)
+      expect { session_activation.reload }
+        .to raise_error(ActiveRecord::RecordNotFound)
+
+      # Revoke tokens
+      expect(user_token_count)
+        .to eq(0)
+
+      # Remove push subs
+      expect(push_subs_count)
+        .to eq(0)
+      expect { web_push_subscription.reload }
+        .to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    def submit_email_reset
+      fill_in 'user_email', with: user.email
+      click_on I18n.t('auth.reset_password')
+      open_last_email
+      visit_in_email(I18n.t('devise.mailer.reset_password_instructions.action'))
+    end
+
+    def set_new_password
+      fill_in 'user_password', with: new_password
+      fill_in 'user_password_confirmation', with: new_password
+      click_on I18n.t('auth.set_new_password')
+    end
+
+    def user_session_count
+      user
+        .session_activations
+        .count
+    end
+
+    def user_token_count
+      Doorkeeper::AccessToken
+        .active_for(user)
+        .count
+    end
+
+    def push_subs_count
+      Web::PushSubscription
+        .where(user: user)
+        .or(Web::PushSubscription.where(access_token: access_token))
+        .count
+    end
+  end
+end
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index e681c6940e..0af4e86009 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -44,6 +44,8 @@ RSpec.describe 'Filters' do
     let(:new_title) { 'Change title value' }
 
     let!(:custom_filter) { Fabricate :custom_filter, account: user.account, title: filter_title }
+    let!(:keyword_one) { Fabricate :custom_filter_keyword, custom_filter: custom_filter }
+    let!(:keyword_two) { Fabricate :custom_filter_keyword, custom_filter: custom_filter }
 
     it 'Updates the saved filter' do
       navigate_to_filters
@@ -51,7 +53,12 @@ RSpec.describe 'Filters' do
       click_on filter_title
 
       fill_in filter_title_field, with: new_title
-      click_on submit_button
+      fill_in 'custom_filter_keywords_attributes_0_keyword', with: 'New value'
+      fill_in 'custom_filter_keywords_attributes_1_keyword', with: 'Wilderness'
+
+      expect { click_on submit_button }
+        .to change { keyword_one.reload.keyword }.to(/New value/)
+        .and(change { keyword_two.reload.keyword }.to(/Wilderness/))
 
       expect(page).to have_content(new_title)
     end
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index fc816b6dba..0f9f6575ea 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -26,8 +26,8 @@ RSpec.describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
       end
     end
 
-    click_on('Detect text from picture')
+    click_on('Add text from image')
 
-    expect(page).to have_css('#upload-modal__description', text: /Hello Mastodon\s*/, wait: 10)
+    expect(page).to have_css('#description', text: /Hello Mastodon\s*/, wait: 10)
   end
 end
diff --git a/spec/system/profile_spec.rb b/spec/system/profile_spec.rb
index a05a146fef..f9449b52c3 100644
--- a/spec/system/profile_spec.rb
+++ b/spec/system/profile_spec.rb
@@ -5,8 +5,6 @@ require 'rails_helper'
 RSpec.describe 'Profile' do
   include ProfileStories
 
-  subject { page }
-
   let(:local_domain) { Rails.configuration.x.local_domain }
 
   before do
@@ -17,7 +15,8 @@ RSpec.describe 'Profile' do
   it 'I can view public account page for Alice' do
     visit account_path('alice')
 
-    expect(subject).to have_title("alice (@alice@#{local_domain})")
+    expect(page)
+      .to have_title("alice (@alice@#{local_domain})")
   end
 
   it 'I can change my account' do
@@ -26,8 +25,31 @@ RSpec.describe 'Profile' do
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
 
+    fill_in 'account_fields_attributes_0_name', with: 'Personal Website'
+    fill_in 'account_fields_attributes_0_value', with: 'https://host.example/personal'
+
+    fill_in 'account_fields_attributes_1_name', with: 'Professional Biography'
+    fill_in 'account_fields_attributes_1_value', with: 'https://host.example/pro'
+
+    expect { submit_form }
+      .to change { bob.account.reload.display_name }.to('Bob')
+      .and(change_account_fields)
+    expect(page)
+      .to have_content 'Changes successfully saved!'
+  end
+
+  def submit_form
     first('button[type=submit]').click
+  end
 
-    expect(subject).to have_content 'Changes successfully saved!'
+  def change_account_fields
+    change { bob.account.reload.fields }
+      .from([])
+      .to(
+        contain_exactly(
+          be_a(Account::Field),
+          be_a(Account::Field)
+        )
+      )
   end
 end
diff --git a/spec/system/settings/applications_spec.rb b/spec/system/settings/applications_spec.rb
index ee43da3d5d..737014f42e 100644
--- a/spec/system/settings/applications_spec.rb
+++ b/spec/system/settings/applications_spec.rb
@@ -38,6 +38,9 @@ RSpec.describe 'Settings applications page' do
       expect(page)
         .to have_content(I18n.t('doorkeeper.applications.index.title'))
         .and have_content('My new app')
+        .and have_content('read')
+        .and have_content('write')
+        .and have_content('follow')
     end
 
     it 'does not save with invalid form values' do
@@ -73,10 +76,12 @@ RSpec.describe 'Settings applications page' do
 
       fill_in form_app_name_label,
               with: 'My new app name with a new value'
+      check 'push', id: :doorkeeper_application_scopes_push
       submit_form
 
       expect(page)
         .to have_content('My new app name with a new value')
+        .and have_checked_field('push', id: :doorkeeper_application_scopes_push)
     end
 
     it 'does not update with wrong values' do
diff --git a/spec/system/settings/preferences/appearance_spec.rb b/spec/system/settings/preferences/appearance_spec.rb
index 0b6f1e4b15..32085e2af0 100644
--- a/spec/system/settings/preferences/appearance_spec.rb
+++ b/spec/system/settings/preferences/appearance_spec.rb
@@ -17,10 +17,13 @@ RSpec.describe 'Settings preferences appearance page' do
     check confirm_reblog_field
     uncheck confirm_delete_field
 
+    check advanced_layout_field
+
     expect { save_changes }
       .to change { user.reload.settings.theme }.to('contrast')
       .and change { user.reload.settings['web.reblog_modal'] }.to(true)
-      .and(change { user.reload.settings['web.delete_modal'] }.to(false))
+      .and change { user.reload.settings['web.delete_modal'] }.to(false)
+      .and(change { user.reload.settings['web.advanced_layout'] }.to(true))
     expect(page)
       .to have_title(I18n.t('settings.appearance'))
   end
@@ -40,4 +43,8 @@ RSpec.describe 'Settings preferences appearance page' do
   def theme_selection_field
     I18n.t('simple_form.labels.defaults.setting_theme')
   end
+
+  def advanced_layout_field
+    I18n.t('simple_form.labels.defaults.setting_advanced_layout')
+  end
 end
diff --git a/spec/validators/poll_validator_spec.rb b/spec/validators/poll_expiration_validator_spec.rb
similarity index 64%
rename from spec/validators/poll_validator_spec.rb
rename to spec/validators/poll_expiration_validator_spec.rb
index f2a2534898..41b8c96211 100644
--- a/spec/validators/poll_validator_spec.rb
+++ b/spec/validators/poll_expiration_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PollValidator do
+RSpec.describe PollExpirationValidator do
   describe '#validate' do
     before do
       validator.validate(poll)
@@ -14,16 +14,24 @@ RSpec.describe PollValidator do
     let(:options) { %w(foo bar) }
     let(:expires_at) { 1.day.from_now }
 
-    it 'have no errors' do
+    it 'has no errors' do
       expect(errors).to_not have_received(:add)
     end
 
-    context 'when expires is just 5 min ago' do
+    context 'when the poll expires in 5 min from now' do
       let(:expires_at) { 5.minutes.from_now }
 
-      it 'not calls errors add' do
+      it 'has no errors' do
         expect(errors).to_not have_received(:add)
       end
     end
+
+    context 'when the poll expires in the past' do
+      let(:expires_at) { 5.minutes.ago }
+
+      it 'has errors' do
+        expect(errors).to have_received(:add)
+      end
+    end
   end
 end
diff --git a/spec/validators/poll_options_validator_spec.rb b/spec/validators/poll_options_validator_spec.rb
new file mode 100644
index 0000000000..9e4ec744db
--- /dev/null
+++ b/spec/validators/poll_options_validator_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PollOptionsValidator do
+  describe '#validate' do
+    before do
+      validator.validate(poll)
+    end
+
+    let(:validator) { described_class.new }
+    let(:poll) { instance_double(Poll, options: options, expires_at: expires_at, errors: errors) }
+    let(:errors) { instance_double(ActiveModel::Errors, add: nil) }
+    let(:options) { %w(foo bar) }
+    let(:expires_at) { 1.day.from_now }
+
+    it 'has no errors' do
+      expect(errors).to_not have_received(:add)
+    end
+
+    context 'when the poll has duplicate options' do
+      let(:options) { %w(foo foo) }
+
+      it 'adds errors' do
+        expect(errors).to have_received(:add)
+      end
+    end
+
+    context 'when the poll has no options' do
+      let(:options) { [] }
+
+      it 'adds errors' do
+        expect(errors).to have_received(:add)
+      end
+    end
+
+    context 'when the poll has too many options' do
+      let(:options) { Array.new(described_class::MAX_OPTIONS + 1) { |i| "option #{i}" } }
+
+      it 'adds errors' do
+        expect(errors).to have_received(:add)
+      end
+    end
+  end
+end
diff --git a/spec/workers/poll_expiration_notify_worker_spec.rb b/spec/workers/poll_expiration_notify_worker_spec.rb
index b3ccdd3d77..190630608c 100644
--- a/spec/workers/poll_expiration_notify_worker_spec.rb
+++ b/spec/workers/poll_expiration_notify_worker_spec.rb
@@ -33,15 +33,11 @@ RSpec.describe PollExpirationNotifyWorker do
       end
 
       context 'when poll is local' do
-        it 'notifies voters' do
+        it 'notifies voters, owner, and local voters' do
           expect(ActivityPub::DistributePollUpdateWorker).to have_enqueued_sidekiq_job(poll.status.id)
-        end
 
-        it 'notifies owner' do
           expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(poll.account.id, poll.id, 'Poll', 'poll')
-        end
 
-        it 'notifies local voters' do
           expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(poll_vote.account.id, poll.id, 'Poll', 'poll')
         end
       end
@@ -49,15 +45,11 @@ RSpec.describe PollExpirationNotifyWorker do
       context 'when poll is remote' do
         let(:remote?) { true }
 
-        it 'does not notify remote voters' do
+        it 'does not notify remote voters or owner, does notify local voters' do
           expect(ActivityPub::DistributePollUpdateWorker).to_not have_enqueued_sidekiq_job(poll.status.id)
-        end
 
-        it 'does not notify owner' do
           expect(LocalNotificationWorker).to_not have_enqueued_sidekiq_job(poll.account.id, poll.id, 'Poll', 'poll')
-        end
 
-        it 'notifies local voters' do
           expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(poll_vote.account.id, poll.id, 'Poll', 'poll')
         end
       end
diff --git a/spec/workers/publish_scheduled_status_worker_spec.rb b/spec/workers/publish_scheduled_status_worker_spec.rb
index 9365e8a4bc..a91e665965 100644
--- a/spec/workers/publish_scheduled_status_worker_spec.rb
+++ b/spec/workers/publish_scheduled_status_worker_spec.rb
@@ -13,11 +13,9 @@ RSpec.describe PublishScheduledStatusWorker do
     end
 
     context 'when the account is not disabled' do
-      it 'creates a status' do
+      it 'creates a status and removes scheduled record' do
         expect(scheduled_status.account.statuses.first.text).to eq 'Hello world, future!'
-      end
 
-      it 'removes the scheduled status' do
         expect(ScheduledStatus.find_by(id: scheduled_status.id)).to be_nil
       end
     end
@@ -25,11 +23,9 @@ RSpec.describe PublishScheduledStatusWorker do
     context 'when the account is disabled' do
       let(:scheduled_status) { Fabricate(:scheduled_status, account: Fabricate(:account, user: Fabricate(:user, disabled: true))) }
 
-      it 'does not create a status' do
+      it 'does not create a status and removes scheduled record' do
         expect(Status.count).to eq 0
-      end
 
-      it 'removes the scheduled status' do
         expect(ScheduledStatus.find_by(id: scheduled_status.id)).to be_nil
       end
     end
diff --git a/spec/workers/unfollow_follow_worker_spec.rb b/spec/workers/unfollow_follow_worker_spec.rb
index 7b9d49b902..2e05d1ca78 100644
--- a/spec/workers/unfollow_follow_worker_spec.rb
+++ b/spec/workers/unfollow_follow_worker_spec.rb
@@ -18,14 +18,11 @@ RSpec.describe UnfollowFollowWorker do
     let(:show_reblogs) { true }
 
     describe 'perform' do
-      it 'unfollows source account and follows target account' do
+      it 'unfollows source account and follows target account and preserves show_reblogs' do
         subject.perform(local_follower.id, source_account.id, target_account.id)
         expect(local_follower.following?(source_account)).to be false
         expect(local_follower.following?(target_account)).to be true
-      end
 
-      it 'preserves show_reblogs' do
-        subject.perform(local_follower.id, source_account.id, target_account.id)
         expect(Follow.find_by(account: local_follower, target_account: target_account).show_reblogs?).to be show_reblogs
       end
     end
@@ -35,14 +32,11 @@ RSpec.describe UnfollowFollowWorker do
     let(:show_reblogs) { false }
 
     describe 'perform' do
-      it 'unfollows source account and follows target account' do
+      it 'unfollows source account and follows target account and preserves show_reblogs' do
         subject.perform(local_follower.id, source_account.id, target_account.id)
         expect(local_follower.following?(source_account)).to be false
         expect(local_follower.following?(target_account)).to be true
-      end
 
-      it 'preserves show_reblogs' do
-        subject.perform(local_follower.id, source_account.id, target_account.id)
         expect(Follow.find_by(account: local_follower, target_account: target_account).show_reblogs?).to be show_reblogs
       end
     end
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index f56c1a42b8..14f2d3c7e7 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -6,6 +6,7 @@
 # See: https://docs.docker.com/build/building/multi-platform/
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
+ARG BASE_REGISTRY="docker.io"
 
 # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
@@ -13,7 +14,7 @@ ARG NODE_MAJOR_VERSION="22"
 # 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 streaming
+FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS streaming
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.3.0-nightly.2023.11.09+pr-123456
diff --git a/streaming/package.json b/streaming/package.json
index b98608edd5..4bcf85eeb2 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -37,7 +37,7 @@
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.9",
     "eslint-define-config": "^2.0.0",
-    "pino-pretty": "^11.0.0",
+    "pino-pretty": "^13.0.0",
     "typescript": "^5.0.4"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 9293af2f24..7096a8706c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -55,57 +55,57 @@ __metadata:
   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.25.9, @babel/code-frame@npm:^7.26.0":
-  version: 7.26.0
-  resolution: "@babel/code-frame@npm:7.26.0"
+"@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.25.9, @babel/code-frame@npm:^7.26.2":
+  version: 7.26.2
+  resolution: "@babel/code-frame@npm:7.26.2"
   dependencies:
     "@babel/helper-validator-identifier": "npm:^7.25.9"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/46f7e367714be736b52ea3c01b24f47e2102e210fb83021d1c8237d8fc511b9538909e16e2fcdbb5cb6173e0794e28624309a59014e52fcfb7bde908f5284388
+  checksum: 10c0/7d79621a6849183c415486af99b1a20b84737e8c11cd55b6544f688c51ce1fd710e6d869c3dd21232023da272a79b91efb3e83b5bc2dc65c1187c5fcd1b72ea8
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.9, @babel/compat-data@npm:^7.26.0":
-  version: 7.26.0
-  resolution: "@babel/compat-data@npm:7.26.0"
-  checksum: 10c0/6325c9151a3c9b0a3a807e854a26255ef66d989bff331475a935af9bb18f160e0fffe6aed550e4e96b63f91efcd874bfbaab2a1f4a2f8d25645d712a0de590fb
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/compat-data@npm:7.26.5"
+  checksum: 10c0/9d2b41f0948c3dfc5de44d9f789d2208c2ea1fd7eb896dfbb297fe955e696728d6f363c600cd211e7f58ccbc2d834fe516bb1e4cf883bbabed8a32b038afc1a0
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4, @babel/core@npm:^7.25.0":
-  version: 7.26.0
-  resolution: "@babel/core@npm:7.26.0"
+  version: 7.26.7
+  resolution: "@babel/core@npm:7.26.7"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.26.0"
-    "@babel/generator": "npm:^7.26.0"
-    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/code-frame": "npm:^7.26.2"
+    "@babel/generator": "npm:^7.26.5"
+    "@babel/helper-compilation-targets": "npm:^7.26.5"
     "@babel/helper-module-transforms": "npm:^7.26.0"
-    "@babel/helpers": "npm:^7.26.0"
-    "@babel/parser": "npm:^7.26.0"
+    "@babel/helpers": "npm:^7.26.7"
+    "@babel/parser": "npm:^7.26.7"
     "@babel/template": "npm:^7.25.9"
-    "@babel/traverse": "npm:^7.25.9"
-    "@babel/types": "npm:^7.26.0"
+    "@babel/traverse": "npm:^7.26.7"
+    "@babel/types": "npm:^7.26.7"
     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: 10c0/91de73a7ff5c4049fbc747930aa039300e4d2670c2a91f5aa622f1b4868600fc89b01b6278385fbcd46f9574186fa3d9b376a9e7538e50f8d118ec13cfbcb63e
+  checksum: 10c0/fbd2cd9fc23280bdcaca556e558f715c0a42d940b9913c52582e8e3d24e391d269cb8a9cd6589172593983569021c379e28bba6b19ea2ee08674f6068c210a9d
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.7.2":
-  version: 7.26.0
-  resolution: "@babel/generator@npm:7.26.0"
+"@babel/generator@npm:^7.26.5, @babel/generator@npm:^7.7.2":
+  version: 7.26.5
+  resolution: "@babel/generator@npm:7.26.5"
   dependencies:
-    "@babel/parser": "npm:^7.26.0"
-    "@babel/types": "npm:^7.26.0"
+    "@babel/parser": "npm:^7.26.5"
+    "@babel/types": "npm:^7.26.5"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^3.0.2"
-  checksum: 10c0/b6bb9185f19a97eaf58e04a6d39a13237076678e7ed16b6321dea914535d4bf6a8d7727c9dcb65539845aa0096b326eb67be4bab764bd74bcfd848e2eda68609
+  checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0
   languageName: node
   linkType: hard
 
@@ -118,16 +118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.25.9"
-  dependencies:
-    "@babel/traverse": "npm:^7.25.9"
-    "@babel/types": "npm:^7.25.9"
-  checksum: 10c0/a6068bb813e7f72d12b72edeecb99167f60cd7964cacedfb60e01fff5e7bed4a5a7f4f7414de7cf352a1b71487df5f8dab8c2b5230de4ad5aea16adf32e14219
-  languageName: node
-  linkType: hard
-
 "@babel/helper-builder-react-jsx@npm:^7.25.9":
   version: 7.25.9
   resolution: "@babel/helper-builder-react-jsx@npm:7.25.9"
@@ -138,16 +128,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/helper-compilation-targets@npm:7.25.9"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9, @babel/helper-compilation-targets@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/helper-compilation-targets@npm:7.26.5"
   dependencies:
-    "@babel/compat-data": "npm:^7.25.9"
+    "@babel/compat-data": "npm:^7.26.5"
     "@babel/helper-validator-option": "npm:^7.25.9"
     browserslist: "npm:^4.24.0"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/a6b26a1e4222e69ef8e62ee19374308f060b007828bc11c65025ecc9e814aba21ff2175d6d3f8bf53c863edd728ee8f94ba7870f8f90a37d39552ad9933a8aaa
+  checksum: 10c0/9da5c77e5722f1a2fcb3e893049a01d414124522bbf51323bb1a0c9dcd326f15279836450fc36f83c9e8a846f3c40e88be032ed939c5a9840922bed6073edfb4
   languageName: node
   linkType: hard
 
@@ -271,16 +261,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/helper-simple-access@npm:7.25.9"
-  dependencies:
-    "@babel/traverse": "npm:^7.25.9"
-    "@babel/types": "npm:^7.25.9"
-  checksum: 10c0/3f1bcdb88ee3883ccf86959869a867f6bbf8c4737cd44fb9f799c38e54f67474590bc66802500ae9fe18161792875b2cfb7ec15673f48ed6c8663f6d09686ca8
-  languageName: node
-  linkType: hard
-
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9":
   version: 7.25.9
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9"
@@ -323,24 +303,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.26.0":
-  version: 7.26.0
-  resolution: "@babel/helpers@npm:7.26.0"
+"@babel/helpers@npm:^7.26.7":
+  version: 7.26.7
+  resolution: "@babel/helpers@npm:7.26.7"
   dependencies:
     "@babel/template": "npm:^7.25.9"
-    "@babel/types": "npm:^7.26.0"
-  checksum: 10c0/343333cced6946fe46617690a1d0789346960910225ce359021a88a60a65bc0d791f0c5d240c0ed46cf8cc63b5fd7df52734ff14e43b9c32feae2b61b1647097
+    "@babel/types": "npm:^7.26.7"
+  checksum: 10c0/37fec398e53a2dbbf24bc2a025c4d571b2556cef18d8116d05d04b153f13ef659cdfbaab96c8eed875e629d39bdf9b3ea5d099ccf80544537de224e2d94f9b11
   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.25.9, @babel/parser@npm:^7.26.0":
-  version: 7.26.1
-  resolution: "@babel/parser@npm:7.26.1"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.5, @babel/parser@npm:^7.26.7":
+  version: 7.26.7
+  resolution: "@babel/parser@npm:7.26.7"
   dependencies:
-    "@babel/types": "npm:^7.26.0"
+    "@babel/types": "npm:^7.26.7"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/dc7d4e6b7eb667fa0784e7e2c3f6f92ca12ad72242f6d4311995310dae55093f02acdb595b69b0dbbf04cb61ad87156ac03186ff32eacfa35149c655bc22c14b
+  checksum: 10c0/dcb08a4f2878ece33caffefe43b71488d753324bae7ca58d64bca3bc4af34dcfa1b58abdf9972516d76af760fceb25bb9294ca33461d56b31c5059ccfe32001f
   languageName: node
   linkType: hard
 
@@ -637,14 +617,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.25.9"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.26.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.26.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e92ba0e3d72c038513844d8fca1cc8437dcb35cd42778e97fd03cb8303380b201468611e7ecfdcae3de33473b2679fe2de1552c5f925d112c5693425cf851f10
+  checksum: 10c0/2f3060800ead46b09971dd7bf830d66383b7bc61ced9945633b4ef9bf87787956ea83fcf49b387cecb377812588c6b81681714c760f9cf89ecba45edcbab1192
   languageName: node
   linkType: hard
 
@@ -768,15 +748,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.25.9"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.26.3":
+  version: 7.26.3
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.26.3"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.25.9"
     "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3b42f65bab3fee28c385115ce6bcb6ba544dff187012df408a432c9fb44c980afd898911020c723dc1c9257aaf3d7d0131ad83ba15102bf30ad9a86fc2a8a912
+  checksum: 10c0/cac922e851c6a0831fdd2e3663564966916015aeff7f4485825fc33879cbc3a313ceb859814c9200248e2875d65bb13802a723e5d7d7b40a2e90da82a5a1e15c
   languageName: node
   linkType: hard
 
@@ -872,16 +851,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.9"
+"@babel/plugin-transform-modules-commonjs@npm:^7.25.9, @babel/plugin-transform-modules-commonjs@npm:^7.26.3":
+  version: 7.26.3
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.26.3"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.25.9"
+    "@babel/helper-module-transforms": "npm:^7.26.0"
     "@babel/helper-plugin-utils": "npm:^7.25.9"
-    "@babel/helper-simple-access": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6ce771fb04d4810257fc8900374fece877dacaed74b05eaa16ad9224b390f43795c4d046cbe9ae304e1eb5aad035d37383895e3c64496d647c2128d183916e74
+  checksum: 10c0/82e59708f19f36da29531a64a7a94eabbf6ff46a615e0f5d9b49f3f59e8ef10e2bac607d749091508d3fa655146c9e5647c3ffeca781060cdabedb4c7a33c6f2
   languageName: node
   linkType: hard
 
@@ -934,7 +912,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.9":
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.26.6":
   version: 7.26.6
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.26.6"
   dependencies:
@@ -1219,14 +1197,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.25.9"
+"@babel/plugin-transform-typeof-symbol@npm:^7.26.7":
+  version: 7.26.7
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.26.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.26.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2b19fd88608589d9bc6b607ff17b06791d35c67ef3249f4659283454e6a9984241e3bd4c4eb72bb8b3d860a73223f3874558b861adb7314aa317c1c6a2f0cafb
+  checksum: 10c0/d5640e3457637e6eee1d7205d255602ccca124ed30e4de10ec75ba179d167e0a826ceeab424e119921f5c995dfddf39ef1f2c91efd2dcbf3f0dc1e7931dfd1d1
   languageName: node
   linkType: hard
 
@@ -1293,12 +1271,12 @@ __metadata:
   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.26.0
-  resolution: "@babel/preset-env@npm:7.26.0"
+  version: 7.26.7
+  resolution: "@babel/preset-env@npm:7.26.7"
   dependencies:
-    "@babel/compat-data": "npm:^7.26.0"
-    "@babel/helper-compilation-targets": "npm:^7.25.9"
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/compat-data": "npm:^7.26.5"
+    "@babel/helper-compilation-targets": "npm:^7.26.5"
+    "@babel/helper-plugin-utils": "npm:^7.26.5"
     "@babel/helper-validator-option": "npm:^7.25.9"
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.9"
     "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.9"
@@ -1312,7 +1290,7 @@ __metadata:
     "@babel/plugin-transform-arrow-functions": "npm:^7.25.9"
     "@babel/plugin-transform-async-generator-functions": "npm:^7.25.9"
     "@babel/plugin-transform-async-to-generator": "npm:^7.25.9"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.26.5"
     "@babel/plugin-transform-block-scoping": "npm:^7.25.9"
     "@babel/plugin-transform-class-properties": "npm:^7.25.9"
     "@babel/plugin-transform-class-static-block": "npm:^7.26.0"
@@ -1323,7 +1301,7 @@ __metadata:
     "@babel/plugin-transform-duplicate-keys": "npm:^7.25.9"
     "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.9"
     "@babel/plugin-transform-dynamic-import": "npm:^7.25.9"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.26.3"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.25.9"
     "@babel/plugin-transform-for-of": "npm:^7.25.9"
     "@babel/plugin-transform-function-name": "npm:^7.25.9"
@@ -1332,12 +1310,12 @@ __metadata:
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.25.9"
     "@babel/plugin-transform-modules-amd": "npm:^7.25.9"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.26.3"
     "@babel/plugin-transform-modules-systemjs": "npm:^7.25.9"
     "@babel/plugin-transform-modules-umd": "npm:^7.25.9"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.9"
     "@babel/plugin-transform-new-target": "npm:^7.25.9"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.26.6"
     "@babel/plugin-transform-numeric-separator": "npm:^7.25.9"
     "@babel/plugin-transform-object-rest-spread": "npm:^7.25.9"
     "@babel/plugin-transform-object-super": "npm:^7.25.9"
@@ -1354,7 +1332,7 @@ __metadata:
     "@babel/plugin-transform-spread": "npm:^7.25.9"
     "@babel/plugin-transform-sticky-regex": "npm:^7.25.9"
     "@babel/plugin-transform-template-literals": "npm:^7.25.9"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.25.9"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.26.7"
     "@babel/plugin-transform-unicode-escapes": "npm:^7.25.9"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.25.9"
     "@babel/plugin-transform-unicode-regex": "npm:^7.25.9"
@@ -1367,7 +1345,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/26e19dc407cfa1c5166be638b4c54239d084fe15d8d7e6306d8c6dc7bc1decc51070a8dcf28352c1a2feeefbe52a06d193a12e302327ad5f529583df75fb7a26
+  checksum: 10c0/77d2e46a4f133768c5c8a6b3fec49a7c85c6baec601991e63458921e889ff93911f447723c3a99a6a471ca654ea6dc2aaa7ed690f3e518ee80cea7820ab80ce3
   languageName: node
   linkType: hard
 
@@ -1425,11 +1403,11 @@ __metadata:
   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.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.26.0
-  resolution: "@babel/runtime@npm:7.26.0"
+  version: 7.26.7
+  resolution: "@babel/runtime@npm:7.26.7"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/12c01357e0345f89f4f7e8c0e81921f2a3e3e101f06e8eaa18a382b517376520cd2fa8c237726eb094dab25532855df28a7baaf1c26342b52782f6936b07c287
+  checksum: 10c0/60199c049f90e5e41c687687430052a370aca60bac7859ff4ee761c5c1739b8ba1604d391d01588c22dc0e93828cbadb8ada742578ad1b1df240746bce98729a
   languageName: node
   linkType: hard
 
@@ -1444,28 +1422,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/traverse@npm:7.25.9"
+"@babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.7":
+  version: 7.26.7
+  resolution: "@babel/traverse@npm:7.26.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.25.9"
-    "@babel/generator": "npm:^7.25.9"
-    "@babel/parser": "npm:^7.25.9"
+    "@babel/code-frame": "npm:^7.26.2"
+    "@babel/generator": "npm:^7.26.5"
+    "@babel/parser": "npm:^7.26.7"
     "@babel/template": "npm:^7.25.9"
-    "@babel/types": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.7"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/e90be586a714da4adb80e6cb6a3c5cfcaa9b28148abdafb065e34cc109676fc3db22cf98cd2b2fff66ffb9b50c0ef882cab0f466b6844be0f6c637b82719bba1
+  checksum: 10c0/b23a36ce40d2e4970741431c45d4f92e3f4c2895c0a421456516b2729bd9e17278846e01ee3d9039b0adf5fc5a071768061c17fcad040e74a5c3e39517449d5b
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.26.0
-  resolution: "@babel/types@npm:7.26.0"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.5, @babel/types@npm:^7.26.7, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.26.7
+  resolution: "@babel/types@npm:7.26.7"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.25.9"
     "@babel/helper-validator-identifier": "npm:^7.25.9"
-  checksum: 10c0/b694f41ad1597127e16024d766c33a641508aad037abd08d0d1f73af753e1119fa03b4a107d04b5f92cc19c095a594660547ae9bead1db2299212d644b0a5cb8
+  checksum: 10c0/7810a2bca97b13c253f07a0863a628d33dbe76ee3c163367f24be93bfaf4c8c0a325f73208abaaa050a6b36059efc2950c2e4b71fb109c0f07fa62221d8473d4
   languageName: node
   linkType: hard
 
@@ -2310,14 +2288,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.10.0":
-  version: 2.10.0
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.10.0"
+"@formatjs/icu-messageformat-parser@npm:2.11.0":
+  version: 2.11.0
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.11.0"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:2.3.2"
     "@formatjs/icu-skeleton-parser": "npm:1.8.12"
     tslib: "npm:2"
-  checksum: 10c0/261d386b19b5031ac097450ebbb51518ec447c191a51616c2a3335d2d675cb37b48898b600753b45dbce92517ad842695a18aed702099243bfc132a7f800dff7
+  checksum: 10c0/9ad43847cb4a5c13895af606c634dcf2ec034d484cbbce6566746b60920643f33cbc5e2e3fd1efe21bcfdb555e1ee527e4518768001c3b36bf2e76c171e4049f
   languageName: node
   linkType: hard
 
@@ -2382,21 +2360,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:3.1.1":
-  version: 3.1.1
-  resolution: "@formatjs/intl@npm:3.1.1"
+"@formatjs/intl@npm:3.1.3":
+  version: 3.1.3
+  resolution: "@formatjs/intl@npm:3.1.3"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:2.3.2"
     "@formatjs/fast-memoize": "npm:2.2.6"
-    "@formatjs/icu-messageformat-parser": "npm:2.10.0"
-    intl-messageformat: "npm:10.7.12"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.0"
+    intl-messageformat: "npm:10.7.14"
     tslib: "npm:2"
   peerDependencies:
     typescript: 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/409ba1893635348e3045089fe5dd6f489a5084ce7116798284c5879eb61c5ae3221a3f2a6d47b5d169177d6f482e632f1378d97a6e7821679a19550ccda83b13
+  checksum: 10c0/1f9fce896b69dd3ff84221d2d18fbd57f8968c1d0691e44d33ac949d3d6f4e86f9c3075e4da870fb0b189d4952ec5e8bc7375558fa85c37bcb76a73aeb6f9f52
   languageName: node
   linkType: hard
 
@@ -2420,11 +2398,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.28":
-  version: 3.13.28
-  resolution: "@formatjs/ts-transformer@npm:3.13.28"
+"@formatjs/ts-transformer@npm:3.13.31":
+  version: 3.13.31
+  resolution: "@formatjs/ts-transformer@npm:3.13.31"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.10.0"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.0"
     "@types/json-stable-stringify": "npm:1"
     "@types/node": "npm:14 || 16 || 17 || 18 || 20 || 22"
     chalk: "npm:4"
@@ -2432,11 +2410,11 @@ __metadata:
     tslib: "npm:2"
     typescript: "npm:5"
   peerDependencies:
-    ts-jest: ">=27"
+    ts-jest: 27 || 28 || 29
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 10c0/3ee015082c6cad4b3c33dc86cc40b69a5544cea1dc62b164d8e0d5710835bd72ea757b7a071fc9848c7b9e25073ea085c38125ba69460cb3e0cb5592b79f231a
+  checksum: 10c0/bfd7a41203c2b1691d883b3c306f3ae413b94c4875dec75df2be0e62da22625f673e41ecdc3257be40fe4a5b22a311365c2462d00a98f9bac59f00488543add0
   languageName: node
   linkType: hard
 
@@ -2912,6 +2890,7 @@ __metadata:
     jest: "npm:^29.5.0"
     jest-environment-jsdom: "npm:^29.5.0"
     js-yaml: "npm:^4.1.0"
+    lande: "npm:^1.0.10"
     lint-staged: "npm:^15.0.0"
     lodash: "npm:^4.17.21"
     mark-loader: "npm:^0.1.6"
@@ -2957,7 +2936,7 @@ __metadata:
     stylelint-config-standard-scss: "npm:^14.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
-    tesseract.js: "npm:^2.1.5"
+    tesseract.js: "npm:^6.0.0"
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:^5.0.4"
@@ -3005,7 +2984,7 @@ __metadata:
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^9.0.0"
     pino-http: "npm:^10.0.0"
-    pino-pretty: "npm:^11.0.0"
+    pino-pretty: "npm:^13.0.0"
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
     utf-8-validate: "npm:^6.0.3"
@@ -3282,8 +3261,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.5.0
-  resolution: "@reduxjs/toolkit@npm:2.5.0"
+  version: 2.5.1
+  resolution: "@reduxjs/toolkit@npm:2.5.1"
   dependencies:
     immer: "npm:^10.0.3"
     redux: "npm:^5.0.1"
@@ -3297,7 +3276,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/81748a5a6d2f52a14769b6ed25aea1e77cda81b1db6599c7c3a1d1605696c65c4469f55146c2b2a7a2f8ebafa5ecd4996aa8deecb37aebb5307217ec2fe384ac
+  checksum: 10c0/e25dd4085e5611d21d4e8d47716072e12318ef8171323d40a80c5b8e79e6d514a973718eb44e41f8491355f7a15e488a0e9f88a97c237327de2615a00b470929
   languageName: node
   linkType: hard
 
@@ -3928,9 +3907,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.13
-  resolution: "@types/lodash@npm:4.17.13"
-  checksum: 10c0/c3d0b7efe7933ac0369b99f2f7bff9240d960680fdb74b41ed4bd1b3ca60cca1e31fe4046d9abbde778f941a41bc2a75eb629abf8659fa6c27b66efbbb0802a9
+  version: 4.17.15
+  resolution: "@types/lodash@npm:4.17.15"
+  checksum: 10c0/2eb2dc6d231f5fb4603d176c08c8d7af688f574d09af47466a179cd7812d9f64144ba74bb32ca014570ffdc544eedc51b7a5657212bad083b6eecbd72223f9bb
   languageName: node
   linkType: hard
 
@@ -3988,13 +3967,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.10
-  resolution: "@types/pg@npm:8.11.10"
+  version: 8.11.11
+  resolution: "@types/pg@npm:8.11.11"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/c8800d0ab2c6424308e6c6b40c73f19583ee1aed758462bd07694844b0a551b5841442205a4ee05207b80109ba502f33f20241b1bd9b4902e713611fb9e08f6c
+  checksum: 10c0/18c2585e1ba7a5dd5f849d49410d53fdfe9a6c3cbc4ae46c51fd728264d6ecf9a84a5cd82d89cb1f870a74383bad88effce1eed888f16accbcbde56a53d23a69
   languageName: node
   linkType: hard
 
@@ -4271,9 +4250,9 @@ __metadata:
   linkType: hard
 
 "@types/webpack-env@npm:^1.18.4":
-  version: 1.18.5
-  resolution: "@types/webpack-env@npm:1.18.5"
-  checksum: 10c0/b9e4876e8c7cae419896249f9ed795db283c008fe1d38efa679cbbf05194fc2eea2a5bfb4ff4393d109e3a9895416dadf5f3ddd5c22931b678062230f860454e
+  version: 1.18.8
+  resolution: "@types/webpack-env@npm:1.18.8"
+  checksum: 10c0/527a5d1eb75c5243e4f3665d956c7c340f899955dd25d16c9fd9750406f32e95a3a17d207640295038e8235c0c2a2daf084f420e088e58b965d82fc74f6012d7
   languageName: node
   linkType: hard
 
@@ -4303,11 +4282,11 @@ __metadata:
   linkType: hard
 
 "@types/ws@npm:^8.5.9":
-  version: 8.5.13
-  resolution: "@types/ws@npm:8.5.13"
+  version: 8.5.14
+  resolution: "@types/ws@npm:8.5.14"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/a5430aa479bde588e69cb9175518d72f9338b6999e3b2ae16fc03d3bdcff8347e486dc031e4ed14601260463c07e1f9a0d7511dfc653712b047c439c680b0b34
+  checksum: 10c0/be88a0b6252f939cb83340bd1b4d450287f752c19271195cd97564fd94047259a9bb8c31c585a61b69d8a1b069a99df9dd804db0132d3359c54d3890c501416a
   languageName: node
   linkType: hard
 
@@ -4659,15 +4638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abort-controller@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "abort-controller@npm:3.0.0"
-  dependencies:
-    event-target-shim: "npm:^5.0.0"
-  checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
-  languageName: node
-  linkType: hard
-
 "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
@@ -5330,21 +5300,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.31
-  resolution: "babel-plugin-formatjs@npm:10.5.31"
+  version: 10.5.34
+  resolution: "babel-plugin-formatjs@npm:10.5.34"
   dependencies:
     "@babel/core": "npm:^7.25.0"
     "@babel/helper-plugin-utils": "npm:^7.25.0"
     "@babel/plugin-syntax-jsx": "npm:^7.25.0"
     "@babel/traverse": "npm:^7.25.0"
     "@babel/types": "npm:^7.25.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.10.0"
-    "@formatjs/ts-transformer": "npm:3.13.28"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.0"
+    "@formatjs/ts-transformer": "npm:3.13.31"
     "@types/babel__core": "npm:^7.20.5"
     "@types/babel__helper-plugin-utils": "npm:^7.10.3"
     "@types/babel__traverse": "npm:^7.20.6"
     tslib: "npm:2"
-  checksum: 10c0/b73a0250efd97b1a76e62b63e6ca6a1962eec4c46b832ca94241ef28299c2118bea93a5c765fc2b3e95520815d91bde31450b4793b34f5ca95faf61ea2f04f77
+  checksum: 10c0/6e6c67db41044427a7f182e7c18a8519e5aca96645de094244b332cb8c82ed498c56a4634e4e4ed1a4ef85c8e996669ef5bddd63ee9c45d6e512cbbf782af2a2
   languageName: node
   linkType: hard
 
@@ -5513,7 +5483,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
+"base64-js@npm:^1.0.2":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
   checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
@@ -5579,13 +5549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blueimp-load-image@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "blueimp-load-image@npm:3.0.0"
-  checksum: 10c0/e860da4113afd8e58bc026fb17240007e15dc155287a70fb57b3048fc8f0aa5f7dbd052efed8bff19d1208eeab4d058dc6788684a721c50ccd08b68d836a8d18
-  languageName: node
-  linkType: hard
-
 "blurhash@npm:^2.0.5":
   version: 2.0.5
   resolution: "blurhash@npm:2.0.5"
@@ -5836,16 +5799,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "buffer@npm:6.0.3"
-  dependencies:
-    base64-js: "npm:^1.3.1"
-    ieee754: "npm:^1.2.1"
-  checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
-  languageName: node
-  linkType: hard
-
 "bufferutil@npm:^4.0.7":
   version: 4.0.9
   resolution: "bufferutil@npm:4.0.9"
@@ -6323,13 +6276,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colors@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "colors@npm:1.4.0"
-  checksum: 10c0/9af357c019da3c5a098a301cf64e3799d27549d8f185d86f79af23069e4f4303110d115da98483519331f6fb71c8568d5688fa1c6523600044fd4a54e97c4efb
-  languageName: node
-  linkType: hard
-
 "combined-stream@npm:^1.0.8":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
@@ -8326,13 +8272,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"event-target-shim@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "event-target-shim@npm:5.0.1"
-  checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
-  languageName: node
-  linkType: hard
-
 "eventemitter3@npm:^4.0.0":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
@@ -8347,7 +8286,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"events@npm:^3.0.0, events@npm:^3.3.0":
+"events@npm:^3.0.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
   checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
@@ -8665,13 +8604,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-type@npm:^12.4.1":
-  version: 12.4.2
-  resolution: "file-type@npm:12.4.2"
-  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"
@@ -9703,10 +9635,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"idb-keyval@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "idb-keyval@npm:3.2.0"
-  checksum: 10c0/9b1f65d5f08630ef444a89334370c394175b1543f157621b36a3bc5e5208946f3f0ab5d5e24c74e81f2ef54b55b742b4e5b439c561f62695ffb69a06b0bce8e1
+"idb-keyval@npm:^6.2.0":
+  version: 6.2.1
+  resolution: "idb-keyval@npm:6.2.1"
+  checksum: 10c0/9f0c83703a365e00bd0b4ed6380ce509a06dedfc6ec39b2ba5740085069fd2f2ff5c14ba19356488e3612a2f9c49985971982d836460a982a5d0b4019eeba48a
   languageName: node
   linkType: hard
 
@@ -9717,7 +9649,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.1.4, ieee754@npm:^1.2.1":
+"ieee754@npm:^1.1.4":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
   checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
@@ -9908,15 +9840,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.7.12, intl-messageformat@npm:^10.3.5":
-  version: 10.7.12
-  resolution: "intl-messageformat@npm:10.7.12"
+"intl-messageformat@npm:10.7.14, intl-messageformat@npm:^10.3.5":
+  version: 10.7.14
+  resolution: "intl-messageformat@npm:10.7.14"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:2.3.2"
     "@formatjs/fast-memoize": "npm:2.2.6"
-    "@formatjs/icu-messageformat-parser": "npm:2.10.0"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.0"
     tslib: "npm:2"
-  checksum: 10c0/c91917edf14a31bd76419cc9d9d1d4c1a044bf64bc1b5db8d359940b26455d0fd6cec49ede7593b8f631aa1af749db29d719d5b2e4ceb08939f88cd0ed886b03
+  checksum: 10c0/914c11118c47bb7d0163a7d54afebf52ae4fe9b250bba609b5db4c802a34f8bf758edbbc8c58094203205faf76948c7112399addb32e9b36e40483c4cf7c1cb7
   languageName: node
   linkType: hard
 
@@ -10164,13 +10096,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-electron@npm:^2.2.0":
-  version: 2.2.2
-  resolution: "is-electron@npm:2.2.2"
-  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"
@@ -11144,28 +11069,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jpeg-autorotate@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "jpeg-autorotate@npm:7.1.1"
-  dependencies:
-    colors: "npm:^1.4.0"
-    glob: "npm:^7.1.6"
-    jpeg-js: "npm:^0.4.2"
-    piexifjs: "npm:^1.0.6"
-    yargs-parser: "npm:^20.2.1"
-  bin:
-    jpeg-autorotate: src/cli.js
-  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: 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"
@@ -11456,6 +11359,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lande@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "lande@npm:1.0.10"
+  dependencies:
+    toygrad: "npm:^2.6.0"
+  checksum: 10c0/27300be5937b6b9e245a7ea7a8216a0dcf5286a3b7ae38886c10c5c75b83fbfa1a69cd6754ab26bb38c6bd18aa8a2dcb62dea873506accb245cf82084acfee71
+  languageName: node
+  linkType: hard
+
 "language-subtag-registry@npm:^0.3.20":
   version: 0.3.22
   resolution: "language-subtag-registry@npm:0.3.22"
@@ -12397,9 +12309,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2.6.0":
-  version: 2.6.11
-  resolution: "node-fetch@npm:2.6.11"
+"node-fetch@npm:^2.6.9":
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
   dependencies:
     whatwg-url: "npm:^5.0.0"
   peerDependencies:
@@ -12407,7 +12319,7 @@ __metadata:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/3ec847ca43f678d07b80abfd85bdf06523c2554ee9a494c992c5fc61f5d9cde9f9f16aa33ff09a62f19eee9d54813b8850d7f054cdfee8b2daf789c57f8eeaea
+  checksum: 10c0/b55786b6028208e6fbe594ccccc213cab67a72899c9234eb59dba51062a299ea853210fcf526998eaa2867b0963ad72338824450905679ff0fa304b8c5093ae8
   languageName: node
   linkType: hard
 
@@ -12776,7 +12688,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"opencollective-postinstall@npm:^2.0.2":
+"opencollective-postinstall@npm:^2.0.3":
   version: 2.0.3
   resolution: "opencollective-postinstall@npm:2.0.3"
   bin:
@@ -13259,13 +13171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"piexifjs@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "piexifjs@npm:1.0.6"
-  checksum: 10c0/69a10fe09c08f1e67e653844ac79e720324a7fa34689b020359d60d98b3a601c070e1759df8f2d97d022298bd2f5b79eed4c92de86c5f215300c8a63adf947b1
-  languageName: node
-  linkType: hard
-
 "pify@npm:^2.0.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
@@ -13317,9 +13222,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-pretty@npm:^11.0.0":
-  version: 11.3.0
-  resolution: "pino-pretty@npm:11.3.0"
+"pino-pretty@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "pino-pretty@npm:13.0.0"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -13331,13 +13236,12 @@ __metadata:
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^2.0.0"
     pump: "npm:^3.0.0"
-    readable-stream: "npm:^4.0.0"
     secure-json-parse: "npm:^2.4.0"
     sonic-boom: "npm:^4.0.1"
     strip-json-comments: "npm:^3.1.1"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/8e4d842bfce5fa3fc69d3a6adb1bca873051e000f0fb4879ae1cc5d1410387b2464a7208f6ecc70ec49bb149a9617ec233cb3ec7a5f017ec141cb482d79917c2
+  checksum: 10c0/015dac25006c1b9820b9e01fccb8a392a019e12b30e6bfc3f3f61ecca8dbabcd000a8f3f64410b620b7f5d08579ba85e6ef137f7fbeaad70d46397a97a5f75ea
   languageName: node
   linkType: hard
 
@@ -14659,24 +14563,24 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "react-intl@npm:7.1.1"
+  version: 7.1.5
+  resolution: "react-intl@npm:7.1.5"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:2.3.2"
-    "@formatjs/icu-messageformat-parser": "npm:2.10.0"
-    "@formatjs/intl": "npm:3.1.1"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.0"
+    "@formatjs/intl": "npm:3.1.3"
     "@types/hoist-non-react-statics": "npm:3"
-    "@types/react": "npm:16 || 17 || 18"
+    "@types/react": "npm:16 || 17 || 18 || 19"
     hoist-non-react-statics: "npm:3"
-    intl-messageformat: "npm:10.7.12"
+    intl-messageformat: "npm:10.7.14"
     tslib: "npm:2"
   peerDependencies:
-    react: ^16.6.0 || 17 || 18
+    react: ^16.6.0 || 17 || 18 || 19
     typescript: 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a03dfbfd98210b176d02c54d670550a15209d08a1d43dbb5facd79705f3b38f79ae9dcc54e8645b4326fc1b215245262e84f210103df561e928113c1e2a7791c
+  checksum: 10c0/9d8d5afae16d26466f82fc1c0b8c4afd7559a8faa5b3ef31983a0af540b1b225fa89208b48bf9ec83056c0a27f2972fb86f2717422f788efdc819fb0e0846134
   languageName: node
   linkType: hard
 
@@ -14837,8 +14741,8 @@ __metadata:
   linkType: hard
 
 "react-select@npm:^5.7.3":
-  version: 5.9.0
-  resolution: "react-select@npm:5.9.0"
+  version: 5.10.0
+  resolution: "react-select@npm:5.10.0"
   dependencies:
     "@babel/runtime": "npm:^7.12.0"
     "@emotion/cache": "npm:^11.4.0"
@@ -14852,7 +14756,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/f21f18ca41a8c866ab69f9c65253e86dcc5323477bbfc729bf6aa9d897e04e27cfffd13c07f10b70dc554e15ad1d238c1283e05e457bf4ead8526a1dd7fbc8b0
+  checksum: 10c0/64cc73ef43556d0a199420d7d19f9f72e3c5e3a7f6828aef5421ec16cc0e4bc337061a8fa3c03afc5b929a087a4ca866f497e0ef865b03fe014c5cacde5e71dd
   languageName: node
   linkType: hard
 
@@ -15017,19 +14921,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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"
-    string_decoder: "npm:^1.3.0"
-  checksum: 10c0/cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
-  languageName: node
-  linkType: hard
-
 "readdirp@npm:^2.2.1":
   version: 2.2.1
   resolution: "readdirp@npm:2.2.1"
@@ -15623,8 +15514,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.83.4
-  resolution: "sass@npm:1.83.4"
+  version: 1.84.0
+  resolution: "sass@npm:1.84.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -15635,7 +15526,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/6f27f0eebfeb50222b14baaeef548ef58a05daf8abd9797e6c499334ed7ad40541767056c8693780d06ca83d8836348ea7396a923d3be439b133507993ca78be
+  checksum: 10c0/4af28c12416b6f1fec2423677cfa8c48af7fb7652a50bd076e0cdd1ea260f0330948ddd6075368a734b8d6cfa16c9af5518292181334f47a9471cb542599bc7b
   languageName: node
   linkType: hard
 
@@ -16575,7 +16466,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -17090,31 +16981,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tesseract.js-core@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "tesseract.js-core@npm:2.2.0"
-  checksum: 10c0/9ef569529f1ee96f8bf18388ef086d4940d3f02d28b4252df133a9bd36f6a9d140085e77a12ff1963cf9b4cd85bd1c644b61eca266ecfc51bb83adb30a1f11e3
+"tesseract.js-core@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "tesseract.js-core@npm:6.0.0"
+  checksum: 10c0/c04be8bbaa296be658664496754f21e857bdffff84113f08adf02f03a1f84596d68b3542ed2fda4a6dc138abb84b09b30ab07c04ee5950879e780876d343955f
   languageName: node
   linkType: hard
 
-"tesseract.js@npm:^2.1.5":
-  version: 2.1.5
-  resolution: "tesseract.js@npm:2.1.5"
+"tesseract.js@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "tesseract.js@npm:6.0.0"
   dependencies:
-    blueimp-load-image: "npm:^3.0.0"
     bmp-js: "npm:^0.1.0"
-    file-type: "npm:^12.4.1"
-    idb-keyval: "npm:^3.2.0"
-    is-electron: "npm:^2.2.0"
+    idb-keyval: "npm:^6.2.0"
     is-url: "npm:^1.2.4"
-    jpeg-autorotate: "npm:^7.1.1"
-    node-fetch: "npm:^2.6.0"
-    opencollective-postinstall: "npm:^2.0.2"
+    node-fetch: "npm:^2.6.9"
+    opencollective-postinstall: "npm:^2.0.3"
     regenerator-runtime: "npm:^0.13.3"
-    resolve-url: "npm:^0.2.1"
-    tesseract.js-core: "npm:^2.2.0"
+    tesseract.js-core: "npm:^6.0.0"
+    wasm-feature-detect: "npm:^1.2.11"
     zlibjs: "npm:^0.3.1"
-  checksum: 10c0/b3aaee9189f3bc7f4217b83e110d0dd4d9afcafc3045b842f72b7ca9beb00bec732bc6b4b00eca14167c16b014c437fcf83dd272a640c9c8b5e1e9b55ea00ff5
+  checksum: 10c0/f65b816eabc16266bfa74ea61db73afa2d21ce0f57041b87b96abdff8954e042ee16637edea20aaf752227bc075052ca12021f4f68d5d25d52f062ebc4c644e1
   languageName: node
   linkType: hard
 
@@ -17289,6 +17176,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"toygrad@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "toygrad@npm:2.6.0"
+  checksum: 10c0/96e42ced87431e99cec7d9b446c7827fe7782c2fd82bb5fc8c4a0855679011d809f9967096a60b4c8ceca867a29f1aadd62af447bdb652cb6f7fee279ae743ed
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^1.0.1":
   version: 1.0.1
   resolution: "tr46@npm:1.0.1"
@@ -17477,22 +17371,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.7.2
-  resolution: "typescript@npm:5.7.2"
+  version: 5.7.3
+  resolution: "typescript@npm:5.7.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/a873118b5201b2ef332127ef5c63fb9d9c155e6fdbe211cbd9d8e65877283797cca76546bad742eea36ed7efbe3424a30376818f79c7318512064e8625d61622
+  checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
   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.7.2
-  resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin<compat/typescript>::version=5.7.2&hash=5786d5"
+  version: 5.7.3
+  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/f3b8082c9d1d1629a215245c9087df56cb784f9fb6f27b5d55577a20e68afe2a889c040aacff6d27e35be165ecf9dca66e694c42eb9a50b3b2c451b36b5675cb
+  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
   languageName: node
   linkType: hard
 
@@ -17953,6 +17847,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wasm-feature-detect@npm:^1.2.11":
+  version: 1.8.0
+  resolution: "wasm-feature-detect@npm:1.8.0"
+  checksum: 10c0/2cb43e91bbf7aa7c121bc76b3133de3ab6dc4f482acc1d2dc46c528e8adb7a51c72df5c2aacf1d219f113c04efd1706f18274d5790542aa5dd49e0644e3ee665
+  languageName: node
+  linkType: hard
+
 "watchpack-chokidar2@npm:^2.0.1":
   version: 2.0.1
   resolution: "watchpack-chokidar2@npm:2.0.1"
@@ -18805,13 +18706,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^20.2.1":
-  version: 20.2.9
-  resolution: "yargs-parser@npm:20.2.9"
-  checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"