diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 137bebc599..40dc72c12d 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.4.1
+    image: libretranslate/libretranslate:v1.5.2
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local
diff --git a/.github/actions/setup-javascript/action.yml b/.github/actions/setup-javascript/action.yml
index 00a5c46bdc..07fd4d08d3 100644
--- a/.github/actions/setup-javascript/action.yml
+++ b/.github/actions/setup-javascript/action.yml
@@ -9,7 +9,7 @@ runs:
   using: 'composite'
   steps:
     - name: Set up Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
 
diff --git a/.github/codecov.yml b/.github/codecov.yml
new file mode 100644
index 0000000000..5532c49618
--- /dev/null
+++ b/.github/codecov.yml
@@ -0,0 +1,13 @@
+coverage:
+  status:
+    project:
+      default:
+        # Github status check is not blocking
+        informational: true
+    patch:
+      default:
+        # Github status check is not blocking
+        informational: true
+comment:
+  # Only write a comment in PR if there are changes
+  require_changes: true
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 77b64fdd3f..895dbfbad2 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -22,6 +22,7 @@
         'react-hotkeys', // Requires code changes
 
         // Requires Webpacker upgrade or replacement
+        '@svgr/webpack',
         '@types/webpack',
         'babel-loader',
         'compression-webpack-plugin',
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 07fd25fb1b..ae25648a0b 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -94,7 +94,7 @@ jobs:
       DB_HOST: localhost
       DB_USER: postgres
       DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
+      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
       RAILS_ENV: test
       ALLOW_NOPAM: true
       PAM_ENABLED: true
@@ -137,6 +137,12 @@ jobs:
 
       - run: bin/rspec
 
+      - name: Upload coverage reports to Codecov
+        if: matrix.ruby-version == '.ruby-version'
+        uses: codecov/codecov-action@v3
+        with:
+          files: coverage/lcov/mastodon.lcov
+
   test-e2e:
     name: End to End testing
     runs-on: ubuntu-latest
@@ -221,7 +227,7 @@ jobs:
           path: tmp/screenshots/
 
   test-search:
-    name: Testing search
+    name: Elastic Search integration testing
     runs-on: ubuntu-latest
 
     needs:
@@ -308,7 +314,7 @@ jobs:
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
 
-      - run: bundle exec rake spec:search
+      - run: bin/rspec --tag search
 
       - name: Archive logs
         uses: actions/upload-artifact@v3
diff --git a/.simplecov b/.simplecov
new file mode 100644
index 0000000000..fbd0207bec
--- /dev/null
+++ b/.simplecov
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+if ENV['CI']
+  require 'simplecov-lcov'
+  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+else
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+end
+
+SimpleCov.start 'rails' do
+  enable_coverage :branch
+
+  add_filter 'lib/linter'
+
+  add_group 'Libraries', 'lib'
+  add_group 'Policies', 'app/policies'
+  add_group 'Presenters', 'app/presenters'
+  add_group 'Serializers', 'app/serializers'
+  add_group 'Services', 'app/services'
+  add_group 'Validators', 'app/validators'
+end
diff --git a/Dockerfile b/Dockerfile
index 2b23ea6e48..7e032073b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,7 @@ RUN apt-get update && \
     corepack enable
 
 COPY Gemfile* package.json yarn.lock .yarnrc.yml /opt/mastodon/
+COPY streaming/package.json /opt/mastodon/streaming/
 COPY .yarn /opt/mastodon/.yarn
 
 RUN bundle install -j"$(nproc)"
diff --git a/Gemfile b/Gemfile
index 47508175b6..d162a78399 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,9 @@ gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.2'
 gem 'rack', '~> 2.2.7'
 
+# For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182
+gem 'irb', '~> 1.8'
+
 gem 'haml-rails', '~>2.0'
 gem 'pg', '~> 1.5'
 gem 'pghero'
@@ -109,6 +112,9 @@ group :test do
   # RSpec progress bar formatter
   gem 'fuubar', '~> 2.5'
 
+  # RSpec helpers for email specs
+  gem 'email_spec'
+
   # Extra RSpec extenion methods and helpers for sidekiq
   gem 'rspec-sidekiq', '~> 4.0'
 
@@ -139,6 +145,7 @@ group :test do
 
   # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false
   gem 'simplecov', '~> 0.22', require: false
+  gem 'simplecov-lcov', '~> 0.8', require: false
 
   # Stub web requests for specs
   gem 'webmock', '~> 3.18'
@@ -175,6 +182,9 @@ group :development do
 end
 
 group :development, :test do
+  # Interactive Debugging tools
+  gem 'debug', '~> 1.8'
+
   # Profiling tools
   gem 'memory_profiler', require: false
   gem 'ruby-prof', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d9af4e970..72b60e05b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,21 +130,21 @@ GEM
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
     awrence (1.2.1)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.828.0)
-    aws-sdk-core (3.183.1)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.857.0)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.73.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.140.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.7.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)
@@ -154,7 +154,7 @@ GEM
       faraday_middleware (~> 1.0, >= 1.0.0.rc1)
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.19)
     better_errors (2.10.1)
@@ -220,6 +220,9 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     debug_inspector (1.1.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
@@ -242,13 +245,13 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.6)
+    doorkeeper (5.6.7)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
@@ -260,12 +263,16 @@ GEM
     elasticsearch-transport (7.13.3)
       faraday (~> 1)
       multi_json
+    email_spec (2.2.2)
+      htmlentities (~> 4.3.3)
+      launchy (~> 2.1)
+      mail (~> 2.7)
     encryptor (3.0.0)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
     excon (0.104.0)
-    fabrication (2.30.0)
+    fabrication (2.31.0)
     faker (3.2.2)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
@@ -370,7 +377,7 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
     io-console (0.6.0)
-    irb (1.8.3)
+    irb (1.9.1)
       rdoc
       reline (>= 0.3.8)
     jmespath (1.6.2)
@@ -432,7 +439,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -458,7 +465,7 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.3.0)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     net-http (0.4.0)
       uri
     net-http-persistent (4.0.2)
@@ -474,7 +481,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.1)
@@ -529,7 +536,7 @@ GEM
     private_address_check (0.5.0)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.4.0)
       nio4r (~> 2.0)
     pundit (2.3.1)
@@ -595,13 +602,13 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rdf (3.3.1)
       bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.6.1)
       rdf (~> 3.2)
-    rdoc (6.5.0)
+    rdoc (6.6.0)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -610,7 +617,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.8.2)
-    reline (0.3.9)
+    reline (0.4.0)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -635,7 +642,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -669,10 +676,11 @@ GEM
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.22.1)
+    rubocop-rails (2.22.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.25.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
@@ -725,6 +733,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     sprockets (3.7.2)
@@ -751,7 +760,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    test-prof (1.2.3)
+    test-prof (1.3.0)
     thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.1)
@@ -845,6 +854,7 @@ DEPENDENCIES
   concurrent-ruby
   connection_pool
   database_cleaner-active_record
+  debug (~> 1.8)
   devise (~> 4.9)
   devise-two-factor (~> 4.1)
   devise_pam_authenticatable2 (~> 9.2)
@@ -852,6 +862,7 @@ DEPENDENCIES
   doorkeeper (~> 5.6)
   dotenv-rails (~> 2.8)
   ed25519 (~> 1.3)
+  email_spec
   fabrication (~> 2.30)
   faker (~> 3.2)
   fast_blank (~> 1.0)
@@ -869,6 +880,7 @@ DEPENDENCIES
   httplog (~> 1.6.2)
   i18n-tasks (~> 1.0)
   idn-ruby
+  irb (~> 1.8)
   json-ld
   json-ld-preloaded (~> 3.2)
   json-schema (~> 4.0)
@@ -936,6 +948,7 @@ DEPENDENCIES
   simple-navigation (~> 4.4)
   simple_form (~> 5.2)
   simplecov (~> 0.22)
+  simplecov-lcov (~> 0.8)
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.4)
   stackprof
diff --git a/Procfile.dev b/Procfile.dev
index fbb2c2de23..f81333b04c 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,4 +1,4 @@
 web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
 sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
-stream: env PORT=4000 yarn run start
+stream: env PORT=4000 yarn workspace @mastodon/streaming start
 webpack: bin/webpack-dev-server
diff --git a/app/chewy/accounts_index.rb b/app/chewy/accounts_index.rb
index 00db257ac7..59f2f991f2 100644
--- a/app/chewy/accounts_index.rb
+++ b/app/chewy/accounts_index.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AccountsIndex < Chewy::Index
+  include DatetimeClampingConcern
+
   settings index: index_preset(refresh_interval: '30s'), analysis: {
     filter: {
       english_stop: {
@@ -60,7 +62,7 @@ class AccountsIndex < Chewy::Index
     field(:following_count, type: 'long')
     field(:followers_count, type: 'long')
     field(:properties, type: 'keyword', value: ->(account) { account.searchable_properties })
-    field(:last_status_at, type: 'date', value: ->(account) { account.last_status_at || account.created_at })
+    field(:last_status_at, type: 'date', value: ->(account) { clamp_date(account.last_status_at || account.created_at) })
     field(:display_name, type: 'text', analyzer: 'verbatim') { field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'verbatim' }
     field(:username, type: 'text', analyzer: 'verbatim', value: ->(account) { [account.username, account.domain].compact.join('@') }) { field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'verbatim' }
     field(:text, type: 'text', analyzer: 'verbatim', value: ->(account) { account.searchable_text }) { field :stemmed, type: 'text', analyzer: 'natural' }
diff --git a/app/chewy/concerns/datetime_clamping_concern.rb b/app/chewy/concerns/datetime_clamping_concern.rb
new file mode 100644
index 0000000000..7f176b6e54
--- /dev/null
+++ b/app/chewy/concerns/datetime_clamping_concern.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module DatetimeClampingConcern
+  extend ActiveSupport::Concern
+
+  MIN_ISO8601_DATETIME = '0000-01-01T00:00:00Z'.to_datetime.freeze
+  MAX_ISO8601_DATETIME = '9999-12-31T23:59:59Z'.to_datetime.freeze
+
+  class_methods do
+    def clamp_date(datetime)
+      datetime.clamp(MIN_ISO8601_DATETIME, MAX_ISO8601_DATETIME)
+    end
+  end
+end
diff --git a/app/chewy/public_statuses_index.rb b/app/chewy/public_statuses_index.rb
index b5f0be5e5c..09a4dfc093 100644
--- a/app/chewy/public_statuses_index.rb
+++ b/app/chewy/public_statuses_index.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class PublicStatusesIndex < Chewy::Index
+  include DatetimeClampingConcern
+
   settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: {
     filter: {
       english_stop: {
@@ -62,6 +64,6 @@ class PublicStatusesIndex < Chewy::Index
     field(:tags, type: 'text', analyzer: 'hashtag', value: ->(status) { status.tags.map(&:display_name) })
     field(:language, type: 'keyword')
     field(:properties, type: 'keyword', value: ->(status) { status.searchable_properties })
-    field(:created_at, type: 'date')
+    field(:created_at, type: 'date', value: ->(status) { clamp_date(status.created_at) })
   end
 end
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index e315a2030f..e739ccecb4 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class StatusesIndex < Chewy::Index
+  include DatetimeClampingConcern
+
   settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: {
     filter: {
       english_stop: {
@@ -60,6 +62,6 @@ class StatusesIndex < Chewy::Index
     field(:searchable_by, type: 'long', value: ->(status) { status.searchable_by })
     field(:language, type: 'keyword')
     field(:properties, type: 'keyword', value: ->(status) { status.searchable_properties })
-    field(:created_at, type: 'date')
+    field(:created_at, type: 'date', value: ->(status) { clamp_date(status.created_at) })
   end
 end
diff --git a/app/chewy/tags_index.rb b/app/chewy/tags_index.rb
index 5b6349a964..c99218a47f 100644
--- a/app/chewy/tags_index.rb
+++ b/app/chewy/tags_index.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class TagsIndex < Chewy::Index
+  include DatetimeClampingConcern
+
   settings index: index_preset(refresh_interval: '30s'), analysis: {
     analyzer: {
       content: {
@@ -42,6 +44,6 @@ class TagsIndex < Chewy::Index
     field(:name, type: 'text', analyzer: 'content', value: :display_name) { field(:edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content') }
     field(:reviewed, type: 'boolean', value: ->(tag) { tag.reviewed? })
     field(:usage, type: 'long', value: ->(tag, crutches) { tag.history.aggregate(crutches.time_period).accounts })
-    field(:last_status_at, type: 'date', value: ->(tag) { tag.last_status_at || tag.created_at })
+    field(:last_status_at, type: 'date', value: ->(tag) { clamp_date(tag.last_status_at || tag.created_at) })
   end
 end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 32fc378790..f3943bbb6b 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -18,8 +18,6 @@ class AccountsController < ApplicationController
     respond_to do |format|
       format.html do
         expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.hour) unless user_signed_in?
-
-        @rss_url = rss_url
       end
 
       format.rss do
@@ -84,29 +82,21 @@ class AccountsController < ApplicationController
       short_account_url(@account, format: 'rss')
     end
   end
+  helper_method :rss_url
 
   def media_requested?
-    request.path.split('.').first.end_with?('/media') && !tag_requested?
+    path_without_format.end_with?('/media') && !tag_requested?
   end
 
   def replies_requested?
-    request.path.split('.').first.end_with?('/with_replies') && !tag_requested?
+    path_without_format.end_with?('/with_replies') && !tag_requested?
   end
 
   def tag_requested?
-    request.path.split('.').first.end_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
+    path_without_format.end_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
   end
 
-  def cached_filtered_status_page
-    cache_collection_paginated_by_id(
-      filtered_statuses,
-      Status,
-      PAGE_SIZE,
-      params_slice(:max_id, :min_id, :since_id)
-    )
-  end
-
-  def params_slice(*keys)
-    params.slice(*keys).permit(*keys)
+  def path_without_format
+    request.path.split('.').first
   end
 end
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 5712dea888..e53b22dca3 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -32,7 +32,7 @@ module Admin
     private
 
     def batched_ordered_status_edits
-      @status.edits.reorder(nil).includes(:account, status: [:account]).find_each(order: :asc)
+      @status.edits.includes(:account, status: [:account]).find_each(order: :asc)
     end
     helper_method :batched_ordered_status_edits
 
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 76ba758245..8f31336b9f 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -16,6 +16,8 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
     current_user.update(user_params) if user_params
     ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
     render json: @account, serializer: REST::CredentialAccountSerializer
+  rescue ActiveRecord::RecordInvalid => e
+    render json: ValidationErrorFormatter.new(e).as_json, status: 422
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/familiar_followers_controller.rb b/app/controllers/api/v1/accounts/familiar_followers_controller.rb
index b0bd8018a2..a49eb2eb27 100644
--- a/app/controllers/api/v1/accounts/familiar_followers_controller.rb
+++ b/app/controllers/api/v1/accounts/familiar_followers_controller.rb
@@ -12,7 +12,7 @@ class Api::V1::Accounts::FamiliarFollowersController < Api::BaseController
   private
 
   def set_accounts
-    @accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections').index_by(&:id).values_at(*account_ids).compact
+    @accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections')
   end
 
   def familiar_followers
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index 320084efb5..e5ae5b007b 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -5,11 +5,8 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
   before_action :require_user!
 
   def index
-    scope = Account.where(id: account_ids).select('id')
-    scope.merge!(Account.without_suspended) unless truthy_param?(:with_suspended)
-    # .where doesn't guarantee that our results are in the same order
-    # we requested them, so return the "right" order to the requestor.
-    @accounts = scope.index_by(&:id).values_at(*account_ids).compact
+    @accounts = Account.where(id: account_ids).select('id')
+    @accounts.merge!(Account.without_suspended) unless truthy_param?(:with_suspended)
     render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb
index 4c17bd79c2..06e4fd8b8f 100644
--- a/app/controllers/api/v1/instances/activity_controller.rb
+++ b/app/controllers/api/v1/instances/activity_controller.rb
@@ -3,6 +3,8 @@
 class Api::V1::Instances::ActivityController < Api::V1::Instances::BaseController
   before_action :require_enabled_api!
 
+  WEEKS_OF_ACTIVITY = 12
+
   def show
     cache_even_if_authenticated!
     render_with_cache json: :activity, expires_in: 1.day
@@ -11,23 +13,40 @@ class Api::V1::Instances::ActivityController < Api::V1::Instances::BaseControlle
   private
 
   def activity
-    statuses_tracker      = ActivityTracker.new('activity:statuses:local', :basic)
-    logins_tracker        = ActivityTracker.new('activity:logins', :unique)
-    registrations_tracker = ActivityTracker.new('activity:accounts:local', :basic)
-
-    (0...12).map do |i|
-      start_of_week = i.weeks.ago
-      end_of_week   = start_of_week + 6.days
-
-      {
-        week: start_of_week.to_i.to_s,
-        statuses: statuses_tracker.sum(start_of_week, end_of_week).to_s,
-        logins: logins_tracker.sum(start_of_week, end_of_week).to_s,
-        registrations: registrations_tracker.sum(start_of_week, end_of_week).to_s,
-      }
+    activity_weeks.map do |weeks_ago|
+      activity_json(*week_edge_days(weeks_ago))
     end
   end
 
+  def activity_json(start_of_week, end_of_week)
+    {
+      week: start_of_week.to_i.to_s,
+      statuses: statuses_tracker.sum(start_of_week, end_of_week).to_s,
+      logins: logins_tracker.sum(start_of_week, end_of_week).to_s,
+      registrations: registrations_tracker.sum(start_of_week, end_of_week).to_s,
+    }
+  end
+
+  def activity_weeks
+    0...WEEKS_OF_ACTIVITY
+  end
+
+  def week_edge_days(num)
+    [num.weeks.ago, num.weeks.ago + 6.days]
+  end
+
+  def statuses_tracker
+    ActivityTracker.new('activity:statuses:local', :basic)
+  end
+
+  def logins_tracker
+    ActivityTracker.new('activity:logins', :unique)
+  end
+
+  def registrations_tracker
+    ActivityTracker.new('activity:accounts:local', :basic)
+  end
+
   def require_enabled_api!
     head 404 unless Setting.activity_api_enabled && !limited_federation_mode?
   end
diff --git a/app/controllers/api/v1/instances/domain_blocks_controller.rb b/app/controllers/api/v1/instances/domain_blocks_controller.rb
index 8fb90305ad..7ec94312f4 100644
--- a/app/controllers/api/v1/instances/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/instances/domain_blocks_controller.rb
@@ -19,7 +19,19 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr
   private
 
   def require_enabled_api!
-    head 404 unless Setting.show_domain_blocks == 'all' || (Setting.show_domain_blocks == 'users' && user_signed_in?)
+    head 404 unless api_enabled?
+  end
+
+  def api_enabled?
+    show_domain_blocks_for_all? || show_domain_blocks_to_user?
+  end
+
+  def show_domain_blocks_for_all?
+    Setting.show_domain_blocks == 'all'
+  end
+
+  def show_domain_blocks_to_user?
+    Setting.show_domain_blocks == 'users' && user_signed_in?
   end
 
   def set_domain_blocks
diff --git a/app/controllers/api/v1/statuses/histories_controller.rb b/app/controllers/api/v1/statuses/histories_controller.rb
index dcb21ef043..e381ea2c67 100644
--- a/app/controllers/api/v1/statuses/histories_controller.rb
+++ b/app/controllers/api/v1/statuses/histories_controller.rb
@@ -11,6 +11,6 @@ class Api::V1::Statuses::HistoriesController < Api::V1::Statuses::BaseController
   private
 
   def status_edits
-    @status.edits.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)]
+    @status.edits.ordered.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)]
   end
 end
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
new file mode 100644
index 0000000000..173e173cc9
--- /dev/null
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::V1::Timelines::BaseController < Api::BaseController
+  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
+
+  private
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_max_id
+    @statuses.last.id
+  end
+
+  def pagination_since_id
+    @statuses.first.id
+  end
+
+  def next_path_params
+    permitted_params.merge(max_id: pagination_max_id)
+  end
+
+  def prev_path_params
+    permitted_params.merge(min_id: pagination_since_id)
+  end
+
+  def permitted_params
+    params
+      .slice(*self.class::PERMITTED_PARAMS)
+      .permit(*self.class::PERMITTED_PARAMS)
+  end
+end
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 83b8cb4c66..36fdbea647 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::HomeController < Api::BaseController
+class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: [:show]
   before_action :require_user!, only: [:show]
-  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
+
+  PERMITTED_PARAMS = %i(local limit).freeze
 
   def show
     with_read_replica do
@@ -40,27 +41,11 @@ class Api::V1::Timelines::HomeController < Api::BaseController
     HomeFeed.new(current_account)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_params(core_params)
-    params.slice(:local, :limit).permit(:local, :limit).merge(core_params)
-  end
-
   def next_path
-    api_v1_timelines_home_url pagination_params(max_id: pagination_max_id)
+    api_v1_timelines_home_url next_path_params
   end
 
   def prev_path
-    api_v1_timelines_home_url pagination_params(min_id: pagination_since_id)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+    api_v1_timelines_home_url prev_path_params
   end
 end
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index a15eae468d..14b884ecd9 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::ListController < Api::BaseController
+class Api::V1::Timelines::ListController < Api::V1::Timelines::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:lists' }
   before_action :require_user!
   before_action :set_list
   before_action :set_statuses
 
-  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
+  PERMITTED_PARAMS = %i(limit).freeze
 
   def show
     render json: @statuses,
@@ -41,27 +41,11 @@ class Api::V1::Timelines::ListController < Api::BaseController
     ListFeed.new(@list)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
-    api_v1_timelines_list_url params[:id], pagination_params(max_id: pagination_max_id)
+    api_v1_timelines_list_url params[:id], next_path_params
   end
 
   def prev_path
-    api_v1_timelines_list_url params[:id], pagination_params(min_id: pagination_since_id)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+    api_v1_timelines_list_url params[:id], prev_path_params
   end
 end
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 6af504ff63..5bc8de8334 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::PublicController < Api::BaseController
+class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
   before_action :require_user!, only: [:show], if: :require_auth?
-  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
+
+  PERMITTED_PARAMS = %i(local remote limit only_media allow_local_only).freeze
 
   def show
     cache_if_unauthenticated!
@@ -45,27 +46,11 @@ class Api::V1::Timelines::PublicController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_params(core_params)
-    params.slice(:local, :remote, :limit, :only_media, :allow_local_only).permit(:local, :remote, :limit, :only_media, :allow_local_only).merge(core_params)
-  end
-
   def next_path
-    api_v1_timelines_public_url pagination_params(max_id: pagination_max_id)
+    api_v1_timelines_public_url next_path_params
   end
 
   def prev_path
-    api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+    api_v1_timelines_public_url prev_path_params
   end
 end
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index a79d65c124..4ba439dbb2 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::TagController < Api::BaseController
+class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :show, if: :require_auth?
   before_action :load_tag
-  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
+
+  PERMITTED_PARAMS = %i(local limit only_media).freeze
 
   def show
     cache_if_unauthenticated!
@@ -51,27 +52,11 @@ class Api::V1::Timelines::TagController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_params(core_params)
-    params.slice(:local, :limit, :only_media).permit(:local, :limit, :only_media).merge(core_params)
-  end
-
   def next_path
-    api_v1_timelines_tag_url params[:id], pagination_params(max_id: pagination_max_id)
+    api_v1_timelines_tag_url params[:id], next_path_params
   end
 
   def prev_path
-    api_v1_timelines_tag_url params[:id], pagination_params(min_id: pagination_since_id)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+    api_v1_timelines_tag_url params[:id], prev_path_params
   end
 end
diff --git a/app/controllers/api/v2/media_controller.rb b/app/controllers/api/v2/media_controller.rb
index 72bc694421..36c15165da 100644
--- a/app/controllers/api/v2/media_controller.rb
+++ b/app/controllers/api/v2/media_controller.rb
@@ -2,12 +2,22 @@
 
 class Api::V2::MediaController < Api::V1::MediaController
   def create
-    @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))
-    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: @media_attachment.not_processed? ? 202 : 200
+    @media_attachment = current_account.media_attachments.create!(media_and_delay_params)
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_from_media_processing
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     render json: file_type_error, status: 422
   rescue Paperclip::Error => e
     Rails.logger.error "#{e.class}: #{e.message}"
     render json: processing_error, status: 500
   end
+
+  private
+
+  def media_and_delay_params
+    { delay_processing: true }.merge(media_attachment_params)
+  end
+
+  def status_from_media_processing
+    @media_attachment.not_processed? ? 202 : 200
+  end
 end
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index 5167928e93..167d16fc4d 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -3,37 +3,13 @@
 class Api::Web::PushSubscriptionsController < Api::Web::BaseController
   before_action :require_user!
   before_action :set_push_subscription, only: :update
+  before_action :destroy_previous_subscriptions, only: :create, if: :prior_subscriptions?
+  after_action :update_session_with_subscription, only: :create
 
   def create
-    active_session = current_session
+    @push_subscription = ::Web::PushSubscription.create!(web_push_subscription_params)
 
-    unless active_session.web_push_subscription.nil?
-      active_session.web_push_subscription.destroy!
-      active_session.update!(web_push_subscription: nil)
-    end
-
-    # Mobile devices do not support regular notifications, so we enable push notifications by default
-    alerts_enabled = active_session.detection.device.mobile? || active_session.detection.device.tablet?
-
-    data = {
-      policy: 'all',
-      alerts: Notification::TYPES.index_with { alerts_enabled },
-    }
-
-    data.deep_merge!(data_params) if params[:data]
-
-    push_subscription = ::Web::PushSubscription.create!(
-      endpoint: subscription_params[:endpoint],
-      key_p256dh: subscription_params[:keys][:p256dh],
-      key_auth: subscription_params[:keys][:auth],
-      data: data,
-      user_id: active_session.user_id,
-      access_token_id: active_session.access_token_id
-    )
-
-    active_session.update!(web_push_subscription: push_subscription)
-
-    render json: push_subscription, serializer: REST::WebPushSubscriptionSerializer
+    render json: @push_subscription, serializer: REST::WebPushSubscriptionSerializer
   end
 
   def update
@@ -43,6 +19,41 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
 
   private
 
+  def active_session
+    @active_session ||= current_session
+  end
+
+  def destroy_previous_subscriptions
+    active_session.web_push_subscription.destroy!
+    active_session.update!(web_push_subscription: nil)
+  end
+
+  def prior_subscriptions?
+    active_session.web_push_subscription.present?
+  end
+
+  def subscription_data
+    default_subscription_data.tap do |data|
+      data.deep_merge!(data_params) if params[:data]
+    end
+  end
+
+  def default_subscription_data
+    {
+      policy: 'all',
+      alerts: Notification::TYPES.index_with { alerts_enabled },
+    }
+  end
+
+  def alerts_enabled
+    # Mobile devices do not support regular notifications, so we enable push notifications by default
+    active_session.detection.device.mobile? || active_session.detection.device.tablet?
+  end
+
+  def update_session_with_subscription
+    active_session.update!(web_push_subscription: @push_subscription)
+  end
+
   def set_push_subscription
     @push_subscription = ::Web::PushSubscription.find(params[:id])
   end
@@ -51,6 +62,17 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
     @subscription_params ||= params.require(:subscription).permit(:endpoint, keys: [:auth, :p256dh])
   end
 
+  def web_push_subscription_params
+    {
+      access_token_id: active_session.access_token_id,
+      data: subscription_data,
+      endpoint: subscription_params[:endpoint],
+      key_auth: subscription_params[:keys][:auth],
+      key_p256dh: subscription_params[:keys][:p256dh],
+      user_id: active_session.user_id,
+    }
+  end
+
   def data_params
     @data_params ||= params.require(:data).permit(:policy, alerts: Notification::TYPES)
   end
diff --git a/app/javascript/flavours/glitch/actions/account_notes.ts b/app/javascript/flavours/glitch/actions/account_notes.ts
index dbe9ee2a9f..1fb683e0d3 100644
--- a/app/javascript/flavours/glitch/actions/account_notes.ts
+++ b/app/javascript/flavours/glitch/actions/account_notes.ts
@@ -1,3 +1,4 @@
+import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
 import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
 
 import api from '../api';
@@ -5,8 +6,7 @@ import api from '../api';
 export const submitAccountNote = createAppAsyncThunk(
   'account_note/submit',
   async (args: { id: string; value: string }, { getState }) => {
-    // TODO: replace `unknown` with `ApiRelationshipJSON` when it is merged
-    const response = await api(getState).post<unknown>(
+    const response = await api(getState).post<ApiRelationshipJSON>(
       `/api/v1/accounts/${args.id}/note`,
       {
         comment: args.value,
diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
index bb03e68de8..a93c027def 100644
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@@ -1,5 +1,15 @@
 import api, { getLinks } from '../api';
 
+import {
+  followAccountSuccess, unfollowAccountSuccess,
+  authorizeFollowRequestSuccess, rejectFollowRequestSuccess,
+  followAccountRequest, followAccountFail,
+  unfollowAccountRequest, unfollowAccountFail,
+  muteAccountSuccess, unmuteAccountSuccess,
+  blockAccountSuccess, unblockAccountSuccess,
+  pinAccountSuccess, unpinAccountSuccess,
+  fetchRelationshipsSuccess,
+} from './accounts_typed';
 import { importFetchedAccount, importFetchedAccounts } from './importer';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
@@ -10,36 +20,22 @@ export const ACCOUNT_LOOKUP_REQUEST = 'ACCOUNT_LOOKUP_REQUEST';
 export const ACCOUNT_LOOKUP_SUCCESS = 'ACCOUNT_LOOKUP_SUCCESS';
 export const ACCOUNT_LOOKUP_FAIL    = 'ACCOUNT_LOOKUP_FAIL';
 
-export const ACCOUNT_FOLLOW_REQUEST = 'ACCOUNT_FOLLOW_REQUEST';
-export const ACCOUNT_FOLLOW_SUCCESS = 'ACCOUNT_FOLLOW_SUCCESS';
-export const ACCOUNT_FOLLOW_FAIL    = 'ACCOUNT_FOLLOW_FAIL';
-
-export const ACCOUNT_UNFOLLOW_REQUEST = 'ACCOUNT_UNFOLLOW_REQUEST';
-export const ACCOUNT_UNFOLLOW_SUCCESS = 'ACCOUNT_UNFOLLOW_SUCCESS';
-export const ACCOUNT_UNFOLLOW_FAIL    = 'ACCOUNT_UNFOLLOW_FAIL';
-
 export const ACCOUNT_BLOCK_REQUEST = 'ACCOUNT_BLOCK_REQUEST';
-export const ACCOUNT_BLOCK_SUCCESS = 'ACCOUNT_BLOCK_SUCCESS';
 export const ACCOUNT_BLOCK_FAIL    = 'ACCOUNT_BLOCK_FAIL';
 
 export const ACCOUNT_UNBLOCK_REQUEST = 'ACCOUNT_UNBLOCK_REQUEST';
-export const ACCOUNT_UNBLOCK_SUCCESS = 'ACCOUNT_UNBLOCK_SUCCESS';
 export const ACCOUNT_UNBLOCK_FAIL    = 'ACCOUNT_UNBLOCK_FAIL';
 
 export const ACCOUNT_MUTE_REQUEST = 'ACCOUNT_MUTE_REQUEST';
-export const ACCOUNT_MUTE_SUCCESS = 'ACCOUNT_MUTE_SUCCESS';
 export const ACCOUNT_MUTE_FAIL    = 'ACCOUNT_MUTE_FAIL';
 
 export const ACCOUNT_UNMUTE_REQUEST = 'ACCOUNT_UNMUTE_REQUEST';
-export const ACCOUNT_UNMUTE_SUCCESS = 'ACCOUNT_UNMUTE_SUCCESS';
 export const ACCOUNT_UNMUTE_FAIL    = 'ACCOUNT_UNMUTE_FAIL';
 
 export const ACCOUNT_PIN_REQUEST = 'ACCOUNT_PIN_REQUEST';
-export const ACCOUNT_PIN_SUCCESS = 'ACCOUNT_PIN_SUCCESS';
 export const ACCOUNT_PIN_FAIL    = 'ACCOUNT_PIN_FAIL';
 
 export const ACCOUNT_UNPIN_REQUEST = 'ACCOUNT_UNPIN_REQUEST';
-export const ACCOUNT_UNPIN_SUCCESS = 'ACCOUNT_UNPIN_SUCCESS';
 export const ACCOUNT_UNPIN_FAIL    = 'ACCOUNT_UNPIN_FAIL';
 
 export const FOLLOWERS_FETCH_REQUEST = 'FOLLOWERS_FETCH_REQUEST';
@@ -59,7 +55,6 @@ export const FOLLOWING_EXPAND_SUCCESS = 'FOLLOWING_EXPAND_SUCCESS';
 export const FOLLOWING_EXPAND_FAIL    = 'FOLLOWING_EXPAND_FAIL';
 
 export const RELATIONSHIPS_FETCH_REQUEST = 'RELATIONSHIPS_FETCH_REQUEST';
-export const RELATIONSHIPS_FETCH_SUCCESS = 'RELATIONSHIPS_FETCH_SUCCESS';
 export const RELATIONSHIPS_FETCH_FAIL    = 'RELATIONSHIPS_FETCH_FAIL';
 
 export const FOLLOW_REQUESTS_FETCH_REQUEST = 'FOLLOW_REQUESTS_FETCH_REQUEST';
@@ -91,9 +86,10 @@ export const PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE = 'PINNED_ACCOUNTS_EDITOR
 
 export const PINNED_ACCOUNTS_EDITOR_RESET = 'PINNED_ACCOUNTS_EDITOR_RESET';
 
-
 export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
 
+export * from './accounts_typed';
+
 export function fetchAccount(id) {
   return (dispatch, getState) => {
     dispatch(fetchRelationships([id]));
@@ -168,12 +164,12 @@ export function followAccount(id, options = { reblogs: true }) {
     const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
     const locked = getState().getIn(['accounts', id, 'locked'], false);
 
-    dispatch(followAccountRequest(id, locked));
+    dispatch(followAccountRequest({ id, locked }));
 
     api(getState).post(`/api/v1/accounts/${id}/follow`, options).then(response => {
-      dispatch(followAccountSuccess(response.data, alreadyFollowing));
+      dispatch(followAccountSuccess({relationship: response.data, alreadyFollowing}));
     }).catch(error => {
-      dispatch(followAccountFail(error, locked));
+      dispatch(followAccountFail({ id, error, locked }));
     });
   };
 }
@@ -183,74 +179,22 @@ export function unfollowAccount(id) {
     dispatch(unfollowAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/unfollow`).then(response => {
-      dispatch(unfollowAccountSuccess(response.data, getState().get('statuses')));
+      dispatch(unfollowAccountSuccess({relationship: response.data, statuses: getState().get('statuses')}));
     }).catch(error => {
-      dispatch(unfollowAccountFail(error));
+      dispatch(unfollowAccountFail({ id, error }));
     });
   };
 }
 
-export function followAccountRequest(id, locked) {
-  return {
-    type: ACCOUNT_FOLLOW_REQUEST,
-    id,
-    locked,
-    skipLoading: true,
-  };
-}
-
-export function followAccountSuccess(relationship, alreadyFollowing) {
-  return {
-    type: ACCOUNT_FOLLOW_SUCCESS,
-    relationship,
-    alreadyFollowing,
-    skipLoading: true,
-  };
-}
-
-export function followAccountFail(error, locked) {
-  return {
-    type: ACCOUNT_FOLLOW_FAIL,
-    error,
-    locked,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountRequest(id) {
-  return {
-    type: ACCOUNT_UNFOLLOW_REQUEST,
-    id,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_UNFOLLOW_SUCCESS,
-    relationship,
-    statuses,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountFail(error) {
-  return {
-    type: ACCOUNT_UNFOLLOW_FAIL,
-    error,
-    skipLoading: true,
-  };
-}
-
 export function blockAccount(id) {
   return (dispatch, getState) => {
     dispatch(blockAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/block`).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
-      dispatch(blockAccountSuccess(response.data, getState().get('statuses')));
+      dispatch(blockAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
-      dispatch(blockAccountFail(id, error));
+      dispatch(blockAccountFail({ id, error }));
     });
   };
 }
@@ -260,9 +204,9 @@ export function unblockAccount(id) {
     dispatch(unblockAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/unblock`).then(response => {
-      dispatch(unblockAccountSuccess(response.data));
+      dispatch(unblockAccountSuccess({ relationship: response.data }));
     }).catch(error => {
-      dispatch(unblockAccountFail(id, error));
+      dispatch(unblockAccountFail({ id, error }));
     });
   };
 }
@@ -273,15 +217,6 @@ export function blockAccountRequest(id) {
     id,
   };
 }
-
-export function blockAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_BLOCK_SUCCESS,
-    relationship,
-    statuses,
-  };
-}
-
 export function blockAccountFail(error) {
   return {
     type: ACCOUNT_BLOCK_FAIL,
@@ -296,13 +231,6 @@ export function unblockAccountRequest(id) {
   };
 }
 
-export function unblockAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNBLOCK_SUCCESS,
-    relationship,
-  };
-}
-
 export function unblockAccountFail(error) {
   return {
     type: ACCOUNT_UNBLOCK_FAIL,
@@ -317,9 +245,9 @@ export function muteAccount(id, notifications, duration=0) {
 
     api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
       // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
-      dispatch(muteAccountSuccess(response.data, getState().get('statuses')));
+      dispatch(muteAccountSuccess({ relationship: response.data, statuses: getState().get('statuses') }));
     }).catch(error => {
-      dispatch(muteAccountFail(id, error));
+      dispatch(muteAccountFail({ id, error }));
     });
   };
 }
@@ -329,9 +257,9 @@ export function unmuteAccount(id) {
     dispatch(unmuteAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/unmute`).then(response => {
-      dispatch(unmuteAccountSuccess(response.data));
+      dispatch(unmuteAccountSuccess({ relationship: response.data }));
     }).catch(error => {
-      dispatch(unmuteAccountFail(id, error));
+      dispatch(unmuteAccountFail({ id, error }));
     });
   };
 }
@@ -343,14 +271,6 @@ export function muteAccountRequest(id) {
   };
 }
 
-export function muteAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_MUTE_SUCCESS,
-    relationship,
-    statuses,
-  };
-}
-
 export function muteAccountFail(error) {
   return {
     type: ACCOUNT_MUTE_FAIL,
@@ -365,13 +285,6 @@ export function unmuteAccountRequest(id) {
   };
 }
 
-export function unmuteAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNMUTE_SUCCESS,
-    relationship,
-  };
-}
-
 export function unmuteAccountFail(error) {
   return {
     type: ACCOUNT_UNMUTE_FAIL,
@@ -568,7 +481,7 @@ export function fetchRelationships(accountIds) {
     dispatch(fetchRelationshipsRequest(newAccountIds));
 
     api(getState).get(`/api/v1/accounts/relationships?with_suspended=true&${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
-      dispatch(fetchRelationshipsSuccess(response.data));
+      dispatch(fetchRelationshipsSuccess({ relationships: response.data }));
     }).catch(error => {
       dispatch(fetchRelationshipsFail(error));
     });
@@ -583,14 +496,6 @@ export function fetchRelationshipsRequest(ids) {
   };
 }
 
-export function fetchRelationshipsSuccess(relationships) {
-  return {
-    type: RELATIONSHIPS_FETCH_SUCCESS,
-    relationships,
-    skipLoading: true,
-  };
-}
-
 export function fetchRelationshipsFail(error) {
   return {
     type: RELATIONSHIPS_FETCH_FAIL,
@@ -678,7 +583,7 @@ export function authorizeFollowRequest(id) {
 
     api(getState)
       .post(`/api/v1/follow_requests/${id}/authorize`)
-      .then(() => dispatch(authorizeFollowRequestSuccess(id)))
+      .then(() => dispatch(authorizeFollowRequestSuccess({ id })))
       .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
   };
 }
@@ -690,13 +595,6 @@ export function authorizeFollowRequestRequest(id) {
   };
 }
 
-export function authorizeFollowRequestSuccess(id) {
-  return {
-    type: FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
-    id,
-  };
-}
-
 export function authorizeFollowRequestFail(id, error) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_FAIL,
@@ -712,7 +610,7 @@ export function rejectFollowRequest(id) {
 
     api(getState)
       .post(`/api/v1/follow_requests/${id}/reject`)
-      .then(() => dispatch(rejectFollowRequestSuccess(id)))
+      .then(() => dispatch(rejectFollowRequestSuccess({ id })))
       .catch(error => dispatch(rejectFollowRequestFail(id, error)));
   };
 }
@@ -724,13 +622,6 @@ export function rejectFollowRequestRequest(id) {
   };
 }
 
-export function rejectFollowRequestSuccess(id) {
-  return {
-    type: FOLLOW_REQUEST_REJECT_SUCCESS,
-    id,
-  };
-}
-
 export function rejectFollowRequestFail(id, error) {
   return {
     type: FOLLOW_REQUEST_REJECT_FAIL,
@@ -744,7 +635,7 @@ export function pinAccount(id) {
     dispatch(pinAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/pin`).then(response => {
-      dispatch(pinAccountSuccess(response.data));
+      dispatch(pinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(pinAccountFail(error));
     });
@@ -756,7 +647,7 @@ export function unpinAccount(id) {
     dispatch(unpinAccountRequest(id));
 
     api(getState).post(`/api/v1/accounts/${id}/unpin`).then(response => {
-      dispatch(unpinAccountSuccess(response.data));
+      dispatch(unpinAccountSuccess({ relationship: response.data }));
     }).catch(error => {
       dispatch(unpinAccountFail(error));
     });
@@ -770,13 +661,6 @@ export function pinAccountRequest(id) {
   };
 }
 
-export function pinAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_PIN_SUCCESS,
-    relationship,
-  };
-}
-
 export function pinAccountFail(error) {
   return {
     type: ACCOUNT_PIN_FAIL,
@@ -791,13 +675,6 @@ export function unpinAccountRequest(id) {
   };
 }
 
-export function unpinAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNPIN_SUCCESS,
-    relationship,
-  };
-}
-
 export function unpinAccountFail(error) {
   return {
     type: ACCOUNT_UNPIN_FAIL,
@@ -805,11 +682,6 @@ export function unpinAccountFail(error) {
   };
 }
 
-export const revealAccount = id => ({
-  type: ACCOUNT_REVEAL,
-  id,
-});
-
 export function fetchPinnedAccounts() {
   return (dispatch, getState) => {
     dispatch(fetchPinnedAccountsRequest());
diff --git a/app/javascript/flavours/glitch/actions/accounts_typed.ts b/app/javascript/flavours/glitch/actions/accounts_typed.ts
new file mode 100644
index 0000000000..22aaa48a0d
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/accounts_typed.ts
@@ -0,0 +1,97 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
+
+export const revealAccount = createAction<{
+  id: string;
+}>('accounts/revealAccount');
+
+export const importAccounts = createAction<{ accounts: ApiAccountJSON[] }>(
+  'accounts/importAccounts',
+);
+
+function actionWithSkipLoadingTrue<Args extends object>(args: Args) {
+  return {
+    payload: {
+      ...args,
+      skipLoading: true,
+    },
+  };
+}
+
+export const followAccountSuccess = createAction(
+  'accounts/followAccount/SUCCESS',
+  actionWithSkipLoadingTrue<{
+    relationship: ApiRelationshipJSON;
+    alreadyFollowing: boolean;
+  }>,
+);
+
+export const unfollowAccountSuccess = createAction(
+  'accounts/unfollowAccount/SUCCESS',
+  actionWithSkipLoadingTrue<{
+    relationship: ApiRelationshipJSON;
+    statuses: unknown;
+    alreadyFollowing?: boolean;
+  }>,
+);
+
+export const authorizeFollowRequestSuccess = createAction<{ id: string }>(
+  'accounts/followRequestAuthorize/SUCCESS',
+);
+
+export const rejectFollowRequestSuccess = createAction<{ id: string }>(
+  'accounts/followRequestReject/SUCCESS',
+);
+
+export const followAccountRequest = createAction(
+  'accounts/follow/REQUEST',
+  actionWithSkipLoadingTrue<{ id: string; locked: boolean }>,
+);
+
+export const followAccountFail = createAction(
+  'accounts/follow/FAIL',
+  actionWithSkipLoadingTrue<{ id: string; error: string; locked: boolean }>,
+);
+
+export const unfollowAccountRequest = createAction(
+  'accounts/unfollow/REQUEST',
+  actionWithSkipLoadingTrue<{ id: string }>,
+);
+
+export const unfollowAccountFail = createAction(
+  'accounts/unfollow/FAIL',
+  actionWithSkipLoadingTrue<{ id: string; error: string }>,
+);
+
+export const blockAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+  statuses: unknown;
+}>('accounts/block/SUCCESS');
+
+export const unblockAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+}>('accounts/unblock/SUCCESS');
+
+export const muteAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+  statuses: unknown;
+}>('accounts/mute/SUCCESS');
+
+export const unmuteAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+}>('accounts/unmute/SUCCESS');
+
+export const pinAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+}>('accounts/pin/SUCCESS');
+
+export const unpinAccountSuccess = createAction<{
+  relationship: ApiRelationshipJSON;
+}>('accounts/unpin/SUCCESS');
+
+export const fetchRelationshipsSuccess = createAction(
+  'relationships/fetch/SUCCESS',
+  actionWithSkipLoadingTrue<{ relationships: ApiRelationshipJSON[] }>,
+);
diff --git a/app/javascript/flavours/glitch/actions/domain_blocks.js b/app/javascript/flavours/glitch/actions/domain_blocks.js
index d06de20a2d..718002613f 100644
--- a/app/javascript/flavours/glitch/actions/domain_blocks.js
+++ b/app/javascript/flavours/glitch/actions/domain_blocks.js
@@ -1,11 +1,13 @@
 import api, { getLinks } from '../api';
 
+import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+
+export * from "./domain_blocks_typed";
+
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
-export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
 export const DOMAIN_BLOCK_FAIL    = 'DOMAIN_BLOCK_FAIL';
 
 export const DOMAIN_UNBLOCK_REQUEST = 'DOMAIN_UNBLOCK_REQUEST';
-export const DOMAIN_UNBLOCK_SUCCESS = 'DOMAIN_UNBLOCK_SUCCESS';
 export const DOMAIN_UNBLOCK_FAIL    = 'DOMAIN_UNBLOCK_FAIL';
 
 export const DOMAIN_BLOCKS_FETCH_REQUEST = 'DOMAIN_BLOCKS_FETCH_REQUEST';
@@ -24,7 +26,7 @@ export function blockDomain(domain) {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
 
-      dispatch(blockDomainSuccess(domain, accounts));
+      dispatch(blockDomainSuccess({ domain, accounts }));
     }).catch(err => {
       dispatch(blockDomainFail(domain, err));
     });
@@ -38,14 +40,6 @@ export function blockDomainRequest(domain) {
   };
 }
 
-export function blockDomainSuccess(domain, accounts) {
-  return {
-    type: DOMAIN_BLOCK_SUCCESS,
-    domain,
-    accounts,
-  };
-}
-
 export function blockDomainFail(domain, error) {
   return {
     type: DOMAIN_BLOCK_FAIL,
@@ -61,7 +55,7 @@ export function unblockDomain(domain) {
     api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
       const at_domain = '@' + domain;
       const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
-      dispatch(unblockDomainSuccess(domain, accounts));
+      dispatch(unblockDomainSuccess({ domain, accounts }));
     }).catch(err => {
       dispatch(unblockDomainFail(domain, err));
     });
@@ -75,14 +69,6 @@ export function unblockDomainRequest(domain) {
   };
 }
 
-export function unblockDomainSuccess(domain, accounts) {
-  return {
-    type: DOMAIN_UNBLOCK_SUCCESS,
-    domain,
-    accounts,
-  };
-}
-
 export function unblockDomainFail(domain, error) {
   return {
     type: DOMAIN_UNBLOCK_FAIL,
diff --git a/app/javascript/flavours/glitch/actions/domain_blocks_typed.ts b/app/javascript/flavours/glitch/actions/domain_blocks_typed.ts
new file mode 100644
index 0000000000..c5c4a76ba6
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/domain_blocks_typed.ts
@@ -0,0 +1,13 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { Account } from 'flavours/glitch/models/account';
+
+export const blockDomainSuccess = createAction<{
+  domain: string;
+  accounts: Account[];
+}>('domain_blocks/block/SUCCESS');
+
+export const unblockDomainSuccess = createAction<{
+  domain: string;
+  accounts: Account[];
+}>('domain_blocks/unblock/SUCCESS');
diff --git a/app/javascript/flavours/glitch/actions/importer/index.js b/app/javascript/flavours/glitch/actions/importer/index.js
index 3d01a96dd8..5fbc9bb5bb 100644
--- a/app/javascript/flavours/glitch/actions/importer/index.js
+++ b/app/javascript/flavours/glitch/actions/importer/index.js
@@ -1,7 +1,7 @@
-import { normalizeAccount, normalizeStatus, normalizePoll } from './normalizer';
+import { importAccounts } from '../accounts_typed';
+
+import { normalizeStatus, normalizePoll } from './normalizer';
 
-export const ACCOUNT_IMPORT  = 'ACCOUNT_IMPORT';
-export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
 export const STATUS_IMPORT   = 'STATUS_IMPORT';
 export const STATUSES_IMPORT = 'STATUSES_IMPORT';
 export const POLLS_IMPORT    = 'POLLS_IMPORT';
@@ -13,14 +13,6 @@ function pushUnique(array, object) {
   }
 }
 
-export function importAccount(account) {
-  return { type: ACCOUNT_IMPORT, account };
-}
-
-export function importAccounts(accounts) {
-  return { type: ACCOUNTS_IMPORT, accounts };
-}
-
 export function importStatus(status) {
   return { type: STATUS_IMPORT, status };
 }
@@ -45,7 +37,7 @@ export function importFetchedAccounts(accounts) {
   const normalAccounts = [];
 
   function processAccount(account) {
-    pushUnique(normalAccounts, normalizeAccount(account));
+    pushUnique(normalAccounts, account);
 
     if (account.moved) {
       processAccount(account.moved);
@@ -54,7 +46,7 @@ export function importFetchedAccounts(accounts) {
 
   accounts.forEach(processAccount);
 
-  return importAccounts(normalAccounts);
+  return importAccounts({ accounts: normalAccounts });
 }
 
 export function importFetchedStatus(status) {
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index 506e5ee6ad..c2ad0f9908 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -2,7 +2,6 @@ import escapeTextContentForBrowser from 'escape-html';
 
 import emojify from '../../features/emoji/emoji';
 import { autoHideCW } from '../../utils/content_warning';
-import { unescapeHTML } from '../../utils/html';
 
 const domParser = new DOMParser();
 
@@ -17,32 +16,6 @@ export function searchTextFromRawStatus (status) {
   return domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
 }
 
-export function normalizeAccount(account) {
-  account = { ...account };
-
-  const emojiMap = makeEmojiMap(account.emojis);
-  const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
-
-  account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
-  account.note_emojified = emojify(account.note, emojiMap);
-  account.note_plain = unescapeHTML(account.note);
-
-  if (account.fields) {
-    account.fields = account.fields.map(pair => ({
-      ...pair,
-      name_emojified: emojify(escapeTextContentForBrowser(pair.name), emojiMap),
-      value_emojified: emojify(pair.value, emojiMap),
-      value_plain: unescapeHTML(pair.value),
-    }));
-  }
-
-  if (account.moved) {
-    account.moved = account.moved.id;
-  }
-
-  return account;
-}
-
 export function normalizeFilterResult(result) {
   const normalResult = { ...result };
 
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index e63f10359b..6a0bf01b90 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -18,10 +18,12 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { submitMarkers } from './markers';
+import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
 
-export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
+export * from "./notifications_typed";
+
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
 
 // tracking the notif cleaning request
@@ -107,12 +109,8 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
         dispatch(importFetchedAccount(notification.report.target_account));
       }
 
-      dispatch({
-        type: NOTIFICATIONS_UPDATE,
-        notification,
-        usePendingItems: preferPendingItems,
-        meta: (playSound && !filtered) ? { sound: 'boop' } : undefined,
-      });
+
+      dispatch(notificationsUpdate({ notification, preferPendingItems, playSound: playSound && !filtered}));
 
       fetchRelatedRelationships(dispatch, [notification]);
     } else if (playSound && !filtered) {
diff --git a/app/javascript/flavours/glitch/actions/notifications_typed.ts b/app/javascript/flavours/glitch/actions/notifications_typed.ts
new file mode 100644
index 0000000000..176362f4b1
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notifications_typed.ts
@@ -0,0 +1,23 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { ApiAccountJSON } from '../api_types/accounts';
+// To be replaced once ApiNotificationJSON type exists
+interface FakeApiNotificationJSON {
+  type: string;
+  account: ApiAccountJSON;
+}
+
+export const notificationsUpdate = createAction(
+  'notifications/update',
+  ({
+    playSound,
+    ...args
+  }: {
+    notification: FakeApiNotificationJSON;
+    usePendingItems: boolean;
+    playSound: boolean;
+  }) => ({
+    payload: args,
+    meta: { sound: playSound ? 'boop' : undefined },
+  }),
+);
diff --git a/app/javascript/flavours/glitch/actions/store.js b/app/javascript/flavours/glitch/actions/store.js
index da07142b3b..4a33d7ef87 100644
--- a/app/javascript/flavours/glitch/actions/store.js
+++ b/app/javascript/flavours/glitch/actions/store.js
@@ -25,6 +25,7 @@ const applyMigrations = (state) => {
   });
 };
 
+
 export function hydrateStore(rawState) {
   return dispatch => {
     const state = applyMigrations(convertState(rawState));
diff --git a/app/javascript/flavours/glitch/api_types/accounts.ts b/app/javascript/flavours/glitch/api_types/accounts.ts
new file mode 100644
index 0000000000..ce55dc604a
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/accounts.ts
@@ -0,0 +1,45 @@
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+
+export interface ApiAccountFieldJSON {
+  name: string;
+  value: string;
+  verified_at: string | null;
+}
+
+export interface ApiAccountRoleJSON {
+  color: string;
+  id: string;
+  name: string;
+}
+
+// See app/serializers/rest/account_serializer.rb
+export interface ApiAccountJSON {
+  acct: string;
+  avatar: string;
+  avatar_static: string;
+  bot: boolean;
+  created_at: string;
+  discoverable: boolean;
+  display_name: string;
+  emojis: ApiCustomEmojiJSON[];
+  fields: ApiAccountFieldJSON[];
+  followers_count: number;
+  following_count: number;
+  group: boolean;
+  header: string;
+  header_static: string;
+  id: string;
+  last_status_at: string;
+  locked: boolean;
+  noindex?: boolean;
+  note: string;
+  roles?: ApiAccountJSON[];
+  statuses_count: number;
+  uri: string;
+  url: string;
+  username: string;
+  moved?: ApiAccountJSON;
+  suspended?: boolean;
+  limited?: boolean;
+  memorial?: boolean;
+}
diff --git a/app/javascript/flavours/glitch/api_types/custom_emoji.ts b/app/javascript/flavours/glitch/api_types/custom_emoji.ts
new file mode 100644
index 0000000000..05144d6f68
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/custom_emoji.ts
@@ -0,0 +1,8 @@
+// See app/serializers/rest/account_serializer.rb
+export interface ApiCustomEmojiJSON {
+  shortcode: string;
+  static_url: string;
+  url: string;
+  category?: string;
+  visible_in_picker: boolean;
+}
diff --git a/app/javascript/flavours/glitch/api_types/relationships.ts b/app/javascript/flavours/glitch/api_types/relationships.ts
new file mode 100644
index 0000000000..9f26a0ce9b
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/relationships.ts
@@ -0,0 +1,18 @@
+// See app/serializers/rest/relationship_serializer.rb
+export interface ApiRelationshipJSON {
+  blocked_by: boolean;
+  blocking: boolean;
+  domain_blocking: boolean;
+  endorsed: boolean;
+  followed_by: boolean;
+  following: boolean;
+  id: string;
+  languages: string[] | null;
+  muting_notifications: boolean;
+  muting: boolean;
+  note: string;
+  notifying: boolean;
+  requested_by: boolean;
+  requested: boolean;
+  showing_reblogs: boolean;
+}
diff --git a/app/javascript/flavours/glitch/components/account.jsx b/app/javascript/flavours/glitch/components/account.jsx
index 36d8a62b32..109e0daddd 100644
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@@ -36,7 +36,7 @@ class Account extends ImmutablePureComponent {
 
   static propTypes = {
     size: PropTypes.number,
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMute: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/components/avatar.tsx b/app/javascript/flavours/glitch/components/avatar.tsx
index 7ed2d003ef..c45c26981f 100644
--- a/app/javascript/flavours/glitch/components/avatar.tsx
+++ b/app/javascript/flavours/glitch/components/avatar.tsx
@@ -1,8 +1,9 @@
 import classNames from 'classnames';
 
+import type { Account } from 'flavours/glitch/models/account';
+
 import { useHovering } from '../hooks/useHovering';
 import { autoPlayGif } from '../initial_state';
-import type { Account } from '../types/resources';
 
 interface Props {
   account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
diff --git a/app/javascript/flavours/glitch/components/avatar_overlay.tsx b/app/javascript/flavours/glitch/components/avatar_overlay.tsx
index da9c293856..cddca43d5b 100644
--- a/app/javascript/flavours/glitch/components/avatar_overlay.tsx
+++ b/app/javascript/flavours/glitch/components/avatar_overlay.tsx
@@ -1,6 +1,7 @@
+import type { Account } from 'flavours/glitch/models/account';
+
 import { useHovering } from '../hooks/useHovering';
 import { autoPlayGif } from '../initial_state';
-import type { Account } from '../types/resources';
 
 interface Props {
   account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
diff --git a/app/javascript/flavours/glitch/components/display_name.tsx b/app/javascript/flavours/glitch/components/display_name.tsx
index 3ad00b5855..82b66b5748 100644
--- a/app/javascript/flavours/glitch/components/display_name.tsx
+++ b/app/javascript/flavours/glitch/components/display_name.tsx
@@ -4,8 +4,9 @@ import classNames from 'classnames';
 
 import type { List } from 'immutable';
 
+import type { Account } from 'flavours/glitch/models/account';
+
 import { autoPlayGif } from '../initial_state';
-import type { Account } from '../types/resources';
 
 import { Skeleton } from './skeleton';
 
diff --git a/app/javascript/flavours/glitch/components/inline_account.jsx b/app/javascript/flavours/glitch/components/inline_account.jsx
index 98e44c05e0..ec3460ea4a 100644
--- a/app/javascript/flavours/glitch/components/inline_account.jsx
+++ b/app/javascript/flavours/glitch/components/inline_account.jsx
@@ -19,7 +19,7 @@ const makeMapStateToProps = () => {
 class InlineAccount extends PureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
   };
 
   render () {
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 94754f0f29..141483dd01 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -80,7 +80,7 @@ class Status extends ImmutablePureComponent {
     containerId: PropTypes.string,
     id: PropTypes.string,
     status: ImmutablePropTypes.map,
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     previousId: PropTypes.string,
     nextInReplyToId: PropTypes.string,
     rootId: PropTypes.string,
diff --git a/app/javascript/flavours/glitch/features/account/components/account_note.jsx b/app/javascript/flavours/glitch/features/account/components/account_note.jsx
index bab523acf6..272a4ee312 100644
--- a/app/javascript/flavours/glitch/features/account/components/account_note.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/account_note.jsx
@@ -49,7 +49,7 @@ class InlineAlert extends PureComponent {
 class AccountNote extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     value: PropTypes.string,
     onSave: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx b/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx
index 720acab43f..1b9e3572db 100644
--- a/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx
@@ -15,7 +15,7 @@ const messages = defineMessages({
 class FeaturedTags extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     featuredTags: ImmutablePropTypes.list,
     tagged: PropTypes.string,
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx b/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx
index 7368ce9758..463499cbf8 100644
--- a/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx
@@ -8,7 +8,7 @@ import { Icon } from 'flavours/glitch/components/icon';
 export default class FollowRequestNote extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
   };
 
   render () {
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index c4fb2162af..c2b827d9e1 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -83,7 +83,7 @@ const dateFormatOptions = {
 class Header extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     identity_props: ImmutablePropTypes.list,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
index c38c1efa1b..eb2ddbdd80 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
@@ -18,7 +18,7 @@ import MovedNote from './moved_note';
 class Header extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx
deleted file mode 100644
index d28ad77c55..0000000000
--- a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { revealAccount } from 'flavours/glitch/actions/accounts';
-import { Button } from 'flavours/glitch/components/button';
-import { domain } from 'flavours/glitch/initial_state';
-
-const mapDispatchToProps = (dispatch, { accountId }) => ({
-
-  reveal () {
-    dispatch(revealAccount(accountId));
-  },
-
-});
-
-class LimitedAccountHint extends PureComponent {
-
-  static propTypes = {
-    accountId: PropTypes.string.isRequired,
-    reveal: PropTypes.func,
-  };
-
-  render () {
-    const { reveal } = this.props;
-
-    return (
-      <div className='limited-account-hint'>
-        <p><FormattedMessage id='limited_account_hint.title' defaultMessage='This profile has been hidden by the moderators of {domain}.' values={{ domain }} /></p>
-        <Button onClick={reveal}><FormattedMessage id='limited_account_hint.action' defaultMessage='Show profile anyway' /></Button>
-      </div>
-    );
-  }
-
-}
-
-export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.tsx
new file mode 100644
index 0000000000..5613811d2f
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.tsx
@@ -0,0 +1,35 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { revealAccount } from 'flavours/glitch/actions/accounts_typed';
+import { Button } from 'flavours/glitch/components/button';
+import { domain } from 'flavours/glitch/initial_state';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+export const LimitedAccountHint: React.FC<{ accountId: string }> = ({
+  accountId,
+}) => {
+  const dispatch = useAppDispatch();
+  const reveal = useCallback(() => {
+    dispatch(revealAccount({ id: accountId }));
+  }, [dispatch, accountId]);
+
+  return (
+    <div className='limited-account-hint'>
+      <p>
+        <FormattedMessage
+          id='limited_account_hint.title'
+          defaultMessage='This profile has been hidden by the moderators of {domain}.'
+          values={{ domain }}
+        />
+      </p>
+      <Button onClick={reveal}>
+        <FormattedMessage
+          id='limited_account_hint.action'
+          defaultMessage='Show profile anyway'
+        />
+      </Button>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/account_timeline/index.jsx b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
index d86951fcd3..cf99a1f569 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
@@ -20,7 +20,7 @@ import { LoadingIndicator } from '../../components/loading_indicator';
 import StatusList from '../../components/status_list';
 import Column from '../ui/components/column';
 
-import LimitedAccountHint from './components/limited_account_hint';
+import { LimitedAccountHint } from './components/limited_account_hint';
 import HeaderContainer from './containers/header_container';
 
 const emptyList = ImmutableList();
diff --git a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
index ff7d4d03dc..ebaacd7d9a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
@@ -28,7 +28,7 @@ const messages = defineMessages({
 class ActionBar extends PureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     onLogout: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
diff --git a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
index 3efa2edf0a..8ffc9062e5 100644
--- a/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx
@@ -7,7 +7,7 @@ import { DisplayName } from '../../../components/display_name';
 export default class AutosuggestAccount extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
   };
 
   render () {
diff --git a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
index 85f97a5c91..9f88b0e92a 100644
--- a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx
@@ -15,7 +15,7 @@ import ActionBar from './action_bar';
 export default class NavigationBar extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     onLogout: PropTypes.func.isRequired,
     onClose: PropTypes.func,
   };
diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx
index 64732068ed..2944be798f 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx
@@ -271,6 +271,7 @@ class Search extends PureComponent {
   }
 
   _calculateOptions (value) {
+    const { signedIn } = this.context.identity;
     const trimmedValue = value.trim();
     const options = [];
 
@@ -295,7 +296,7 @@ class Search extends PureComponent {
 
       const couldBeStatusSearch = searchEnabled;
 
-      if (couldBeStatusSearch) {
+      if (couldBeStatusSearch && signedIn) {
         options.push({ key: 'status-search', label: <FormattedMessage id='search.quick_action.status_search' defaultMessage='Posts matching {x}' values={{ x: <mark>{trimmedValue}</mark> }} />, action: this.handleStatusSearch });
       }
 
@@ -372,7 +373,7 @@ class Search extends PureComponent {
 
           <h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
 
-          {searchEnabled ? (
+          {searchEnabled && signedIn ? (
             <div className='search__popout__menu'>
               {this.defaultOptions.map(({ key, label, action }, i) => (
                 <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item', { selected: selectedOption === ((options.length || recent.size) + i) })}>
@@ -382,7 +383,11 @@ class Search extends PureComponent {
             </div>
           ) : (
             <div className='search__popout__menu__message'>
-              <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+              {searchEnabled ? (
+                <FormattedMessage id='search_popout.full_text_search_logged_out_message' defaultMessage='Only available when logged in.' />
+              ) : (
+                <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+              )}
             </div>
           )}
         </div>
diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
index 92fa84201e..27b363bd08 100644
--- a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
+++ b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
@@ -104,7 +104,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 class AccountCard extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     intl: PropTypes.object.isRequired,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
index 54a75dca70..5746af1b39 100644
--- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
@@ -18,7 +18,7 @@ const messages = defineMessages({
 class AccountAuthorize extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     onAuthorize: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/flavours/glitch/features/followers/index.jsx b/app/javascript/flavours/glitch/features/followers/index.jsx
index f3bcfbf271..6226c96f21 100644
--- a/app/javascript/flavours/glitch/features/followers/index.jsx
+++ b/app/javascript/flavours/glitch/features/followers/index.jsx
@@ -23,7 +23,7 @@ import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
 import AccountContainer from '../../containers/account_container';
 import ProfileColumnHeader from '../account/components/profile_column_header';
-import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { LimitedAccountHint } from '../account_timeline/components/limited_account_hint';
 import HeaderContainer from '../account_timeline/containers/header_container';
 import Column from '../ui/components/column';
 
diff --git a/app/javascript/flavours/glitch/features/following/index.jsx b/app/javascript/flavours/glitch/features/following/index.jsx
index 4ff59f6358..6993634302 100644
--- a/app/javascript/flavours/glitch/features/following/index.jsx
+++ b/app/javascript/flavours/glitch/features/following/index.jsx
@@ -23,7 +23,7 @@ import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
 import AccountContainer from '../../containers/account_container';
 import ProfileColumnHeader from '../account/components/profile_column_header';
-import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { LimitedAccountHint } from '../account_timeline/components/limited_account_hint';
 import HeaderContainer from '../account_timeline/containers/header_container';
 import Column from '../ui/components/column';
 
diff --git a/app/javascript/flavours/glitch/features/list_adder/components/account.jsx b/app/javascript/flavours/glitch/features/list_adder/components/account.jsx
index 31a2e96379..94a90726e3 100644
--- a/app/javascript/flavours/glitch/features/list_adder/components/account.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/account.jsx
@@ -21,7 +21,7 @@ const makeMapStateToProps = () => {
 class Account extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
   };
 
   render () {
diff --git a/app/javascript/flavours/glitch/features/list_editor/components/account.jsx b/app/javascript/flavours/glitch/features/list_editor/components/account.jsx
index 4618bd1c16..96b5e96df8 100644
--- a/app/javascript/flavours/glitch/features/list_editor/components/account.jsx
+++ b/app/javascript/flavours/glitch/features/list_editor/components/account.jsx
@@ -36,7 +36,7 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
 class Account extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     intl: PropTypes.object.isRequired,
     onRemove: PropTypes.func.isRequired,
     onAdd: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
index 831095200a..e7131829b3 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
@@ -27,7 +27,7 @@ const messages = defineMessages({
 class FollowRequest extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     onAuthorize: PropTypes.func.isRequired,
     onReject: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/flavours/glitch/features/notifications/components/report.jsx b/app/javascript/flavours/glitch/features/notifications/components/report.jsx
index decee64db4..0d80582e9f 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/report.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/report.jsx
@@ -20,7 +20,7 @@ const messages = defineMessages({
 class Report extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     report: ImmutablePropTypes.map.isRequired,
     hidden: PropTypes.bool,
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/flavours/glitch/features/onboarding/index.jsx b/app/javascript/flavours/glitch/features/onboarding/index.jsx
index 64cf42efac..3bce573a1d 100644
--- a/app/javascript/flavours/glitch/features/onboarding/index.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/index.jsx
@@ -42,7 +42,7 @@ const mapStateToProps = () => {
 class Onboarding extends ImmutablePureComponent {
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     multiColumn: PropTypes.bool,
     ...WithRouterPropTypes,
   };
diff --git a/app/javascript/flavours/glitch/features/onboarding/share.jsx b/app/javascript/flavours/glitch/features/onboarding/share.jsx
index 488096654c..84dc6d8e65 100644
--- a/app/javascript/flavours/glitch/features/onboarding/share.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/share.jsx
@@ -145,7 +145,7 @@ class Share extends PureComponent {
 
   static propTypes = {
     onBack: PropTypes.func,
-    account: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     multiColumn: PropTypes.bool,
     intl: PropTypes.object,
   };
diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
index 7a2902bbf0..246dac1808 100644
--- a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx
@@ -25,7 +25,7 @@ class Header extends ImmutablePureComponent {
   static propTypes = {
     accountId: PropTypes.string.isRequired,
     statusId: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     onClose: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
diff --git a/app/javascript/flavours/glitch/features/report/thanks.jsx b/app/javascript/flavours/glitch/features/report/thanks.jsx
index 7782022b77..c928536a8d 100644
--- a/app/javascript/flavours/glitch/features/report/thanks.jsx
+++ b/app/javascript/flavours/glitch/features/report/thanks.jsx
@@ -20,7 +20,7 @@ class Thanks extends PureComponent {
   static propTypes = {
     submitted: PropTypes.bool,
     onClose: PropTypes.func.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     dispatch: PropTypes.func.isRequired,
   };
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
index be7266d746..4230c6dd9a 100644
--- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
@@ -109,7 +109,7 @@ class FocalPointModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
     isUploadingThumbnail: PropTypes.bool,
     onSave: PropTypes.func.isRequired,
     onChangeDescription: PropTypes.func.isRequired,
diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
index 2cf273112b..e6d79f5ab1 100644
--- a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
@@ -40,7 +40,7 @@ class ReportModal extends ImmutablePureComponent {
     statusId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.record.isRequired,
   };
 
   state = {
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 9f5f8d4cd3..588faa0fb0 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -1,43 +1,5 @@
 // @ts-check
 
-/**
- * @typedef Emoji
- * @property {string} shortcode
- * @property {string} static_url
- * @property {string} url
- */
-
-/**
- * @typedef AccountField
- * @property {string} name
- * @property {string} value
- * @property {string} verified_at
- */
-
-/**
- * @typedef Account
- * @property {string} acct
- * @property {string} avatar
- * @property {string} avatar_static
- * @property {boolean} bot
- * @property {string} created_at
- * @property {boolean=} discoverable
- * @property {string} display_name
- * @property {Emoji[]} emojis
- * @property {AccountField[]} fields
- * @property {number} followers_count
- * @property {number} following_count
- * @property {boolean} group
- * @property {string} header
- * @property {string} header_static
- * @property {string} id
- * @property {string=} last_status_at
- * @property {boolean} locked
- * @property {string} note
- * @property {number} statuses_count
- * @property {string} url
- * @property {string} username
- */
 
 /**
  * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
@@ -101,7 +63,7 @@ export const hasMultiColumnPath = initialPath === '/'
 
 /**
  * @typedef InitialState
- * @property {Record<string, Account>} accounts
+ * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
  * @property {InitialStateLanguage[]} languages
  * @property {boolean=} critical_updates_pending
  * @property {InitialStateMeta} meta
diff --git a/app/javascript/flavours/glitch/models/account.ts b/app/javascript/flavours/glitch/models/account.ts
new file mode 100644
index 0000000000..9d1bc20d06
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/account.ts
@@ -0,0 +1,149 @@
+import type { RecordOf } from 'immutable';
+import { List, Record as ImmutableRecord } from 'immutable';
+
+import escapeTextContentForBrowser from 'escape-html';
+
+import type {
+  ApiAccountFieldJSON,
+  ApiAccountRoleJSON,
+  ApiAccountJSON,
+} from 'flavours/glitch/api_types/accounts';
+import type { ApiCustomEmojiJSON } from 'flavours/glitch/api_types/custom_emoji';
+import emojify from 'flavours/glitch/features/emoji/emoji';
+import { unescapeHTML } from 'flavours/glitch/utils/html';
+
+import { CustomEmojiFactory } from './custom_emoji';
+import type { CustomEmoji } from './custom_emoji';
+
+// AccountField
+interface AccountFieldShape extends Required<ApiAccountFieldJSON> {
+  name_emojified: string;
+  value_emojified: string;
+  value_plain: string | null;
+}
+
+type AccountField = RecordOf<AccountFieldShape>;
+
+const AccountFieldFactory = ImmutableRecord<AccountFieldShape>({
+  name: '',
+  value: '',
+  verified_at: null,
+  name_emojified: '',
+  value_emojified: '',
+  value_plain: null,
+});
+
+// AccountRole
+export type AccountRoleShape = ApiAccountRoleJSON;
+export type AccountRole = RecordOf<AccountRoleShape>;
+
+const AccountRoleFactory = ImmutableRecord<AccountRoleShape>({
+  color: '',
+  id: '',
+  name: '',
+});
+
+// Account
+export interface AccountShape
+  extends Required<
+    Omit<ApiAccountJSON, 'emojis' | 'fields' | 'roles' | 'moved'>
+  > {
+  emojis: List<CustomEmoji>;
+  fields: List<AccountField>;
+  roles: List<AccountRole>;
+  display_name_html: string;
+  note_emojified: string;
+  note_plain: string | null;
+  hidden: boolean;
+  moved: string | null;
+}
+
+export type Account = RecordOf<AccountShape>;
+
+export const accountDefaultValues: AccountShape = {
+  acct: '',
+  avatar: '',
+  avatar_static: '',
+  bot: false,
+  created_at: '',
+  discoverable: false,
+  display_name: '',
+  display_name_html: '',
+  emojis: List<CustomEmoji>(),
+  fields: List<AccountField>(),
+  group: false,
+  header: '',
+  header_static: '',
+  id: '',
+  last_status_at: '',
+  locked: false,
+  noindex: false,
+  note: '',
+  note_emojified: '',
+  note_plain: 'string',
+  roles: List<AccountRole>(),
+  uri: '',
+  url: '',
+  username: '',
+  followers_count: 0,
+  following_count: 0,
+  statuses_count: 0,
+  hidden: false,
+  suspended: false,
+  memorial: false,
+  limited: false,
+  moved: null,
+};
+
+const AccountFactory = ImmutableRecord<AccountShape>(accountDefaultValues);
+
+type EmojiMap = Record<string, ApiCustomEmojiJSON>;
+
+function makeEmojiMap(emojis: ApiCustomEmojiJSON[]) {
+  return emojis.reduce<EmojiMap>((obj, emoji) => {
+    obj[`:${emoji.shortcode}:`] = emoji;
+    return obj;
+  }, {});
+}
+
+function createAccountField(
+  jsonField: ApiAccountFieldJSON,
+  emojiMap: EmojiMap,
+) {
+  return AccountFieldFactory({
+    ...jsonField,
+    name_emojified: emojify(
+      escapeTextContentForBrowser(jsonField.name),
+      emojiMap,
+    ),
+    value_emojified: emojify(jsonField.value, emojiMap),
+    value_plain: unescapeHTML(jsonField.value),
+  });
+}
+
+export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
+  const { moved, ...accountJSON } = serverJSON;
+
+  const emojiMap = makeEmojiMap(accountJSON.emojis);
+
+  const displayName =
+    accountJSON.display_name.trim().length === 0
+      ? accountJSON.username
+      : accountJSON.display_name;
+
+  return AccountFactory({
+    ...accountJSON,
+    moved: moved?.id,
+    fields: List(
+      serverJSON.fields.map((field) => createAccountField(field, emojiMap)),
+    ),
+    emojis: List(serverJSON.emojis.map((emoji) => CustomEmojiFactory(emoji))),
+    roles: List(serverJSON.roles?.map((role) => AccountRoleFactory(role))),
+    display_name_html: emojify(
+      escapeTextContentForBrowser(displayName),
+      emojiMap,
+    ),
+    note_emojified: emojify(accountJSON.note, emojiMap),
+    note_plain: unescapeHTML(accountJSON.note),
+  });
+}
diff --git a/app/javascript/flavours/glitch/models/custom_emoji.ts b/app/javascript/flavours/glitch/models/custom_emoji.ts
new file mode 100644
index 0000000000..c07ba9929e
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/custom_emoji.ts
@@ -0,0 +1,15 @@
+import type { RecordOf } from 'immutable';
+import { Record } from 'immutable';
+
+import type { ApiCustomEmojiJSON } from 'flavours/glitch/api_types/custom_emoji';
+
+type CustomEmojiShape = Required<ApiCustomEmojiJSON>; // no changes from server shape
+export type CustomEmoji = RecordOf<CustomEmojiShape>;
+
+export const CustomEmojiFactory = Record<CustomEmojiShape>({
+  shortcode: '',
+  static_url: '',
+  url: '',
+  category: '',
+  visible_in_picker: false,
+});
diff --git a/app/javascript/flavours/glitch/models/relationship.ts b/app/javascript/flavours/glitch/models/relationship.ts
new file mode 100644
index 0000000000..4450cabe9d
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/relationship.ts
@@ -0,0 +1,29 @@
+import type { RecordOf } from 'immutable';
+import { Record } from 'immutable';
+
+import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
+
+type RelationshipShape = Required<ApiRelationshipJSON>; // no changes from server shape
+export type Relationship = RecordOf<RelationshipShape>;
+
+const RelationshipFactory = Record<RelationshipShape>({
+  blocked_by: false,
+  blocking: false,
+  domain_blocking: false,
+  endorsed: false,
+  followed_by: false,
+  following: false,
+  id: '',
+  languages: null,
+  muting_notifications: false,
+  muting: false,
+  note: '',
+  notifying: false,
+  requested_by: false,
+  requested: false,
+  showing_reblogs: false,
+});
+
+export function createRelationship(attributes: Partial<RelationshipShape>) {
+  return RelationshipFactory(attributes);
+}
diff --git a/app/javascript/flavours/glitch/reducers/accounts.js b/app/javascript/flavours/glitch/reducers/accounts.js
deleted file mode 100644
index b9e53519b3..0000000000
--- a/app/javascript/flavours/glitch/reducers/accounts.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Map as ImmutableMap, fromJS } from 'immutable';
-
-import { ACCOUNT_REVEAL } from 'flavours/glitch/actions/accounts';
-import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from 'flavours/glitch/actions/importer';
-
-const initialState = ImmutableMap();
-
-const normalizeAccount = (state, account) => {
-  account = { ...account };
-
-  delete account.followers_count;
-  delete account.following_count;
-  delete account.statuses_count;
-
-  account.hidden = state.getIn([account.id, 'hidden']) === false ? false : account.limited;
-
-  return state.set(account.id, fromJS(account));
-};
-
-const normalizeAccounts = (state, accounts) => {
-  accounts.forEach(account => {
-    state = normalizeAccount(state, account);
-  });
-
-  return state;
-};
-
-export default function accounts(state = initialState, action) {
-  switch(action.type) {
-  case ACCOUNT_IMPORT:
-    return normalizeAccount(state, action.account);
-  case ACCOUNTS_IMPORT:
-    return normalizeAccounts(state, action.accounts);
-  case ACCOUNT_REVEAL:
-    return state.setIn([action.id, 'hidden'], false);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/accounts.ts b/app/javascript/flavours/glitch/reducers/accounts.ts
new file mode 100644
index 0000000000..c7459d1d5a
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/accounts.ts
@@ -0,0 +1,84 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import type { Reducer } from 'redux';
+
+import {
+  followAccountSuccess,
+  unfollowAccountSuccess,
+  importAccounts,
+  revealAccount,
+} from 'flavours/glitch/actions/accounts_typed';
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+import { me } from 'flavours/glitch/initial_state';
+import type { Account } from 'flavours/glitch/models/account';
+import { createAccountFromServerJSON } from 'flavours/glitch/models/account';
+
+const initialState = ImmutableMap<string, Account>();
+
+const normalizeAccount = (
+  state: typeof initialState,
+  account: ApiAccountJSON,
+) => {
+  return state.set(
+    account.id,
+    createAccountFromServerJSON(account).set(
+      'hidden',
+      state.get(account.id)?.hidden === false
+        ? false
+        : account.limited || false,
+    ),
+  );
+};
+
+const normalizeAccounts = (
+  state: typeof initialState,
+  accounts: ApiAccountJSON[],
+) => {
+  accounts.forEach((account) => {
+    state = normalizeAccount(state, account);
+  });
+
+  return state;
+};
+
+function getCurrentUser() {
+  if (!me)
+    throw new Error(
+      'No current user (me) defined when calling `accountsReducer`',
+    );
+
+  return me;
+}
+
+export const accountsReducer: Reducer<typeof initialState> = (
+  state = initialState,
+  action,
+) => {
+  if (revealAccount.match(action))
+    return state.setIn([action.payload.id, 'hidden'], false);
+  else if (importAccounts.match(action))
+    return normalizeAccounts(state, action.payload.accounts);
+  else if (followAccountSuccess.match(action)) {
+    return state
+      .update(
+        action.payload.relationship.id,
+        (account) => account?.update('followers_count', (n) => n + 1),
+      )
+      .update(
+        getCurrentUser(),
+        (account) => account?.update('following_count', (n) => n + 1),
+      );
+  } else if (unfollowAccountSuccess.match(action))
+    return state
+      .update(
+        action.payload.relationship.id,
+        (account) =>
+          account?.update('followers_count', (n) => Math.max(0, n - 1)),
+      )
+      .update(
+        getCurrentUser(),
+        (account) =>
+          account?.update('following_count', (n) => Math.max(0, n - 1)),
+      );
+  else return state;
+};
diff --git a/app/javascript/flavours/glitch/reducers/accounts_counters.js b/app/javascript/flavours/glitch/reducers/accounts_counters.js
deleted file mode 100644
index 4ef1128700..0000000000
--- a/app/javascript/flavours/glitch/reducers/accounts_counters.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Map as ImmutableMap, fromJS } from 'immutable';
-
-import { me } from 'flavours/glitch/initial_state';
-
-import {
-  ACCOUNT_FOLLOW_SUCCESS,
-  ACCOUNT_UNFOLLOW_SUCCESS,
-} from '../actions/accounts';
-import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
-
-const normalizeAccount = (state, account) => state.set(account.id, fromJS({
-  followers_count: account.followers_count,
-  following_count: account.following_count,
-  statuses_count: account.statuses_count,
-}));
-
-const normalizeAccounts = (state, accounts) => {
-  accounts.forEach(account => {
-    state = normalizeAccount(state, account);
-  });
-
-  return state;
-};
-
-const incrementFollowers = (state, accountId) =>
-  state.updateIn([accountId, 'followers_count'], num => num + 1)
-    .updateIn([me, 'following_count'], num => num + 1);
-
-const decrementFollowers = (state, accountId) =>
-  state.updateIn([accountId, 'followers_count'], num => Math.max(0, num - 1))
-    .updateIn([me, 'following_count'], num => Math.max(0, num - 1));
-
-const initialState = ImmutableMap();
-
-export default function accountsCounters(state = initialState, action) {
-  switch(action.type) {
-  case ACCOUNT_IMPORT:
-    return normalizeAccount(state, action.account);
-  case ACCOUNTS_IMPORT:
-    return normalizeAccounts(state, action.accounts);
-  case ACCOUNT_FOLLOW_SUCCESS:
-    return action.alreadyFollowing ? state :
-      incrementFollowers(state, action.relationship.id);
-  case ACCOUNT_UNFOLLOW_SUCCESS:
-    return decrementFollowers(state, action.relationship.id);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/accounts_map.js b/app/javascript/flavours/glitch/reducers/accounts_map.js
index fca0e3ce1e..d5ecad7dbf 100644
--- a/app/javascript/flavours/glitch/reducers/accounts_map.js
+++ b/app/javascript/flavours/glitch/reducers/accounts_map.js
@@ -1,7 +1,7 @@
 import { Map as ImmutableMap } from 'immutable';
 
 import { ACCOUNT_LOOKUP_FAIL } from '../actions/accounts';
-import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
+import { importAccounts } from '../actions/accounts_typed';
 
 export const normalizeForLookup = str => str.toLowerCase();
 
@@ -11,10 +11,8 @@ export default function accountsMap(state = initialState, action) {
   switch(action.type) {
   case ACCOUNT_LOOKUP_FAIL:
     return action.error?.response?.status === 404 ? state.set(normalizeForLookup(action.acct), null) : state;
-  case ACCOUNT_IMPORT:
-    return state.set(normalizeForLookup(action.account.acct), action.account.id);
-  case ACCOUNTS_IMPORT:
-    return state.withMutations(map => action.accounts.forEach(account => map.set(normalizeForLookup(account.acct), account.id)));
+  case importAccounts.type:
+    return state.withMutations(map => action.payload.accounts.forEach(account => map.set(normalizeForLookup(account.acct), account.id)));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/contexts.js b/app/javascript/flavours/glitch/reducers/contexts.js
index 32e194dd42..f7d7419a4e 100644
--- a/app/javascript/flavours/glitch/reducers/contexts.js
+++ b/app/javascript/flavours/glitch/reducers/contexts.js
@@ -1,8 +1,8 @@
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 import {
-  ACCOUNT_BLOCK_SUCCESS,
-  ACCOUNT_MUTE_SUCCESS,
+  blockAccountSuccess,
+  muteAccountSuccess,
 } from '../actions/accounts';
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
 import { TIMELINE_DELETE, TIMELINE_UPDATE } from '../actions/timelines';
@@ -92,9 +92,9 @@ const updateContext = (state, status) => {
 
 export default function replies(state = initialState, action) {
   switch(action.type) {
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return filterContexts(state, action.relationship, action.statuses);
+  case blockAccountSuccess.type:
+  case muteAccountSuccess.type:
+    return filterContexts(state, action.payload.relationship, action.payload.statuses);
   case CONTEXT_FETCH_SUCCESS:
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
   case TIMELINE_DELETE:
diff --git a/app/javascript/flavours/glitch/reducers/conversations.js b/app/javascript/flavours/glitch/reducers/conversations.js
index 3bef9a8419..fe2ec78ddf 100644
--- a/app/javascript/flavours/glitch/reducers/conversations.js
+++ b/app/javascript/flavours/glitch/reducers/conversations.js
@@ -1,7 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'flavours/glitch/actions/accounts';
-import { DOMAIN_BLOCK_SUCCESS } from 'flavours/glitch/actions/domain_blocks';
+import { blockAccountSuccess, muteAccountSuccess } from 'flavours/glitch/actions/accounts';
+import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks';
 
 import {
   CONVERSATIONS_MOUNT,
@@ -105,11 +105,11 @@ export default function conversations(state = initialState, action) {
 
       return item;
     }));
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return filterConversations(state, [action.relationship.id]);
-  case DOMAIN_BLOCK_SUCCESS:
-    return filterConversations(state, action.accounts);
+  case blockAccountSuccess.type:
+  case muteAccountSuccess.type:
+    return filterConversations(state, [action.payload.relationship.id]);
+  case blockDomainSuccess.type:
+    return filterConversations(state, action.payload.accounts);
   case CONVERSATIONS_DELETE_SUCCESS:
     return state.update('items', list => list.filterNot(item => item.get('id') === action.id));
   default:
diff --git a/app/javascript/flavours/glitch/reducers/domain_lists.js b/app/javascript/flavours/glitch/reducers/domain_lists.js
index 8cdd3ba376..5f63c77f5d 100644
--- a/app/javascript/flavours/glitch/reducers/domain_lists.js
+++ b/app/javascript/flavours/glitch/reducers/domain_lists.js
@@ -3,7 +3,7 @@ import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutabl
 import {
   DOMAIN_BLOCKS_FETCH_SUCCESS,
   DOMAIN_BLOCKS_EXPAND_SUCCESS,
-  DOMAIN_UNBLOCK_SUCCESS,
+  unblockDomainSuccess
 } from '../actions/domain_blocks';
 
 const initialState = ImmutableMap({
@@ -18,8 +18,8 @@ export default function domainLists(state = initialState, action) {
     return state.setIn(['blocks', 'items'], ImmutableOrderedSet(action.domains)).setIn(['blocks', 'next'], action.next);
   case DOMAIN_BLOCKS_EXPAND_SUCCESS:
     return state.updateIn(['blocks', 'items'], set => set.union(action.domains)).setIn(['blocks', 'next'], action.next);
-  case DOMAIN_UNBLOCK_SUCCESS:
-    return state.updateIn(['blocks', 'items'], set => set.delete(action.domain));
+  case unblockDomainSuccess.type:
+    return state.updateIn(['blocks', 'items'], set => set.delete(action.payload.domain));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 0d6f0a5826..4775c076e7 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -3,8 +3,7 @@ import { Record as ImmutableRecord } from 'immutable';
 import { loadingBarReducer } from 'react-redux-loading-bar';
 import { combineReducers } from 'redux-immutable';
 
-import accounts from './accounts';
-import accounts_counters from './accounts_counters';
+import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
@@ -34,7 +33,7 @@ import picture_in_picture from './picture_in_picture';
 import pinnedAccountsEditor from './pinned_accounts_editor';
 import polls from './polls';
 import push_notifications from './push_notifications';
-import relationships from './relationships';
+import { relationshipsReducer } from './relationships';
 import search from './search';
 import server from './server';
 import settings from './settings';
@@ -57,11 +56,10 @@ const reducers = {
   user_lists,
   domain_lists,
   status_lists,
-  accounts,
-  accounts_counters,
+  accounts: accountsReducer,
   accounts_map,
   statuses,
-  relationships,
+  relationships: relationshipsReducer,
   settings,
   local_settings,
   push_notifications,
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 7bb11459ca..37aed87348 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -1,12 +1,12 @@
 import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-import { DOMAIN_BLOCK_SUCCESS } from 'flavours/glitch/actions/domain_blocks';
+import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks';
 
 import {
-  ACCOUNT_BLOCK_SUCCESS,
-  ACCOUNT_MUTE_SUCCESS,
-  FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
-  FOLLOW_REQUEST_REJECT_SUCCESS,
+  authorizeFollowRequestSuccess,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  rejectFollowRequestSuccess,
 } from '../actions/accounts';
 import {
   MARKERS_FETCH_SUCCESS,
@@ -15,7 +15,7 @@ import {
   NOTIFICATIONS_MOUNT,
   NOTIFICATIONS_UNMOUNT,
   NOTIFICATIONS_SET_VISIBILITY,
-  NOTIFICATIONS_UPDATE,
+  notificationsUpdate,
   NOTIFICATIONS_EXPAND_SUCCESS,
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
@@ -316,19 +316,19 @@ export default function notifications(state = initialState, action) {
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', true);
   case NOTIFICATIONS_SCROLL_TOP:
     return updateTop(state, action.top);
-  case NOTIFICATIONS_UPDATE:
-    return normalizeNotification(state, action.notification, action.usePendingItems);
+  case notificationsUpdate.type:
+    return normalizeNotification(state, action.payload.notification, action.payload.usePendingItems);
   case NOTIFICATIONS_EXPAND_SUCCESS:
     return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingMore, action.isLoadingRecent, action.usePendingItems);
-  case ACCOUNT_BLOCK_SUCCESS:
-    return filterNotifications(state, [action.relationship.id]);
-  case ACCOUNT_MUTE_SUCCESS:
-    return action.relationship.muting_notifications ? filterNotifications(state, [action.relationship.id]) : state;
-  case DOMAIN_BLOCK_SUCCESS:
-    return filterNotifications(state, action.accounts);
-  case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
-  case FOLLOW_REQUEST_REJECT_SUCCESS:
-    return filterNotifications(state, [action.id], 'follow_request');
+  case blockAccountSuccess.type:
+    return filterNotifications(state, [action.payload.relationship.id]);
+  case muteAccountSuccess.type:
+    return action.payload.relationship.muting_notifications ? filterNotifications(state, [action.payload.relationship.id]) : state;
+  case blockDomainSuccess.type:
+    return filterNotifications(state, action.payload.accounts);
+  case authorizeFollowRequestSuccess.type:
+  case rejectFollowRequestSuccess.type:
+    return filterNotifications(state, [action.payload.id], 'follow_request');
   case NOTIFICATIONS_CLEAR:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case TIMELINE_DELETE:
diff --git a/app/javascript/flavours/glitch/reducers/pinned_accounts_editor.js b/app/javascript/flavours/glitch/reducers/pinned_accounts_editor.js
index e672c34b34..352db5733b 100644
--- a/app/javascript/flavours/glitch/reducers/pinned_accounts_editor.js
+++ b/app/javascript/flavours/glitch/reducers/pinned_accounts_editor.js
@@ -8,8 +8,8 @@ import {
   PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS,
   PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR,
   PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE,
-  ACCOUNT_PIN_SUCCESS,
-  ACCOUNT_UNPIN_SUCCESS,
+  pinAccountSuccess,
+  unpinAccountSuccess,
 } from '../actions/accounts';
 
 const initialState = ImmutableMap({
@@ -48,10 +48,10 @@ export default function listEditorReducer(state = initialState, action) {
       map.set('items', ImmutableList());
       map.set('value', '');
     }));
-  case ACCOUNT_PIN_SUCCESS:
-    return state.updateIn(['accounts', 'items'], list => list.unshift(action.relationship.id));
-  case ACCOUNT_UNPIN_SUCCESS:
-    return state.updateIn(['accounts', 'items'], list => list.filterNot(item => item === action.relationship.id));
+  case pinAccountSuccess.type:
+    return state.updateIn(['accounts', 'items'], list => list.unshift(action.payload.relationship.id));
+  case unpinAccountSuccess.type:
+    return state.updateIn(['accounts', 'items'], list => list.filterNot(item => item === action.payload.relationship.id));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/relationships.js b/app/javascript/flavours/glitch/reducers/relationships.js
deleted file mode 100644
index 32b4b4f371..0000000000
--- a/app/javascript/flavours/glitch/reducers/relationships.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Map as ImmutableMap, fromJS } from 'immutable';
-
-import {
-  submitAccountNote,
-} from '../actions/account_notes';
-import {
-  ACCOUNT_FOLLOW_SUCCESS,
-  ACCOUNT_FOLLOW_REQUEST,
-  ACCOUNT_FOLLOW_FAIL,
-  ACCOUNT_UNFOLLOW_SUCCESS,
-  ACCOUNT_UNFOLLOW_REQUEST,
-  ACCOUNT_UNFOLLOW_FAIL,
-  ACCOUNT_BLOCK_SUCCESS,
-  ACCOUNT_UNBLOCK_SUCCESS,
-  ACCOUNT_MUTE_SUCCESS,
-  ACCOUNT_UNMUTE_SUCCESS,
-  ACCOUNT_PIN_SUCCESS,
-  ACCOUNT_UNPIN_SUCCESS,
-  RELATIONSHIPS_FETCH_SUCCESS,
-  FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
-  FOLLOW_REQUEST_REJECT_SUCCESS,
-} from '../actions/accounts';
-import {
-  DOMAIN_BLOCK_SUCCESS,
-  DOMAIN_UNBLOCK_SUCCESS,
-} from '../actions/domain_blocks';
-import {
-  NOTIFICATIONS_UPDATE,
-} from '../actions/notifications';
-
-
-const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
-
-const normalizeRelationships = (state, relationships) => {
-  relationships.forEach(relationship => {
-    state = normalizeRelationship(state, relationship);
-  });
-
-  return state;
-};
-
-const setDomainBlocking = (state, accounts, blocking) => {
-  return state.withMutations(map => {
-    accounts.forEach(id => {
-      map.setIn([id, 'domain_blocking'], blocking);
-    });
-  });
-};
-
-const initialState = ImmutableMap();
-
-export default function relationships(state = initialState, action) {
-  switch(action.type) {
-  case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
-    return state.setIn([action.id, 'followed_by'], true).setIn([action.id, 'requested_by'], false);
-  case FOLLOW_REQUEST_REJECT_SUCCESS:
-    return state.setIn([action.id, 'followed_by'], false).setIn([action.id, 'requested_by'], false);
-  case NOTIFICATIONS_UPDATE:
-    return action.notification.type === 'follow_request' ? state.setIn([action.notification.account.id, 'requested_by'], true) : state;
-  case ACCOUNT_FOLLOW_REQUEST:
-    return state.getIn([action.id, 'following']) ? state : state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
-  case ACCOUNT_FOLLOW_FAIL:
-    return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
-  case ACCOUNT_UNFOLLOW_REQUEST:
-    return state.setIn([action.id, 'following'], false);
-  case ACCOUNT_UNFOLLOW_FAIL:
-    return state.setIn([action.id, 'following'], true);
-  case ACCOUNT_FOLLOW_SUCCESS:
-  case ACCOUNT_UNFOLLOW_SUCCESS:
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_UNBLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-  case ACCOUNT_UNMUTE_SUCCESS:
-  case ACCOUNT_PIN_SUCCESS:
-  case ACCOUNT_UNPIN_SUCCESS:
-    return normalizeRelationship(state, action.relationship);
-  case RELATIONSHIPS_FETCH_SUCCESS:
-    return normalizeRelationships(state, action.relationships);
-  case submitAccountNote.fulfilled:
-    return normalizeRelationship(state, action.payload.relationship);
-  case DOMAIN_BLOCK_SUCCESS:
-    return setDomainBlocking(state, action.accounts, true);
-  case DOMAIN_UNBLOCK_SUCCESS:
-    return setDomainBlocking(state, action.accounts, false);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/flavours/glitch/reducers/relationships.ts b/app/javascript/flavours/glitch/reducers/relationships.ts
new file mode 100644
index 0000000000..5d75529475
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/relationships.ts
@@ -0,0 +1,123 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import { isFulfilled } from '@reduxjs/toolkit';
+import type { Reducer } from 'redux';
+
+import type { ApiRelationshipJSON } from 'flavours/glitch/api_types/relationships';
+import type { Account } from 'flavours/glitch/models/account';
+import { createRelationship } from 'flavours/glitch/models/relationship';
+import type { Relationship } from 'flavours/glitch/models/relationship';
+
+import { submitAccountNote } from '../actions/account_notes';
+import {
+  followAccountSuccess,
+  unfollowAccountSuccess,
+  authorizeFollowRequestSuccess,
+  rejectFollowRequestSuccess,
+  followAccountRequest,
+  followAccountFail,
+  unfollowAccountRequest,
+  unfollowAccountFail,
+  blockAccountSuccess,
+  unblockAccountSuccess,
+  muteAccountSuccess,
+  unmuteAccountSuccess,
+  pinAccountSuccess,
+  unpinAccountSuccess,
+  fetchRelationshipsSuccess,
+} from '../actions/accounts_typed';
+import {
+  blockDomainSuccess,
+  unblockDomainSuccess,
+} from '../actions/domain_blocks_typed';
+import { notificationsUpdate } from '../actions/notifications_typed';
+
+const initialState = ImmutableMap<string, Relationship>();
+type State = typeof initialState;
+
+const normalizeRelationship = (
+  state: State,
+  relationship: ApiRelationshipJSON,
+) => state.set(relationship.id, createRelationship(relationship));
+
+const normalizeRelationships = (
+  state: State,
+  relationships: ApiRelationshipJSON[],
+) => {
+  relationships.forEach((relationship) => {
+    state = normalizeRelationship(state, relationship);
+  });
+
+  return state;
+};
+
+const setDomainBlocking = (
+  state: State,
+  accounts: Account[],
+  blocking: boolean,
+) => {
+  return state.withMutations((map) => {
+    accounts.forEach((id) => {
+      map.setIn([id, 'domain_blocking'], blocking);
+    });
+  });
+};
+
+export const relationshipsReducer: Reducer<State> = (
+  state = initialState,
+  action,
+) => {
+  if (authorizeFollowRequestSuccess.match(action))
+    return state
+      .setIn([action.payload.id, 'followed_by'], true)
+      .setIn([action.payload.id, 'requested_by'], false);
+  else if (rejectFollowRequestSuccess.match(action))
+    return state
+      .setIn([action.payload.id, 'followed_by'], false)
+      .setIn([action.payload.id, 'requested_by'], false);
+  else if (notificationsUpdate.match(action))
+    return action.payload.notification.type === 'follow_request'
+      ? state.setIn(
+          [action.payload.notification.account.id, 'requested_by'],
+          true,
+        )
+      : state;
+  else if (followAccountRequest.match(action))
+    return state.getIn([action.payload.id, 'following'])
+      ? state
+      : state.setIn(
+          [
+            action.payload.id,
+            action.payload.locked ? 'requested' : 'following',
+          ],
+          true,
+        );
+  else if (followAccountFail.match(action))
+    return state.setIn(
+      [action.payload.id, action.payload.locked ? 'requested' : 'following'],
+      false,
+    );
+  else if (unfollowAccountRequest.match(action))
+    return state.setIn([action.payload.id, 'following'], false);
+  else if (unfollowAccountFail.match(action))
+    return state.setIn([action.payload.id, 'following'], true);
+  else if (
+    followAccountSuccess.match(action) ||
+    unfollowAccountSuccess.match(action) ||
+    blockAccountSuccess.match(action) ||
+    unblockAccountSuccess.match(action) ||
+    muteAccountSuccess.match(action) ||
+    unmuteAccountSuccess.match(action) ||
+    pinAccountSuccess.match(action) ||
+    unpinAccountSuccess.match(action) ||
+    isFulfilled(submitAccountNote)(action)
+  )
+    return normalizeRelationship(state, action.payload.relationship);
+  else if (fetchRelationshipsSuccess.match(action))
+    return normalizeRelationships(state, action.payload.relationships);
+  else if (blockDomainSuccess.match(action))
+    return setDomainBlocking(state, action.payload.accounts, true);
+  else if (unblockDomainSuccess.match(action))
+    return setDomainBlocking(state, action.payload.accounts, false);
+  else return state;
+};
diff --git a/app/javascript/flavours/glitch/reducers/status_lists.js b/app/javascript/flavours/glitch/reducers/status_lists.js
index 41cc07341c..6cb6a937bb 100644
--- a/app/javascript/flavours/glitch/reducers/status_lists.js
+++ b/app/javascript/flavours/glitch/reducers/status_lists.js
@@ -1,8 +1,8 @@
 import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 
 import {
-  ACCOUNT_BLOCK_SUCCESS,
-  ACCOUNT_MUTE_SUCCESS,
+  blockAccountSuccess,
+  muteAccountSuccess,
 } from '../actions/accounts';
 import {
   BOOKMARKED_STATUSES_FETCH_REQUEST,
@@ -142,9 +142,9 @@ export default function statusLists(state = initialState, action) {
     return prependOneToList(state, 'pins', action.status);
   case UNPIN_SUCCESS:
     return removeOneFromList(state, 'pins', action.status);
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
+  case blockAccountSuccess.type:
+  case muteAccountSuccess.type:
+    return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.payload.statuses.getIn([statusId, 'account']) === action.payload.relationship.id));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/suggestions.js b/app/javascript/flavours/glitch/reducers/suggestions.js
index c6b56353ed..03a7c80cf5 100644
--- a/app/javascript/flavours/glitch/reducers/suggestions.js
+++ b/app/javascript/flavours/glitch/reducers/suggestions.js
@@ -1,7 +1,7 @@
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
-import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'flavours/glitch/actions/accounts';
-import { DOMAIN_BLOCK_SUCCESS } from 'flavours/glitch/actions/domain_blocks';
+import { blockAccountSuccess, muteAccountSuccess } from 'flavours/glitch/actions/accounts';
+import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks';
 
 import {
   SUGGESTIONS_FETCH_REQUEST,
@@ -29,11 +29,11 @@ export default function suggestionsReducer(state = initialState, action) {
     return state.set('isLoading', false);
   case SUGGESTIONS_DISMISS:
     return state.update('items', list => list.filterNot(x => x.account === action.id));
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return state.update('items', list => list.filterNot(x => x.account === action.relationship.id));
-  case DOMAIN_BLOCK_SUCCESS:
-    return state.update('items', list => list.filterNot(x => action.accounts.includes(x.account)));
+  case blockAccountSuccess.type:
+  case muteAccountSuccess.type:
+    return state.update('items', list => list.filterNot(x => x.account === action.payload.relationship.id));
+  case blockDomainSuccess.type:
+    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.account)));
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js
index 69f28d6849..6ff83aa7f0 100644
--- a/app/javascript/flavours/glitch/reducers/timelines.js
+++ b/app/javascript/flavours/glitch/reducers/timelines.js
@@ -1,9 +1,9 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
 import {
-  ACCOUNT_BLOCK_SUCCESS,
-  ACCOUNT_MUTE_SUCCESS,
-  ACCOUNT_UNFOLLOW_SUCCESS,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  unfollowAccountSuccess
 } from '../actions/accounts';
 import {
   TIMELINE_UPDATE,
@@ -206,11 +206,11 @@ export default function timelines(state = initialState, action) {
     return deleteStatus(state, action.id, action.references, action.reblogOf);
   case TIMELINE_CLEAR:
     return clearTimeline(state, action.timeline);
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return filterTimelines(state, action.relationship, action.statuses);
-  case ACCOUNT_UNFOLLOW_SUCCESS:
-    return filterTimeline('home', state, action.relationship, action.statuses);
+  case blockAccountSuccess.type:
+  case muteAccountSuccess.type:
+    return filterTimelines(state, action.payload.relationship, action.payload.statuses);
+  case unfollowAccountSuccess.type:
+    return filterTimeline('home', state, action.payload.relationship, action.payload.statuses);
   case TIMELINE_SCROLL_TOP:
     return updateTop(state, action.timeline, action.top);
   case TIMELINE_CONNECT:
diff --git a/app/javascript/flavours/glitch/reducers/user_lists.js b/app/javascript/flavours/glitch/reducers/user_lists.js
index 76786b4220..3eb80da437 100644
--- a/app/javascript/flavours/glitch/reducers/user_lists.js
+++ b/app/javascript/flavours/glitch/reducers/user_lists.js
@@ -33,8 +33,8 @@ import {
   FOLLOW_REQUESTS_EXPAND_REQUEST,
   FOLLOW_REQUESTS_EXPAND_SUCCESS,
   FOLLOW_REQUESTS_EXPAND_FAIL,
-  FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
-  FOLLOW_REQUEST_REJECT_SUCCESS,
+  authorizeFollowRequestSuccess,
+  rejectFollowRequestSuccess,
 } from '../actions/accounts';
 import {
   BLOCKS_FETCH_REQUEST,
@@ -66,11 +66,7 @@ import {
   MUTES_EXPAND_SUCCESS,
   MUTES_EXPAND_FAIL,
 } from '../actions/mutes';
-import {
-  NOTIFICATIONS_UPDATE,
-} from '../actions/notifications';
-
-
+import { notificationsUpdate } from '../actions/notifications';
 
 const initialListState = ImmutableMap({
   next: null,
@@ -163,8 +159,8 @@ export default function userLists(state = initialState, action) {
   case FAVOURITES_FETCH_FAIL:
   case FAVOURITES_EXPAND_FAIL:
     return state.setIn(['favourited_by', action.id, 'isLoading'], false);
-  case NOTIFICATIONS_UPDATE:
-    return action.notification.type === 'follow_request' ? normalizeFollowRequest(state, action.notification) : state;
+  case notificationsUpdate.type:
+    return action.payload.notification.type === 'follow_request' ? normalizeFollowRequest(state, action.payload.notification) : state;
   case FOLLOW_REQUESTS_FETCH_SUCCESS:
     return normalizeList(state, ['follow_requests'], action.accounts, action.next);
   case FOLLOW_REQUESTS_EXPAND_SUCCESS:
@@ -175,9 +171,9 @@ export default function userLists(state = initialState, action) {
   case FOLLOW_REQUESTS_FETCH_FAIL:
   case FOLLOW_REQUESTS_EXPAND_FAIL:
     return state.setIn(['follow_requests', 'isLoading'], false);
-  case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
-  case FOLLOW_REQUEST_REJECT_SUCCESS:
-    return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.id));
+  case authorizeFollowRequestSuccess.type:
+  case rejectFollowRequestSuccess.type:
+    return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.payload.id));
   case BLOCKS_FETCH_SUCCESS:
     return normalizeList(state, ['blocks'], action.accounts, action.next);
   case BLOCKS_EXPAND_SUCCESS:
diff --git a/app/javascript/flavours/glitch/selectors/accounts.ts b/app/javascript/flavours/glitch/selectors/accounts.ts
new file mode 100644
index 0000000000..9b375c5b95
--- /dev/null
+++ b/app/javascript/flavours/glitch/selectors/accounts.ts
@@ -0,0 +1,47 @@
+import { Record as ImmutableRecord } from 'immutable';
+import { createSelector } from 'reselect';
+
+import { accountDefaultValues } from 'flavours/glitch/models/account';
+import type { Account, AccountShape } from 'flavours/glitch/models/account';
+import type { Relationship } from 'flavours/glitch/models/relationship';
+import type { RootState } from 'flavours/glitch/store';
+
+const getAccountBase = (state: RootState, id: string) =>
+  state.accounts.get(id, null);
+
+const getAccountRelationship = (state: RootState, id: string) =>
+  state.relationships.get(id, null);
+
+const getAccountMoved = (state: RootState, id: string) => {
+  const movedToId = state.accounts.get(id)?.moved;
+
+  if (!movedToId) return undefined;
+
+  return state.accounts.get(movedToId);
+};
+
+interface FullAccountShape extends Omit<AccountShape, 'moved'> {
+  relationship: Relationship | null;
+  moved: Account | null;
+}
+
+const FullAccountFactory = ImmutableRecord<FullAccountShape>({
+  ...accountDefaultValues,
+  moved: null,
+  relationship: null,
+});
+
+export function makeGetAccount() {
+  return createSelector(
+    [getAccountBase, getAccountRelationship, getAccountMoved],
+    (base, relationship, moved) => {
+      if (base === null) {
+        return null;
+      }
+
+      return FullAccountFactory(base)
+        .set('relationship', relationship)
+        .set('moved', moved ?? null);
+    },
+  );
+}
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js
index 943804eed6..98100e1f1b 100644
--- a/app/javascript/flavours/glitch/selectors/index.js
+++ b/app/javascript/flavours/glitch/selectors/index.js
@@ -5,23 +5,7 @@ import { toServerSideType } from 'flavours/glitch/utils/filters';
 
 import { me } from '../initial_state';
 
-const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
-const getAccountCounters     = (state, id) => state.getIn(['accounts_counters', id], null);
-const getAccountRelationship = (state, id) => state.getIn(['relationships', id], null);
-const getAccountMoved        = (state, id) => state.getIn(['accounts', state.getIn(['accounts', id, 'moved'])]);
-
-export const makeGetAccount = () => {
-  return createSelector([getAccountBase, getAccountCounters, getAccountRelationship, getAccountMoved], (base, counters, relationship, moved) => {
-    if (base === null) {
-      return null;
-    }
-
-    return base.merge(counters).withMutations(map => {
-      map.set('relationship', relationship);
-      map.set('moved', moved);
-    });
-  });
-};
+export { makeGetAccount } from "./accounts";
 
 const getFilters = (state, { contextType }) => {
   if (!contextType) return null;
diff --git a/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts b/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
index 5fe8000731..83056ee49f 100644
--- a/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/loading_bar.ts
@@ -1,3 +1,9 @@
+import {
+  isAsyncThunkAction,
+  isPending as isThunkActionPending,
+  isFulfilled as isThunkActionFulfilled,
+  isRejected as isThunkActionRejected,
+} from '@reduxjs/toolkit';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
 import type { AnyAction, Middleware } from 'redux';
 
@@ -21,25 +27,43 @@ export const loadingBarMiddleware = (
   return ({ dispatch }) =>
     (next) =>
     (action: AnyAction) => {
-      if (action.type && !action.skipLoading) {
+      let isPending = false;
+      let isFulfilled = false;
+      let isRejected = false;
+
+      if (
+        isAsyncThunkAction(action)
+        // TODO: once we get the first use-case for it, add a check for skipLoading
+      ) {
+        if (isThunkActionPending(action)) isPending = true;
+        else if (isThunkActionFulfilled(action)) isFulfilled = true;
+        else if (isThunkActionRejected(action)) isRejected = true;
+      } else if (
+        action.type &&
+        !action.skipLoading &&
+        typeof action.type === 'string'
+      ) {
         const [PENDING, FULFILLED, REJECTED] = promiseTypeSuffixes;
 
-        const isPending = new RegExp(`${PENDING}$`, 'g');
-        const isFulfilled = new RegExp(`${FULFILLED}$`, 'g');
-        const isRejected = new RegExp(`${REJECTED}$`, 'g');
+        const isPendingRegexp = new RegExp(`${PENDING}$`, 'g');
+        const isFulfilledRegexp = new RegExp(`${FULFILLED}$`, 'g');
+        const isRejectedRegexp = new RegExp(`${REJECTED}$`, 'g');
 
-        if (typeof action.type === 'string') {
-          if (action.type.match(isPending)) {
-            dispatch(showLoading());
-          } else if (
-            action.type.match(isFulfilled) ??
-            action.type.match(isRejected)
-          ) {
-            dispatch(hideLoading());
-          }
+        if (action.type.match(isPendingRegexp)) {
+          isPending = true;
+        } else if (action.type.match(isFulfilledRegexp)) {
+          isFulfilled = true;
+        } else if (action.type.match(isRejectedRegexp)) {
+          isRejected = true;
         }
       }
 
+      if (isPending) {
+        dispatch(showLoading());
+      } else if (isFulfilled || isRejected) {
+        dispatch(hideLoading());
+      }
+
       return next(action);
     };
 };
diff --git a/app/javascript/flavours/glitch/store/store.ts b/app/javascript/flavours/glitch/store/store.ts
index 6350885680..9f43f58a43 100644
--- a/app/javascript/flavours/glitch/store/store.ts
+++ b/app/javascript/flavours/glitch/store/store.ts
@@ -35,6 +35,5 @@ export const store = configureStore({
 
 // Infer the `RootState` and `AppDispatch` types from the store itself
 export type RootState = ReturnType<typeof rootReducer>;
-// Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
 export type AppDispatch = typeof store.dispatch;
 export type GetState = typeof store.getState;
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 940b5cd206..87127196cb 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -400,8 +400,7 @@ $ui-header-height: 55px;
 
   > .scrollable {
     background: $ui-base-color;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
+    border-radius: 0 0 4px 4px;
   }
 }
 
diff --git a/app/javascript/flavours/glitch/types/resources.ts b/app/javascript/flavours/glitch/types/resources.ts
deleted file mode 100644
index f3901ad150..0000000000
--- a/app/javascript/flavours/glitch/types/resources.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { Record } from 'immutable';
-
-type CustomEmoji = Record<{
-  shortcode: string;
-  static_url: string;
-  url: string;
-}>;
-
-type AccountField = Record<{
-  name: string;
-  value: string;
-  verified_at: string | null;
-}>;
-
-interface AccountApiResponseValues {
-  acct: string;
-  avatar: string;
-  avatar_static: string;
-  bot: boolean;
-  created_at: string;
-  discoverable: boolean;
-  display_name: string;
-  emojis: CustomEmoji[];
-  fields: AccountField[];
-  followers_count: number;
-  following_count: number;
-  group: boolean;
-  header: string;
-  header_static: string;
-  id: string;
-  last_status_at: string;
-  locked: boolean;
-  note: string;
-  statuses_count: number;
-  url: string;
-  uri: string;
-  username: string;
-}
-
-type NormalizedAccountField = Record<{
-  name_emojified: string;
-  value_emojified: string;
-  value_plain: string;
-}>;
-
-interface NormalizedAccountValues {
-  display_name_html: string;
-  fields: NormalizedAccountField[];
-  note_emojified: string;
-  note_plain: string;
-}
-
-export type Account = Record<
-  AccountApiResponseValues & NormalizedAccountValues
->;
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index e0448f004c..9f3bbba033 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -661,3 +661,18 @@ export function unpinAccountFail(error) {
     error,
   };
 }
+
+export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch, getState) => {
+  const data = new FormData();
+
+  data.append('display_name', displayName);
+  data.append('note', note);
+  if (avatar) data.append('avatar', avatar);
+  if (header) data.append('header', header);
+  data.append('discoverable', discoverable);
+  data.append('indexable', indexable);
+
+  return api(getState).patch('/api/v1/accounts/update_credentials', data).then(response => {
+    dispatch(importFetchedAccount(response.data));
+  });
+};
diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts
index 985abf9463..5bf3e64288 100644
--- a/app/javascript/mastodon/api_types/accounts.ts
+++ b/app/javascript/mastodon/api_types/accounts.ts
@@ -20,6 +20,7 @@ export interface ApiAccountJSON {
   bot: boolean;
   created_at: string;
   discoverable: boolean;
+  indexable: boolean;
   display_name: string;
   emojis: ApiCustomEmojiJSON[];
   fields: ApiAccountFieldJSON[];
diff --git a/app/javascript/mastodon/components/admin/Retention.jsx b/app/javascript/mastodon/components/admin/Retention.jsx
index 2f56710682..1e8ef48b7a 100644
--- a/app/javascript/mastodon/components/admin/Retention.jsx
+++ b/app/javascript/mastodon/components/admin/Retention.jsx
@@ -51,7 +51,7 @@ export default class Retention extends PureComponent {
     let content;
 
     if (loading) {
-      content = <FormattedMessage id='loading_indicator.label' defaultMessage='Loading...' />;
+      content = <FormattedMessage id='loading_indicator.label' defaultMessage='Loading…' />;
     } else {
       content = (
         <table className='retention__table'>
diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx
new file mode 100644
index 0000000000..9b1a36d83a
--- /dev/null
+++ b/app/javascript/mastodon/components/copy_icon_button.jsx
@@ -0,0 +1,44 @@
+import PropTypes from 'prop-types';
+import { useState, useCallback } from 'react';
+
+import { defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { useDispatch } from 'react-redux';
+
+import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
+
+import { showAlert } from 'mastodon/actions/alerts';
+import { IconButton } from 'mastodon/components/icon_button';
+
+const messages = defineMessages({
+  copied: { id: 'copy_icon_button.copied', defaultMessage: 'Copied to clipboard' },
+});
+
+export const CopyIconButton = ({ title, value, className }) => {
+  const [copied, setCopied] = useState(false);
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    navigator.clipboard.writeText(value);
+    setCopied(true);
+    dispatch(showAlert({ message: messages.copied }));
+    setTimeout(() => setCopied(false), 700);
+  }, [setCopied, value, dispatch]);
+
+  return (
+    <IconButton
+      className={classNames(className, copied ? 'copied' : 'copyable')}
+      title={title}
+      onClick={handleClick}
+      iconComponent={ContentCopyIcon}
+    />
+  );
+};
+
+CopyIconButton.propTypes = {
+  title: PropTypes.string,
+  value: PropTypes.string,
+  className: PropTypes.string,
+};
diff --git a/app/javascript/mastodon/components/loading_indicator.tsx b/app/javascript/mastodon/components/loading_indicator.tsx
index 6bc24a0d61..fcdbe80d8a 100644
--- a/app/javascript/mastodon/components/loading_indicator.tsx
+++ b/app/javascript/mastodon/components/loading_indicator.tsx
@@ -1,7 +1,23 @@
+import { useIntl, defineMessages } from 'react-intl';
+
 import { CircularProgress } from './circular_progress';
 
-export const LoadingIndicator: React.FC = () => (
-  <div className='loading-indicator'>
-    <CircularProgress size={50} strokeWidth={6} />
-  </div>
-);
+const messages = defineMessages({
+  loading: { id: 'loading_indicator.label', defaultMessage: 'Loading…' },
+});
+
+export const LoadingIndicator: React.FC = () => {
+  const intl = useIntl();
+
+  return (
+    <div
+      className='loading-indicator'
+      role='progressbar'
+      aria-busy
+      aria-live='polite'
+      aria-label={intl.formatMessage(messages.loading)}
+    >
+      <CircularProgress size={50} strokeWidth={6} />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 7594135a4e..29b46cb43d 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -14,10 +14,12 @@ import { ReactComponent as LockIcon } from '@material-symbols/svg-600/outlined/l
 import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
 import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications.svg';
 import { ReactComponent as NotificationsActiveIcon } from '@material-symbols/svg-600/outlined/notifications_active-fill.svg';
+import { ReactComponent as ShareIcon } from '@material-symbols/svg-600/outlined/share.svg';
 
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
 import { Button } from 'mastodon/components/button';
+import { CopyIconButton } from 'mastodon/components/copy_icon_button';
 import { FollowersCounter, FollowingCounter, StatusesCounter } from 'mastodon/components/counters';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -46,6 +48,7 @@ const messages = defineMessages({
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   report: { id: 'account.report', defaultMessage: 'Report @{name}' },
   share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
+  copy: { id: 'account.copy', defaultMessage: 'Copy link to profile' },
   media: { id: 'account.media', defaultMessage: 'Media' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
@@ -245,11 +248,10 @@ class Header extends ImmutablePureComponent {
     const isRemote     = account.get('acct') !== account.get('username');
     const remoteDomain = isRemote ? account.get('acct').split('@')[1] : null;
 
-    let info        = [];
-    let actionBtn   = '';
-    let bellBtn     = '';
-    let lockedIcon  = '';
-    let menu        = [];
+    let actionBtn, bellBtn, lockedIcon, shareBtn;
+
+    let info = [];
+    let menu = [];
 
     if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {
       info.push(<span key='followed_by' className='relationship-tag'><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span>);
@@ -267,6 +269,12 @@ class Header extends ImmutablePureComponent {
       bellBtn = <IconButton icon={account.getIn(['relationship', 'notifying']) ? 'bell' : 'bell-o'} iconComponent={account.getIn(['relationship', 'notifying']) ? NotificationsActiveIcon : NotificationsIcon} active={account.getIn(['relationship', 'notifying'])} title={intl.formatMessage(account.getIn(['relationship', 'notifying']) ? messages.disableNotifications : messages.enableNotifications, { name: account.get('username') })} onClick={this.props.onNotifyToggle} />;
     }
 
+    if ('share' in navigator) {
+      shareBtn = <IconButton className='optional' iconComponent={ShareIcon} title={intl.formatMessage(messages.share, { name: account.get('username') })} onClick={this.handleShare} />;
+    } else {
+      shareBtn = <CopyIconButton className='optional' title={intl.formatMessage(messages.copy)} value={account.get('url')} />;
+    }
+
     if (me !== account.get('id')) {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = '';
@@ -297,10 +305,6 @@ class Header extends ImmutablePureComponent {
 
     if (isRemote) {
       menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: account.get('url') });
-    }
-
-    if ('share' in navigator && !account.get('suspended')) {
-      menu.push({ text: intl.formatMessage(messages.share, { name: account.get('username') }), action: this.handleShare });
       menu.push(null);
     }
 
@@ -414,6 +418,7 @@ class Header extends ImmutablePureComponent {
                 <>
                   {actionBtn}
                   {bellBtn}
+                  {shareBtn}
                 </>
               )}
 
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index caae965a63..5d55330dcb 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -275,6 +275,7 @@ class Search extends PureComponent {
   }
 
   _calculateOptions (value) {
+    const { signedIn } = this.context.identity;
     const trimmedValue = value.trim();
     const options = [];
 
@@ -299,7 +300,7 @@ class Search extends PureComponent {
 
       const couldBeStatusSearch = searchEnabled;
 
-      if (couldBeStatusSearch) {
+      if (couldBeStatusSearch && signedIn) {
         options.push({ key: 'status-search', label: <FormattedMessage id='search.quick_action.status_search' defaultMessage='Posts matching {x}' values={{ x: <mark>{trimmedValue}</mark> }} />, action: this.handleStatusSearch });
       }
 
@@ -376,7 +377,7 @@ class Search extends PureComponent {
 
           <h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
 
-          {searchEnabled ? (
+          {searchEnabled && signedIn ? (
             <div className='search__popout__menu'>
               {this.defaultOptions.map(({ key, label, action }, i) => (
                 <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item', { selected: selectedOption === ((options.length || recent.size) + i) })}>
@@ -386,7 +387,11 @@ class Search extends PureComponent {
             </div>
           ) : (
             <div className='search__popout__menu__message'>
-              <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+              {searchEnabled ? (
+                <FormattedMessage id='search_popout.full_text_search_logged_out_message' defaultMessage='Only available when logged in.' />
+              ) : (
+                <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+              )}
             </div>
           )}
         </div>
diff --git a/app/javascript/mastodon/features/onboarding/components/progress_indicator.jsx b/app/javascript/mastodon/features/onboarding/components/progress_indicator.jsx
deleted file mode 100644
index 37288a286f..0000000000
--- a/app/javascript/mastodon/features/onboarding/components/progress_indicator.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import PropTypes from 'prop-types';
-import { Fragment } from 'react';
-
-import classNames from 'classnames';
-
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/done.svg';
-
-import { Icon }  from 'mastodon/components/icon';
-
-const ProgressIndicator = ({ steps, completed }) => (
-  <div className='onboarding__progress-indicator'>
-    {(new Array(steps)).fill().map((_, i) => (
-      <Fragment key={i}>
-        {i > 0 && <div className={classNames('onboarding__progress-indicator__line', { active: completed > i })} />}
-
-        <div className={classNames('onboarding__progress-indicator__step', { active: completed > i })}>
-          {completed > i && <Icon icon={CheckIcon} />}
-        </div>
-      </Fragment>
-    ))}
-  </div>
-);
-
-ProgressIndicator.propTypes = {
-  steps: PropTypes.number.isRequired,
-  completed: PropTypes.number,
-};
-
-export default ProgressIndicator;
diff --git a/app/javascript/mastodon/features/onboarding/components/step.jsx b/app/javascript/mastodon/features/onboarding/components/step.jsx
index 1f42d9d499..1f83f20801 100644
--- a/app/javascript/mastodon/features/onboarding/components/step.jsx
+++ b/app/javascript/mastodon/features/onboarding/components/step.jsx
@@ -1,11 +1,13 @@
 import PropTypes from 'prop-types';
 
+import { Link } from 'react-router-dom';
+
 import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
 import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/done.svg';
 
-import { Icon }  from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
 
-const Step = ({ label, description, icon, iconComponent, completed, onClick, href }) => {
+export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
   const content = (
     <>
       <div className='onboarding__steps__item__icon'>
@@ -29,6 +31,12 @@ const Step = ({ label, description, icon, iconComponent, completed, onClick, hre
         {content}
       </a>
     );
+  } else if (to) {
+    return (
+      <Link to={to} className='onboarding__steps__item'>
+        {content}
+      </Link>
+    );
   }
 
   return (
@@ -45,7 +53,6 @@ Step.propTypes = {
   iconComponent: PropTypes.func,
   completed: PropTypes.bool,
   href: PropTypes.string,
+  to: PropTypes.string,
   onClick: PropTypes.func,
 };
-
-export default Step;
diff --git a/app/javascript/mastodon/features/onboarding/follows.jsx b/app/javascript/mastodon/features/onboarding/follows.jsx
index e21c7c75b6..e23a335c06 100644
--- a/app/javascript/mastodon/features/onboarding/follows.jsx
+++ b/app/javascript/mastodon/features/onboarding/follows.jsx
@@ -1,79 +1,62 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useEffect } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
+import { Link } from 'react-router-dom';
+
+import { useDispatch } from 'react-redux';
+
 
 import { fetchSuggestions } from 'mastodon/actions/suggestions';
 import { markAsPartial } from 'mastodon/actions/timelines';
-import Column from 'mastodon/components/column';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { EmptyAccount } from 'mastodon/components/empty_account';
 import Account from 'mastodon/containers/account_container';
+import { useAppSelector } from 'mastodon/store';
 
-const mapStateToProps = state => ({
-  suggestions: state.getIn(['suggestions', 'items']),
-  isLoading: state.getIn(['suggestions', 'isLoading']),
-});
+export const Follows = () => {
+  const dispatch = useDispatch();
+  const isLoading = useAppSelector(state => state.getIn(['suggestions', 'isLoading']));
+  const suggestions = useAppSelector(state => state.getIn(['suggestions', 'items']));
 
-class Follows extends PureComponent {
-
-  static propTypes = {
-    onBack: PropTypes.func,
-    dispatch: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    isLoading: PropTypes.bool,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  useEffect(() => {
     dispatch(fetchSuggestions(true));
+
+    return () => {
+      dispatch(markAsPartial('home'));
+    };
+  }, [dispatch]);
+
+  let loadedContent;
+
+  if (isLoading) {
+    loadedContent = (new Array(8)).fill().map((_, i) => <EmptyAccount key={i} />);
+  } else if (suggestions.isEmpty()) {
+    loadedContent = <div className='follow-recommendations__empty'><FormattedMessage id='onboarding.follows.empty' defaultMessage='Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.' /></div>;
+  } else {
+    loadedContent = suggestions.map(suggestion => <Account id={suggestion.get('account')} key={suggestion.get('account')} withBio />);
   }
 
-  componentWillUnmount () {
-    const { dispatch } = this.props;
-    dispatch(markAsPartial('home'));
-  }
+  return (
+    <>
+      <ColumnBackButton />
 
-  render () {
-    const { onBack, isLoading, suggestions } = this.props;
-
-    let loadedContent;
-
-    if (isLoading) {
-      loadedContent = (new Array(8)).fill().map((_, i) => <EmptyAccount key={i} />);
-    } else if (suggestions.isEmpty()) {
-      loadedContent = <div className='follow-recommendations__empty'><FormattedMessage id='onboarding.follows.empty' defaultMessage='Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.' /></div>;
-    } else {
-      loadedContent = suggestions.map(suggestion => <Account id={suggestion.get('account')} key={suggestion.get('account')} withBio />);
-    }
-
-    return (
-      <Column>
-        <ColumnBackButton onClick={onBack} />
-
-        <div className='scrollable privacy-policy'>
-          <div className='column-title'>
-            <h3><FormattedMessage id='onboarding.follows.title' defaultMessage='Popular on Mastodon' /></h3>
-            <p><FormattedMessage id='onboarding.follows.lead' defaultMessage='You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!' /></p>
-          </div>
-
-          <div className='follow-recommendations'>
-            {loadedContent}
-          </div>
-
-          <p className='onboarding__lead'><FormattedMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' values={{ strong: chunks => <strong>{chunks}</strong> }} /></p>
-
-          <div className='onboarding__footer'>
-            <button className='link-button' onClick={onBack}><FormattedMessage id='onboarding.actions.back' defaultMessage='Take me back' /></button>
-          </div>
+      <div className='scrollable privacy-policy'>
+        <div className='column-title'>
+          <h3><FormattedMessage id='onboarding.follows.title' defaultMessage='Popular on Mastodon' /></h3>
+          <p><FormattedMessage id='onboarding.follows.lead' defaultMessage='You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!' /></p>
         </div>
-      </Column>
-    );
-  }
 
-}
+        <div className='follow-recommendations'>
+          {loadedContent}
+        </div>
 
-export default connect(mapStateToProps)(Follows);
+        <p className='onboarding__lead'><FormattedMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' values={{ strong: chunks => <strong>{chunks}</strong> }} /></p>
+
+        <div className='onboarding__footer'>
+          <Link className='link-button' to='/start'><FormattedMessage id='onboarding.actions.back' defaultMessage='Take me back' /></Link>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 51d4b71f24..51677fbc7a 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -1,152 +1,90 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
-import { Link, withRouter } from 'react-router-dom';
+import { Link, Switch, Route, useHistory } from 'react-router-dom';
+
+import { useDispatch } from 'react-redux';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
 
 import { ReactComponent as AccountCircleIcon } from '@material-symbols/svg-600/outlined/account_circle.svg';
 import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
 import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
 import { ReactComponent as EditNoteIcon } from '@material-symbols/svg-600/outlined/edit_note.svg';
 import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
-import { debounce } from 'lodash';
 
 import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
-import { fetchAccount } from 'mastodon/actions/accounts';
 import { focusCompose } from 'mastodon/actions/compose';
-import { closeOnboarding } from 'mastodon/actions/onboarding';
 import { Icon }  from 'mastodon/components/icon';
 import Column from 'mastodon/features/ui/components/column';
 import { me } from 'mastodon/initial_state';
-import { makeGetAccount } from 'mastodon/selectors';
+import { useAppSelector } from 'mastodon/store';
 import { assetHost } from 'mastodon/utils/config';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
-import Step from './components/step';
-import Follows from './follows';
-import Share from './share';
+import { Step } from './components/step';
+import { Follows } from './follows';
+import { Profile } from './profile';
+import { Share } from './share';
 
 const messages = defineMessages({
   template: { id: 'onboarding.compose.template', defaultMessage: 'Hello #Mastodon!' },
 });
 
-const mapStateToProps = () => {
-  const getAccount = makeGetAccount();
+const Onboarding = () => {
+  const account = useAppSelector(state => state.getIn(['accounts', me]));
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const history = useHistory();
 
-  return state => ({
-    account: getAccount(state, me),
-  });
+  const handleComposeClick = useCallback(() => {
+    dispatch(focusCompose(history, intl.formatMessage(messages.template)));
+  }, [dispatch, intl, history]);
+
+  return (
+    <Column>
+      <Switch>
+        <Route path='/start' exact>
+          <div className='scrollable privacy-policy'>
+            <div className='column-title'>
+              <img src={illustration} alt='' className='onboarding__illustration' />
+              <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
+              <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
+            </div>
+
+            <div className='onboarding__steps'>
+              <Step to='/start/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
+              <Step to='/start/follows' completed={(account.get('following_count') * 1) >= 1} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
+              <Step onClick={handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
+              <Step to='/start/share' icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
+            </div>
+
+            <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
+
+            <div className='onboarding__links'>
+              <Link to='/explore' className='onboarding__link'>
+                <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
+                <Icon icon={ArrowRightAltIcon} />
+              </Link>
+
+              <Link to='/home' className='onboarding__link'>
+                <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
+                <Icon icon={ArrowRightAltIcon} />
+              </Link>
+            </div>
+          </div>
+        </Route>
+
+        <Route path='/start/profile' component={Profile} />
+        <Route path='/start/follows' component={Follows} />
+        <Route path='/start/share' component={Share} />
+      </Switch>
+
+      <Helmet>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
 };
 
-class Onboarding extends ImmutablePureComponent {
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    account: ImmutablePropTypes.record,
-    ...WithRouterPropTypes,
-  };
-
-  state = {
-    step: null,
-    profileClicked: false,
-    shareClicked: false,
-  };
-
-  handleClose = () => {
-    const { dispatch, history } = this.props;
-
-    dispatch(closeOnboarding());
-    history.push('/home');
-  };
-
-  handleProfileClick = () => {
-    this.setState({ profileClicked: true });
-  };
-
-  handleFollowClick = () => {
-    this.setState({ step: 'follows' });
-  };
-
-  handleComposeClick = () => {
-    const { dispatch, intl, history } = this.props;
-
-    dispatch(focusCompose(history, intl.formatMessage(messages.template)));
-  };
-
-  handleShareClick = () => {
-    this.setState({ step: 'share', shareClicked: true });
-  };
-
-  handleBackClick = () => {
-    this.setState({ step: null });
-  };
-
-  handleWindowFocus = debounce(() => {
-    const { dispatch, account } = this.props;
-    dispatch(fetchAccount(account.get('id')));
-  }, 1000, { trailing: true });
-
-  componentDidMount () {
-    window.addEventListener('focus', this.handleWindowFocus, false);
-  }
-
-  componentWillUnmount () {
-    window.removeEventListener('focus', this.handleWindowFocus);
-  }
-
-  render () {
-    const { account } = this.props;
-    const { step, shareClicked } = this.state;
-
-    switch(step) {
-    case 'follows':
-      return <Follows onBack={this.handleBackClick} />;
-    case 'share':
-      return <Share onBack={this.handleBackClick} />;
-    }
-
-    return (
-      <Column>
-        <div className='scrollable privacy-policy'>
-          <div className='column-title'>
-            <img src={illustration} alt='' className='onboarding__illustration' />
-            <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
-            <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
-          </div>
-
-          <div className='onboarding__steps'>
-            <Step onClick={this.handleProfileClick} href='/settings/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
-            <Step onClick={this.handleFollowClick} completed={(account.get('following_count') * 1) >= 7} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
-            <Step onClick={this.handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
-            <Step onClick={this.handleShareClick} completed={shareClicked} icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
-          </div>
-
-          <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
-
-          <div className='onboarding__links'>
-            <Link to='/explore' className='onboarding__link'>
-              <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
-              <Icon icon={ArrowRightAltIcon} />
-            </Link>
-
-            <Link to='/home' className='onboarding__link'>
-              <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
-              <Icon icon={ArrowRightAltIcon} />
-            </Link>
-          </div>
-        </div>
-
-        <Helmet>
-          <meta name='robots' content='noindex' />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default withRouter(connect(mapStateToProps)(injectIntl(Onboarding)));
+export default Onboarding;
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
new file mode 100644
index 0000000000..09e6b2c6c6
--- /dev/null
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -0,0 +1,160 @@
+import { useState, useMemo, useCallback, createRef } from 'react';
+
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { useHistory } from 'react-router-dom';
+
+
+import { useDispatch } from 'react-redux';
+
+import { ReactComponent as AddPhotoAlternateIcon } from '@material-symbols/svg-600/outlined/add_photo_alternate.svg';
+import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
+import Toggle from 'react-toggle';
+
+import { updateAccount } from 'mastodon/actions/accounts';
+import { Button } from 'mastodon/components/button';
+import { ColumnBackButton } from 'mastodon/components/column_back_button';
+import { Icon } from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { me } from 'mastodon/initial_state';
+import { useAppSelector } from 'mastodon/store';
+import { unescapeHTML } from 'mastodon/utils/html';
+
+const messages = defineMessages({
+  uploadHeader: { id: 'onboarding.profile.upload_header', defaultMessage: 'Upload profile header' },
+  uploadAvatar: { id: 'onboarding.profile.upload_avatar', defaultMessage: 'Upload profile picture' },
+});
+
+export const Profile = () => {
+  const account = useAppSelector(state => state.getIn(['accounts', me]));
+  const [displayName, setDisplayName] = useState(account.get('display_name'));
+  const [note, setNote] = useState(unescapeHTML(account.get('note')));
+  const [avatar, setAvatar] = useState(null);
+  const [header, setHeader] = useState(null);
+  const [discoverable, setDiscoverable] = useState(account.get('discoverable'));
+  const [isSaving, setIsSaving] = useState(false);
+  const [errors, setErrors] = useState();
+  const avatarFileRef = createRef();
+  const headerFileRef = createRef();
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const history = useHistory();
+
+  const handleDisplayNameChange = useCallback(e => {
+    setDisplayName(e.target.value);
+  }, [setDisplayName]);
+
+  const handleNoteChange = useCallback(e => {
+    setNote(e.target.value);
+  }, [setNote]);
+
+  const handleDiscoverableChange = useCallback(e => {
+    setDiscoverable(e.target.checked);
+  }, [setDiscoverable]);
+
+  const handleAvatarChange = useCallback(e => {
+    setAvatar(e.target?.files?.[0]);
+  }, [setAvatar]);
+
+  const handleHeaderChange = useCallback(e => {
+    setHeader(e.target?.files?.[0]);
+  }, [setHeader]);
+
+  const avatarPreview = useMemo(() => avatar ? URL.createObjectURL(avatar) : account.get('avatar'), [avatar, account]);
+  const headerPreview = useMemo(() => header ? URL.createObjectURL(header) : account.get('header'), [header, account]);
+
+  const handleSubmit = useCallback(() => {
+    setIsSaving(true);
+
+    dispatch(updateAccount({
+      displayName,
+      note,
+      avatar,
+      header,
+      discoverable,
+      indexable: discoverable,
+    })).then(() => history.push('/start/follows')).catch(err => {
+      setIsSaving(false);
+      setErrors(err.response.data.details);
+    });
+  }, [dispatch, displayName, note, avatar, header, discoverable, history]);
+
+  return (
+    <>
+      <ColumnBackButton />
+
+      <div className='scrollable privacy-policy'>
+        <div className='column-title'>
+          <h3><FormattedMessage id='onboarding.profile.title' defaultMessage='Profile setup' /></h3>
+          <p><FormattedMessage id='onboarding.profile.lead' defaultMessage='You can always complete this later in the settings, where even more customization options are available.' /></p>
+        </div>
+
+        <div className='simple_form'>
+          <div className='onboarding__profile'>
+            <label className={classNames('app-form__header-input', { selected: !!headerPreview, invalid: !!errors?.header })} title={intl.formatMessage(messages.uploadHeader)}>
+              <input
+                type='file'
+                hidden
+                ref={headerFileRef}
+                accept='image/*'
+                onChange={handleHeaderChange}
+              />
+
+              {headerPreview && <img src={headerPreview} alt='' />}
+
+              <Icon icon={headerPreview ? EditIcon : AddPhotoAlternateIcon} />
+            </label>
+
+            <label className={classNames('app-form__avatar-input', { selected: !!avatarPreview, invalid: !!errors?.avatar })} title={intl.formatMessage(messages.uploadAvatar)}>
+              <input
+                type='file'
+                hidden
+                ref={avatarFileRef}
+                accept='image/*'
+                onChange={handleAvatarChange}
+              />
+
+              {avatarPreview && <img src={avatarPreview} alt='' />}
+
+              <Icon icon={avatarPreview ? EditIcon : AddPhotoAlternateIcon} />
+            </label>
+          </div>
+
+          <div className={classNames('input with_block_label', { field_with_errors: !!errors?.display_name })}>
+            <label htmlFor='display_name'><FormattedMessage id='onboarding.profile.display_name' defaultMessage='Display name' /></label>
+            <span className='hint'><FormattedMessage id='onboarding.profile.display_name_hint' defaultMessage='Your full name or your fun name…' /></span>
+            <div className='label_input'>
+              <input id='display_name' type='text' value={displayName} onChange={handleDisplayNameChange} maxLength={30} />
+            </div>
+          </div>
+
+          <div className={classNames('input with_block_label', { field_with_errors: !!errors?.note })}>
+            <label htmlFor='note'><FormattedMessage id='onboarding.profile.note' defaultMessage='Bio' /></label>
+            <span className='hint'><FormattedMessage id='onboarding.profile.note_hint' defaultMessage='You can @mention other people or #hashtags…' /></span>
+            <div className='label_input'>
+              <textarea id='note' value={note} onChange={handleNoteChange} maxLength={500} />
+            </div>
+          </div>
+
+          <label className='app-form__toggle'>
+            <div className='app-form__toggle__label'>
+              <strong><FormattedMessage id='onboarding.profile.discoverable' defaultMessage='Make my profile discoverable' /></strong> <span className='recommended'><FormattedMessage id='recommended' defaultMessage='Recommended' /></span>
+              <span className='hint'><FormattedMessage id='onboarding.profile.discoverable_hint' defaultMessage='When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.' /></span>
+            </div>
+
+            <div className='app-form__toggle__toggle'>
+              <div>
+                <Toggle checked={discoverable} onChange={handleDiscoverableChange} />
+              </div>
+            </div>
+          </label>
+        </div>
+
+        <div className='onboarding__footer'>
+          <Button block onClick={handleSubmit} disabled={isSaving}>{isSaving ? <LoadingIndicator /> : <FormattedMessage id='onboarding.profile.save_and_continue' defaultMessage='Save and continue' />}</Button>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index 3349244223..adc0f9cba3 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -1,31 +1,25 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
 
 import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
 import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
 import SwipeableViews from 'react-swipeable-views';
 
-import Column from 'mastodon/components/column';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { Icon }  from 'mastodon/components/icon';
 import { me, domain } from 'mastodon/initial_state';
+import { useAppSelector } from 'mastodon/store';
 
 const messages = defineMessages({
   shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },
 });
 
-const mapStateToProps = state => ({
-  account: state.getIn(['accounts', me]),
-});
-
 class CopyPasteText extends PureComponent {
 
   static propTypes = {
@@ -141,59 +135,47 @@ class TipCarousel extends PureComponent {
 
 }
 
-class Share extends PureComponent {
+export const Share = () => {
+  const account = useAppSelector(state => state.getIn(['accounts', me]));
+  const intl = useIntl();
+  const url = (new URL(`/@${account.get('username')}`, document.baseURI)).href;
 
-  static propTypes = {
-    onBack: PropTypes.func,
-    account: ImmutablePropTypes.record,
-    intl: PropTypes.object,
-  };
+  return (
+    <>
+      <ColumnBackButton />
 
-  render () {
-    const { onBack, account, intl } = this.props;
-
-    const url = (new URL(`/@${account.get('username')}`, document.baseURI)).href;
-
-    return (
-      <Column>
-        <ColumnBackButton onClick={onBack} />
-
-        <div className='scrollable privacy-policy'>
-          <div className='column-title'>
-            <h3><FormattedMessage id='onboarding.share.title' defaultMessage='Share your profile' /></h3>
-            <p><FormattedMessage id='onboarding.share.lead' defaultMessage='Let people know how they can find you on Mastodon!' /></p>
-          </div>
-
-          <CopyPasteText value={intl.formatMessage(messages.shareableMessage, { username: `@${account.get('username')}@${domain}`, url })} />
-
-          <TipCarousel>
-            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
-            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain, strong: chunks => <strong>{chunks}</strong> }} /></p></div>
-            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
-          </TipCarousel>
-
-          <p className='onboarding__lead'><FormattedMessage id='onboarding.share.next_steps' defaultMessage='Possible next steps:' /></p>
-
-          <div className='onboarding__links'>
-            <Link to='/home' className='onboarding__link'>
-              <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
-              <Icon icon={ArrowRightAltIcon} />
-            </Link>
-
-            <Link to='/explore' className='onboarding__link'>
-              <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
-              <Icon icon={ArrowRightAltIcon} />
-            </Link>
-          </div>
-
-          <div className='onboarding__footer'>
-            <button className='link-button' onClick={onBack}><FormattedMessage id='onboarding.action.back' defaultMessage='Take me back' /></button>
-          </div>
+      <div className='scrollable privacy-policy'>
+        <div className='column-title'>
+          <h3><FormattedMessage id='onboarding.share.title' defaultMessage='Share your profile' /></h3>
+          <p><FormattedMessage id='onboarding.share.lead' defaultMessage='Let people know how they can find you on Mastodon!' /></p>
         </div>
-      </Column>
-    );
-  }
 
-}
+        <CopyPasteText value={intl.formatMessage(messages.shareableMessage, { username: `@${account.get('username')}@${domain}`, url })} />
 
-export default connect(mapStateToProps)(injectIntl(Share));
+        <TipCarousel>
+          <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
+          <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain, strong: chunks => <strong>{chunks}</strong> }} /></p></div>
+          <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
+        </TipCarousel>
+
+        <p className='onboarding__lead'><FormattedMessage id='onboarding.share.next_steps' defaultMessage='Possible next steps:' /></p>
+
+        <div className='onboarding__links'>
+          <Link to='/home' className='onboarding__link'>
+            <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
+            <Icon icon={ArrowRightAltIcon} />
+          </Link>
+
+          <Link to='/explore' className='onboarding__link'>
+            <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
+            <Icon icon={ArrowRightAltIcon} />
+          </Link>
+        </div>
+
+        <div className='onboarding__footer'>
+          <Link className='link-button' to='/start'><FormattedMessage id='onboarding.action.back' defaultMessage='Take me back' /></Link>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 02c69cbbaf..d3fee272f0 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -210,7 +210,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
-            <WrappedRoute path='/start' exact component={Onboarding} content={children} />
+            <WrappedRoute path='/start' component={Onboarding} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
             <WrappedRoute path={['/explore', '/search']} component={Explore} content={children} />
             <WrappedRoute path={['/publish', '/statuses/new']} component={Compose} content={children} />
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 6f7f355fc4..d3cc40c60c 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -250,6 +250,9 @@
   "notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit",
   "notifications.filter.boosts": "Aangestuurde plasings",
   "notifications.group": "{count} kennisgewings",
+  "notifications.permission_denied_alert": "Lessenaarkennisgewings kan nie geaktiveer word nie omdat 'n webblaaier toegewing voorheen geweier was",
+  "notifications_permission_banner.enable": "Aktiveer lessenaarkennissgewings",
+  "notifications_permission_banner.how_to_control": "Om kennisgewings te ontvang wanner Mastodon nie oop is nie, aktiveer lessenaarkennisgewings. Jy kan beheer watter spesifieke tipe interaksies lessenaarkennisgewings genereer deur die {icon} knoppie hier bo sodra hulle geaktiveer is.",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 6243f8d4ca..a652272fad 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -334,7 +334,6 @@
   "lists.search": "Buscar entre la chent a la quala sigues",
   "lists.subheading": "Las tuyas listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
-  "loading_indicator.label": "Cargando...",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
   "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
   "mute_modal.duration": "Duración",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 4a5e047647..979bc9a701 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -389,7 +389,6 @@
   "lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
-  "loading_indicator.label": "جارٍ التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.duration": "المدة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index fed324e2d0..98f622c293 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -13,27 +13,38 @@
   "about.rules": "Normes del sirvidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
+  "account.badges.bot": "Automatizáu",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
+  "account.block_short": "Bloquiar",
   "account.blocked": "Perfil bloquiáu",
   "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
+  "account.cancel_follow_request": "Atayar siguimientu",
+  "account.copy": "Copiar I'enllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
   "account.domain_blocked": "Dominiu bloquiáu",
   "account.edit_profile": "Editar el perfil",
   "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
+  "account.featured_tags.last_status_at": "Últimu estáu en {date}",
+  "account.featured_tags.last_status_never": "Sin estaos",
   "account.featured_tags.title": "Etiquetes destacaes de: {name}",
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
+  "account.followers_counter": "{count, plural, one {{counter} Siguíu} other {{counter} Siguíos}}",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural,one {Sigue a {counter}} other {Sigue a {counter}}}",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
   "account.follows_you": "Síguete",
+  "account.go_to_profile": "Dir al perfil",
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
+  "account.languages": "Camudar llingües suscrites",
+  "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
   "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
   "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
@@ -272,7 +283,6 @@
   "lists.search": "Buscar ente los perfiles que sigues",
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
-  "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
   "mute_modal.duration": "Duración",
   "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index e8a52ee29c..f94a8b79ff 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -21,6 +21,7 @@
   "account.blocked": "Заблакіраваны",
   "account.browse_more_on_origin_server": "Глядзіце больш у арыгінальным профілі",
   "account.cancel_follow_request": "Скасаваць запыт на падпіску",
+  "account.copy": "Скапіраваць спасылку на профіль",
   "account.direct": "Згадаць асабіста @{name}",
   "account.disable_notifications": "Не паведамляць мне пра публікацыі @{name}",
   "account.domain_blocked": "Дамен заблакаваны",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Адзначыць прачытаным",
   "conversation.open": "Прагледзець размову",
   "conversation.with": "З {names}",
+  "copy_icon_button.copied": "Скапіявана ў буфер абмену",
   "copypaste.copied": "Скапіравана",
   "copypaste.copy_to_clipboard": "Капіраваць у буфер абмену",
   "directory.federated": "З вядомага федэсвету",
@@ -390,7 +392,7 @@
   "lists.search": "Шукайце сярод людзей, на якіх Вы падпісаны",
   "lists.subheading": "Вашыя спісы",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
-  "loading_indicator.label": "Загрузка...",
+  "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
   "mute_modal.duration": "Працягласць",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "На жаль, зараз немагчыма паказаць вынікі. Вы можаце паспрабаваць выкарыстоўваць пошук і праглядзець старонку агляду, каб знайсці людзей, на якіх можна падпісацца, або паўтарыце спробу пазней.",
   "onboarding.follows.lead": "Вы самі ствараеце свой хатні канал. Чым больш людзей вы падпішаце, тым больш актыўна і цікавей гэта будзе. Гэтыя профілі могуць стаць добрай адпраўной кропкай — вы заўсёды можаце адмяніць падпіску на іх пазней!",
   "onboarding.follows.title": "Папулярна на Mastodon",
+  "onboarding.profile.discoverable": "Зрабіць мой профіль бачным",
+  "onboarding.profile.discoverable_hint": "Калі вы звяртаецеся да адкрытасці на Mastodon, вашы паведамленні могуць з'яўляцца ў выніках пошуку і тэндэнцый, а ваш профіль можа быць прапанаваны людзям з такімі ж інтарэсамі.",
+  "onboarding.profile.display_name": "Бачнае імя",
+  "onboarding.profile.display_name_hint": "Ваша поўнае імя або ваш псеўданім…",
+  "onboarding.profile.lead": "Вы заўсёды можаце выканаць гэта пазней у Наладах, дзе даступна яшчэ больш параметраў.",
+  "onboarding.profile.note": "Біяграфія",
+  "onboarding.profile.note_hint": "Вы можаце @згадаць іншых людзей або выкарыстоўваць #хэштэгі…",
+  "onboarding.profile.save_and_continue": "Захаваць і працягнуць",
+  "onboarding.profile.title": "Налады профілю",
+  "onboarding.profile.upload_avatar": "Загрузіць фота профілю",
+  "onboarding.profile.upload_header": "Загрузіць шапку профілю",
   "onboarding.share.lead": "Дайце людзям ведаць, як яны могуць знайсці вас на Mastodon!",
   "onboarding.share.message": "Я {username} на #Mastodon! Сачыце за мной на {url}",
   "onboarding.share.next_steps": "Магчымыя наступныя крокі:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Не ў стужках",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
+  "recommended": "Рэкамендуем",
   "refresh": "Абнавiць",
   "regeneration_indicator.label": "Загрузка…",
   "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Супадзенне паведамленняў {x}",
   "search.search_or_paste": "Пошук",
   "search_popout.full_text_search_disabled_message": "Недаступна на {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Даступна толькі пры ўваходзе ў сістэму.",
   "search_popout.language_code": "ISO код мовы",
   "search_popout.options": "Параметры пошуку",
   "search_popout.quick_actions": "Хуткія дзеянні",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 83bffd946d..f57d868c7a 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -21,6 +21,7 @@
   "account.blocked": "Блокирани",
   "account.browse_more_on_origin_server": "Разглеждане на още в оригиналния профил",
   "account.cancel_follow_request": "Оттегляне на заявката за последване",
+  "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
   "account.disable_notifications": "Сприране на известия при публикуване от @{name}",
   "account.domain_blocked": "Блокиран домейн",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Маркиране като прочетено",
   "conversation.open": "Преглед на разговора",
   "conversation.with": "С {names}",
+  "copy_icon_button.copied": "Копиранo в буферната памет",
   "copypaste.copied": "Копирано",
   "copypaste.copy_to_clipboard": "Копиране в буферната памет",
   "directory.federated": "От позната федивселена",
@@ -222,6 +224,7 @@
   "emoji_button.search_results": "Резултати от търсене",
   "emoji_button.symbols": "Символи",
   "emoji_button.travel": "Пътуване и места",
+  "empty_column.account_hides_collections": "Този потребител е избрал да не прави това сведение достъпно",
   "empty_column.account_suspended": "Спрян акаунт",
   "empty_column.account_timeline": "Тук няма публикации!",
   "empty_column.account_unavailable": "Профилът не е наличен",
@@ -389,7 +392,7 @@
   "lists.search": "Търсене измежду последваните",
   "lists.subheading": "Вашите списъци",
   "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
-  "loading_indicator.label": "Зареждане...",
+  "loading_indicator.label": "Зареждане…",
   "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
   "mute_modal.duration": "Времетраене",
@@ -478,6 +481,17 @@
   "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате да употребявате търсене или да прегледате страницата за изследване, за да намерите страница за последване, или да опитате пак по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
   "onboarding.follows.title": "Популярно в Mastodon",
+  "onboarding.profile.discoverable": "Правене на моя профил откриваем",
+  "onboarding.profile.discoverable_hint": "Включвайки откриваемостта в Mastodon, вашите публикации може да се появят при резултатите от търсене и изгряващи неща, и вашия профил може да бъде предложен на хора с подобни интереси като вашите.",
+  "onboarding.profile.display_name": "Името на показ",
+  "onboarding.profile.display_name_hint": "Вашето пълно име или псевдоним…",
+  "onboarding.profile.lead": "Винаги може да завършите това по-късно в настройките, където дори има повече възможности за настройване.",
+  "onboarding.profile.note": "Биогр.",
+  "onboarding.profile.note_hint": "Може да @споменавате други хора или #хаштагове…",
+  "onboarding.profile.save_and_continue": "Запазване и продължаване",
+  "onboarding.profile.title": "Настройване на профила",
+  "onboarding.profile.upload_avatar": "Качване на снимка на профила",
+  "onboarding.profile.upload_header": "Качване на заглавка на профила",
   "onboarding.share.lead": "Позволете на хората да знаят, че могат да ви намерят в Mastodon!",
   "onboarding.share.message": "Аз съм {username} в #Mastodon! Елате да ме последвате при {url}",
   "onboarding.share.next_steps": "Възможни следващи стъпки:",
@@ -521,6 +535,7 @@
   "privacy.unlisted.short": "Несписъчно",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
+  "recommended": "Препоръчано",
   "refresh": "Опресняване",
   "regeneration_indicator.label": "Зареждане…",
   "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!",
@@ -591,6 +606,7 @@
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
   "search.search_or_paste": "Търсене или поставяне на URL адрес",
   "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
   "search_popout.options": "Възможности при търсене",
   "search_popout.quick_actions": "Бързи действия",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 85d6f2474a..b6e4fbb965 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -314,7 +314,6 @@
   "lists.search": "যাদের অনুসরণ করেন তাদের ভেতরে খুঁজুন",
   "lists.subheading": "আপনার তালিকা",
   "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
-  "loading_indicator.label": "আসছে...",
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
   "mute_modal.duration": "সময়কাল",
   "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 8449762c2d..39cd732419 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -329,7 +329,6 @@
   "lists.search": "Klask e-touez tud heuliet ganeoc'h",
   "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
-  "loading_indicator.label": "O kargañ...",
   "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
   "mute_modal.duration": "Padelezh",
   "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 99cae584b0..87121b7c52 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Explora'n més al perfil original",
   "account.cancel_follow_request": "Cancel·la el seguiment",
+  "account.copy": "Copia l'enllaç al perfil",
   "account.direct": "Menciona privadament @{name}",
   "account.disable_notifications": "Deixa de notificar-me els tuts de @{name}",
   "account.domain_blocked": "Domini blocat",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
   "conversation.with": "Amb {names}",
+  "copy_icon_button.copied": "Copiat al porta-retalls",
   "copypaste.copied": "Copiat",
   "copypaste.copy_to_clipboard": "Copia al porta-retalls",
   "directory.federated": "Del fedivers conegut",
@@ -222,7 +224,7 @@
   "emoji_button.search_results": "Resultats de la cerca",
   "emoji_button.symbols": "Símbols",
   "emoji_button.travel": "Viatges i llocs",
-  "empty_column.account_hides_collections": "Aquest usuari ha elegit no mostrar aquesta informació",
+  "empty_column.account_hides_collections": "Aquest usuari ha decidit no mostrar aquesta informació",
   "empty_column.account_suspended": "Compte suspès",
   "empty_column.account_timeline": "No hi ha tuts aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
@@ -390,7 +392,7 @@
   "lists.search": "Cerca entre les persones que segueixes",
   "lists.subheading": "Les teves llistes",
   "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
-  "loading_indicator.label": "Es carrega...",
+  "loading_indicator.label": "Es carrega…",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
   "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
   "mute_modal.duration": "Durada",
@@ -479,6 +481,16 @@
   "onboarding.follows.empty": "Malauradament, cap resultat pot ser mostrat ara mateix. Pots provar de fer servir la cerca o visitar la pàgina Explora per a trobar gent a qui seguir o provar-ho de nou més tard.",
   "onboarding.follows.lead": "La teva línia de temps inici només està a les teves mans. Com més gent segueixis, més activa i interessant serà. Aquests perfils poden ser un bon punt d'inici—sempre pots acabar deixant de seguir-los!:",
   "onboarding.follows.title": "Personalitza la pantalla d'inci",
+  "onboarding.profile.discoverable": "Fes el meu perfil descobrible",
+  "onboarding.profile.display_name": "Nom que es mostrarà",
+  "onboarding.profile.display_name_hint": "El teu nom complet o el teu malnom…",
+  "onboarding.profile.lead": "Sempre ho pots completar més endavant a la configuració, on hi ha encara més opcions disponibles.",
+  "onboarding.profile.note": "Biografia",
+  "onboarding.profile.note_hint": "Pots @mencionar altra gent o #etiquetes…",
+  "onboarding.profile.save_and_continue": "Desa i continua",
+  "onboarding.profile.title": "Configuració del perfil",
+  "onboarding.profile.upload_avatar": "Importa una foto de perfil",
+  "onboarding.profile.upload_header": "Importa una capçalera de perfil",
   "onboarding.share.lead": "Permet que la gent sàpiga com trobar-te a Mastodon!",
   "onboarding.share.message": "Sóc {username} a #Mastodon! Vine i segueix-me a {url}",
   "onboarding.share.next_steps": "Possibles passes següents:",
@@ -522,6 +534,7 @@
   "privacy.unlisted.short": "No llistada",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
+  "recommended": "Recomanat",
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
   "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
@@ -592,6 +605,7 @@
   "search.quick_action.status_search": "Tuts coincidint amb {x}",
   "search.search_or_paste": "Cerca o escriu l'URL",
   "search_popout.full_text_search_disabled_message": "No disponible a {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Només disponible en iniciar la sessió.",
   "search_popout.language_code": "Codi de llengua ISO",
   "search_popout.options": "Opcions de cerca",
   "search_popout.quick_actions": "Accions ràpides",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 381eaa5b16..7e96418329 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -342,7 +342,6 @@
   "lists.search": "بگەڕێ لەناو ئەو کەسانەی کە شوێنیان کەوتویت",
   "lists.subheading": "لیستەکانت",
   "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
-  "loading_indicator.label": "بارکردن...",
   "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
   "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
   "mute_modal.duration": "ماوە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 1d878a0cd8..d4bb2f82ba 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -236,7 +236,6 @@
   "lists.search": "Circà indè i vostr'abbunamenti",
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
-  "loading_indicator.label": "Caricamentu...",
   "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
   "mute_modal.duration": "Durata",
   "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 33c7c31d9c..16bf5020c5 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokovaný",
   "account.browse_more_on_origin_server": "Více na původním profilu",
   "account.cancel_follow_request": "Zrušit žádost o sledování",
+  "account.copy": "Kopírovat odkaz na profil",
   "account.direct": "Soukromě zmínit @{name}",
   "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
   "account.domain_blocked": "Doména blokována",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Označit jako přečtené",
   "conversation.open": "Zobrazit konverzaci",
   "conversation.with": "S {names}",
+  "copy_icon_button.copied": "Zkopírováno do schránky",
   "copypaste.copied": "Zkopírováno",
   "copypaste.copy_to_clipboard": "Zkopírovat do schránky",
   "directory.federated": "Ze známého fedivesmíru",
@@ -222,6 +224,7 @@
   "emoji_button.search_results": "Výsledky hledání",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestování a místa",
+  "empty_column.account_hides_collections": "Tento uživatel se rozhodl nezveřejňovat tuto informaci",
   "empty_column.account_suspended": "Účet je pozastaven",
   "empty_column.account_timeline": "Nejsou tu žádné příspěvky!",
   "empty_column.account_unavailable": "Profil není dostupný",
@@ -385,7 +388,6 @@
   "lists.search": "Hledejte mezi lidmi, které sledujete",
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
-  "loading_indicator.label": "Načítání...",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
   "mute_modal.duration": "Trvání",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 183ab6955b..4ecf48735e 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -191,6 +191,7 @@
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
   "conversation.with": "Gyda {names}",
+  "copy_icon_button.copied": "Copïwyd i'r clipfwrdd",
   "copypaste.copied": "Wedi ei gopïo",
   "copypaste.copy_to_clipboard": "Copïo i'r clipfwrdd",
   "directory.federated": "O'r ffedysawd cyfan",
@@ -390,7 +391,7 @@
   "lists.search": "Chwilio ymysg pobl rydych yn eu dilyn",
   "lists.subheading": "Eich rhestrau",
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
-  "loading_indicator.label": "Llwytho...",
+  "loading_indicator.label": "Yn llwytho…",
   "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
   "mute_modal.duration": "Hyd",
@@ -479,6 +480,14 @@
   "onboarding.follows.empty": "Yn anffodus, nid oes modd dangos unrhyw ganlyniadau ar hyn o bryd. Gallwch geisio defnyddio chwilio neu bori'r dudalen archwilio i ddod o hyd i bobl i'w dilyn, neu ceisio eto yn nes ymlaen.",
   "onboarding.follows.lead": "Rydych chi'n curadu eich ffrwd gartref eich hun. Po fwyaf o bobl y byddwch chi'n eu dilyn, y mwyaf egnïol a diddorol fydd hi. Gall y proffiliau hyn fod yn fan cychwyn da - gallwch chi bob amser eu dad-ddilyn yn nes ymlaen:",
   "onboarding.follows.title": "Yn boblogaidd ar Mastodon",
+  "onboarding.profile.discoverable": "Gwnewch fy mhroffil yn un y gellir ei ddarganfod",
+  "onboarding.profile.discoverable_hint": "Pan fyddwch yn optio i mewn i ddarganfodadwyedd ar Mastodon, gall eich postiadau ymddangos mewn canlyniadau chwilio a thueddiadau, ac efallai y bydd eich proffil yn cael ei awgrymu i bobl sydd â diddordebau tebyg i chi.",
+  "onboarding.profile.display_name_hint": "Eich enw llawn neu'ch enw hwyl…",
+  "onboarding.profile.note": "Bywgraffiad",
+  "onboarding.profile.note_hint": "Gallwch @grybwyll pobl eraill neu #hashnodau…",
+  "onboarding.profile.save_and_continue": "Cadw a pharhau",
+  "onboarding.profile.title": "Gosodiad proffil",
+  "onboarding.profile.upload_avatar": "Llwytho llun proffil",
   "onboarding.share.lead": "Cofiwch ddweud wrth bobl sut y gallan nhw ddod o hyd i chi ar Mastodon!",
   "onboarding.share.message": "Fi yw {username} ar #Mastodon! Dewch i'm dilyn i yn {url}",
   "onboarding.share.next_steps": "Camau nesaf posib:",
@@ -522,6 +531,7 @@
   "privacy.unlisted.short": "Heb ei restru",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
+  "recommended": "Argymhellwyd",
   "refresh": "Adnewyddu",
   "regeneration_indicator.label": "Yn llwytho…",
   "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index bb8b72bca4..04fc43734f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokeret",
   "account.browse_more_on_origin_server": "Se mere på den oprindelige profil",
   "account.cancel_follow_request": "Annullér anmodning om at følge",
+  "account.copy": "Kopiér link til profil",
   "account.direct": "Privat omtale @{name}",
   "account.disable_notifications": "Advisér mig ikke længere, når @{name} poster",
   "account.domain_blocked": "Domæne blokeret",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
+  "copy_icon_button.copied": "Kopieret til udklipsholderen",
   "copypaste.copied": "Kopieret",
   "copypaste.copy_to_clipboard": "Kopiér til udklipsholder",
   "directory.federated": "Fra kendt fedivers",
@@ -390,7 +392,7 @@
   "lists.search": "Søg blandt personer, som følges",
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
-  "loading_indicator.label": "Indlæser...",
+  "loading_indicator.label": "Indlæser…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
   "mute_modal.duration": "Varighed",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Ingen resultater tilgængelige pt. Prøv at bruge søgning eller gennemse siden for at finde personer at følge, eller forsøg igen senere.",
   "onboarding.follows.lead": "Man kurerer sin eget hjemme-feed. Jo flere personer man følger, des mere aktiv og interessant vil det være. Disse profiler kan være et godt udgangspunkt – de kan altid fjernes senere!",
   "onboarding.follows.title": "Populært på Mastodon",
+  "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.lead": "Dette kan altid færdiggøres senere i indstillingerne, hvor endnu flere tilpasningsmuligheder forefindes.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "Man kan @omtale andre personer eller #hashtags…",
+  "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.share.lead": "Lad folk vide, hvordan de kan finde dig på Mastodon!",
   "onboarding.share.message": "Jeg er {username} på #Mastodon! Følg mig på {url}",
   "onboarding.share.next_steps": "Mulige næste trin:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Diskret",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
+  "recommended": "Anbefalet",
   "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
   "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Indlæg matchende {x}",
   "search.search_or_paste": "Søg efter eller angiv URL",
   "search_popout.full_text_search_disabled_message": "Utilgængelig på {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Kun tilgængelig, når logget ind.",
   "search_popout.language_code": "ISO-sprogkode",
   "search_popout.options": "Søgevalg",
   "search_popout.quick_actions": "Hurtige handlinger",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index e4f7fe6cec..cf545e48c1 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blockiert",
   "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
   "account.cancel_follow_request": "Folgeanfrage zurückziehen",
+  "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
   "account.domain_blocked": "Domain versteckt",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
   "conversation.with": "Mit {names}",
+  "copy_icon_button.copied": "In die Zwischenablage kopiert",
   "copypaste.copied": "Kopiert",
   "copypaste.copy_to_clipboard": "In die Zwischenablage kopieren",
   "directory.federated": "Aus bekanntem Fediverse",
@@ -390,7 +392,7 @@
   "lists.search": "Suche nach Leuten, denen du folgst",
   "lists.subheading": "Deine Listen",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
-  "loading_indicator.label": "Wird geladen …",
+  "loading_indicator.label": "Wird geladen …",
   "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
   "mute_modal.duration": "Dauer",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
   "onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
   "onboarding.follows.title": "Personalisiere deine Startseite",
+  "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+  "onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
+  "onboarding.profile.display_name": "Anzeigename",
+  "onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
+  "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+  "onboarding.profile.note": "Über mich",
+  "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
+  "onboarding.profile.save_and_continue": "Speichern und fortsetzen",
+  "onboarding.profile.title": "Profil einrichten",
+  "onboarding.profile.upload_avatar": "Profilbild hochladen",
+  "onboarding.profile.upload_header": "Titelbild hochladen",
   "onboarding.share.lead": "Lass die Leute wissen, wie sie dich auf Mastodon finden können!",
   "onboarding.share.message": "Ich bin {username} auf #Mastodon! Folge mir auf {url}",
   "onboarding.share.next_steps": "Mögliche nächste Schritte:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Nicht gelistet",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
+  "recommended": "Empfohlen",
   "refresh": "Aktualisieren",
   "regeneration_indicator.label": "Wird geladen …",
   "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Beiträge passend zu {x}",
   "search.search_or_paste": "Suchen oder URL einfügen",
   "search_popout.full_text_search_disabled_message": "Auf {domain} nicht verfügbar.",
+  "search_popout.full_text_search_logged_out_message": "Nur verfügbar, wenn angemeldet.",
   "search_popout.language_code": "ISO-Sprachcode",
   "search_popout.options": "Suchoptionen",
   "search_popout.quick_actions": "Schnellaktionen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index d3be386b40..02ce7120a3 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -168,6 +168,7 @@
   "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
   "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
+  "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
   "confirmations.reply.confirm": "Απάντησε",
   "confirmations.reply.message": "Απαντώντας τώρα θα αντικαταστήσεις το κείμενο που ήδη γράφεις. Σίγουρα θέλεις να συνεχίσεις;",
   "confirmations.unfollow.confirm": "Άρση ακολούθησης",
@@ -187,6 +188,7 @@
   "dismissable_banner.community_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις ατόμων των οποίων οι λογαριασμοί φιλοξενούνται στο {domain}.",
   "dismissable_banner.dismiss": "Παράβλεψη",
   "dismissable_banner.explore_links": "Αυτές οι ειδήσεις συζητούνται σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
+  "dismissable_banner.explore_statuses": "Αυτές είναι οι αναρτήσεις που έχουν απήχηση στο κοινωνικό δίκτυο σήμερα. Οι νεώτερες αναρτήσεις με περισσότερες προωθήσεις και προτιμήσεις κατατάσσονται ψηλότερα.",
   "dismissable_banner.explore_tags": "Αυτές οι ετικέτες αποκτούν απήχηση σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
   "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.",
   "embed.preview": "Ορίστε πως θα φαίνεται:",
@@ -279,13 +281,17 @@
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
+  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:\nΗ τροφοδοσία της αρχικής σελίδας σας είναι ένα μίγμα από αναρτήσεις με τις ετικέτες και τα άτομα που επιλέξατε να ακολουθείτε, και τις αναρτήσεις που προωθούν. Εάν αυτό σας φαίνεται πολύ ήσυχο, μπορεί να θέλετε:",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
   "home.show_announcements": "Εμφάνιση ανακοινώσεων",
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
   "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.",
+  "interaction_modal.login.action": "Take me home\nΠήγαινέ με στην αρχική σελίδα",
+  "interaction_modal.no_account_yet": "Not on Mastodon?\nΔεν είστε στο Mastodon;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
+  "interaction_modal.title.favourite": "Favorite {name}'s post\nΠροτίμησε την ανάρτηση της/του {name}",
   "interaction_modal.title.follow": "Ακολούθησε {name}",
   "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}",
   "interaction_modal.title.reply": "Απάντηση στην ανάρτηση του {name}",
@@ -345,7 +351,6 @@
   "lists.search": "Αναζήτησε μεταξύ των ανθρώπων που ακουλουθείς",
   "lists.subheading": "Οι λίστες σου",
   "load_pending": "{count, plural, one {# νέο στοιχείο} other {# νέα στοιχεία}}",
-  "loading_indicator.label": "Φορτώνει...",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
   "mute_modal.duration": "Διάρκεια",
@@ -377,6 +382,7 @@
   "not_signed_in_indicator.not_signed_in": "Πρέπει να συνδεθείς για να αποκτήσεις πρόσβαση σε αυτόν τον πόρο.",
   "notification.admin.report": "Ο/Η {name} ανέφερε τον {target}",
   "notification.admin.sign_up": "{name} έχει εγγραφεί",
+  "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.mention": "Ο/Η {name} σε επισήμανε",
@@ -406,7 +412,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Επισήμανση μη αναγνωσμένων ειδοποιήσεων",
   "notifications.column_settings.update": "Επεξεργασίες:",
   "notifications.filter.all": "Όλες",
-  "notifications.filter.boosts": "Ενισχύσεις",
+  "notifications.filter.boosts": "Προωθήσεις",
   "notifications.filter.follows": "Ακολουθείς",
   "notifications.filter.mentions": "Επισημάνσεις",
   "notifications.filter.polls": "Αποτελέσματα δημοσκόπησης",
@@ -426,9 +432,11 @@
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "You've made it!\nΤα καταφέρατε!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
@@ -573,7 +581,7 @@
   "status.read_more": "Διάβασε περισότερα",
   "status.reblog": "Ενίσχυση",
   "status.reblog_private": "Ενίσχυση με αρχική ορατότητα",
-  "status.reblogged_by": "{name} ενισχύθηκε",
+  "status.reblogged_by": "{name} προώθησε",
   "status.reblogs.empty": "Κανείς δεν ενίσχυσε αυτή την ανάρτηση ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.",
   "status.redraft": "Σβήσε & ξαναγράψε",
   "status.remove_bookmark": "Αφαίρεση σελιδοδείκτη",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 20ed8937bc..7745311be5 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -389,7 +389,7 @@
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
@@ -478,6 +478,15 @@
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Personalize your home feed",
+  "onboarding.profile.display_name": "Display name",
+  "onboarding.profile.display_name_hint": "Your full name or your fun name…",
+  "onboarding.profile.lead": "You can always complete this later in the settings, where even more customisation options are available.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "You can @mention other people or #hashtags…",
+  "onboarding.profile.save_and_continue": "Save and continue",
+  "onboarding.profile.title": "Profile setup",
+  "onboarding.profile.upload_avatar": "Upload profile picture",
+  "onboarding.profile.upload_header": "Upload profile header",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!",
   "onboarding.share.message": "I'm {username} on #Mastodon! Come follow me at {url}",
   "onboarding.share.next_steps": "Possible next steps:",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9cbaf93054..05d7d16564 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow",
+  "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copy_icon_button.copied": "Copied to clipboard",
   "copypaste.copied": "Copied",
   "copypaste.copy_to_clipboard": "Copy to clipboard",
   "directory.federated": "From known fediverse",
@@ -390,7 +392,7 @@
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
   "onboarding.follows.lead": "Your home feed is the primary way to experience Mastodon. The more people you follow, the more active and interesting it will be. To get you started, here are some suggestions:",
   "onboarding.follows.title": "Personalize your home feed",
+  "onboarding.profile.discoverable": "Make my profile discoverable",
+  "onboarding.profile.discoverable_hint": "When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.",
+  "onboarding.profile.display_name": "Display name",
+  "onboarding.profile.display_name_hint": "Your full name or your fun name…",
+  "onboarding.profile.lead": "You can always complete this later in the settings, where even more customization options are available.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "You can @mention other people or #hashtags…",
+  "onboarding.profile.save_and_continue": "Save and continue",
+  "onboarding.profile.title": "Profile setup",
+  "onboarding.profile.upload_avatar": "Upload profile picture",
+  "onboarding.profile.upload_header": "Upload profile header",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!",
   "onboarding.share.message": "I'm {username} on #Mastodon! Come follow me at {url}",
   "onboarding.share.next_steps": "Possible next steps:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
+  "recommended": "Recommended",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Posts matching {x}",
   "search.search_or_paste": "Search or paste URL",
   "search_popout.full_text_search_disabled_message": "Not available on {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Only available when logged in.",
   "search_popout.language_code": "ISO language code",
   "search_popout.options": "Search options",
   "search_popout.quick_actions": "Quick actions",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 6b4258a6bc..537b8d0af1 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -350,6 +350,7 @@
   "lightbox.previous": "Malantaŭen",
   "limited_account_hint.action": "Montru profilon ĉiukaze",
   "limited_account_hint.title": "La profilo estas kaŝita de la moderigantoj de {domain}.",
+  "link_preview.author": "De {name}",
   "lists.account.add": "Aldoni al la listo",
   "lists.account.remove": "Forigi de la listo",
   "lists.delete": "Forigi la liston",
@@ -365,7 +366,6 @@
   "lists.search": "Serĉi inter la homoj, kiujn vi sekvas",
   "lists.subheading": "Viaj listoj",
   "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
-  "loading_indicator.label": "Ŝargado…",
   "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
   "mute_modal.duration": "Daŭro",
@@ -447,6 +447,7 @@
   "onboarding.follows.empty": "Bedaŭrinde, neniu rezulto estas montrebla nuntempe. Vi povas provi serĉi aŭ foliumi la esploran paĝon por trovi kontojn por sekvi, aŭ retrovi baldaŭ.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.save_and_continue": "Konservi kaj daŭrigi",
   "onboarding.share.message": "Mi estas {username} en #Mastodon! Sekvu min ĉe {url}",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 71d6e3119b..4573f4ab9d 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Explorar más en el perfil original",
   "account.cancel_follow_request": "Dejar de seguir",
+  "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
   "account.domain_blocked": "Dominio bloqueado",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiado en el portapapeles",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde fediverso conocido",
@@ -390,7 +392,7 @@
   "lists.search": "Buscar entre la gente que seguís",
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
-  "loading_indicator.label": "Cargando...",
+  "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
   "mute_modal.duration": "Duración",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Podés intentar usar la búsqueda o navegar por la página de exploración para encontrar cuentas a las que seguir, o intentarlo de nuevo más tarde.",
   "onboarding.follows.lead": "Tu línea temporal de inicio es la forma principal de experimentar Mastodon. Cuanta más cuentas sigás, más activa e interesante será. Para empezar, acá tenés algunas sugerencias:",
   "onboarding.follows.title": "Personalizá tu línea de tiempo principal",
+  "onboarding.profile.discoverable": "Hacer que mi perfil sea detectable",
+  "onboarding.profile.discoverable_hint": "Cuando optás por ser detectable en Mastodon, tus mensajes pueden aparecer en los resultados de búsqueda y de tendencia, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
+  "onboarding.profile.display_name": "Nombre para mostrar",
+  "onboarding.profile.display_name_hint": "Tu nombre completo o tu pseudónimo…",
+  "onboarding.profile.lead": "Siempre podés completar esto más tarde en la configuración, donde hay disponibles más opciones de personalización.",
+  "onboarding.profile.note": "Biografía",
+  "onboarding.profile.note_hint": "Podés @mencionar otras cuentas o usar #etiquetas…",
+  "onboarding.profile.save_and_continue": "Guardar y continuar",
+  "onboarding.profile.title": "Configuración del perfil",
+  "onboarding.profile.upload_avatar": "Subir avatar",
+  "onboarding.profile.upload_header": "Subir cabecera",
   "onboarding.share.lead": "¡Decile a la gente cómo te pueden encontrar en Mastodon!",
   "onboarding.share.message": "¡En #Mastodon soy «{username}»! Podés seguirme desde {url}",
   "onboarding.share.next_steps": "Posibles próximos pasos:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
+  "recommended": "Opción recomendada",
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Mensajes que coinciden con {x}",
   "search.search_or_paste": "Buscar o pegar dirección web",
   "search_popout.full_text_search_disabled_message": "No disponible en {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solo disponible al iniciar sesión.",
   "search_popout.language_code": "Código ISO de idioma",
   "search_popout.options": "Opciones de búsqueda",
   "search_popout.quick_actions": "Acciones rápidas",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index aadc901f99..f7cd1b3305 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
+  "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocked": "Dominio oculto",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiado al portapapeles",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar gente a la que seguir, o inténtalo de nuevo más tarde.",
   "onboarding.follows.lead": "Tienes que personalizar tu inicio. Cuantas más personas sigas, más activo e interesante será. Estos perfiles pueden ser un buen punto de partida, ¡pero siempre puedes dejar de seguirlos más adelante!",
   "onboarding.follows.title": "Popular en Mastodon",
+  "onboarding.profile.discoverable": "Make my profile discoverable",
+  "onboarding.profile.discoverable_hint": "Cuando aceptas ser descubierto en Mastodon, tus publicaciones pueden aparecer en resultados de búsqueda y tendencias, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
+  "onboarding.profile.display_name": "Nombre a mostrar",
+  "onboarding.profile.display_name_hint": "Tu nombre completo o tu apodo…",
+  "onboarding.profile.lead": "Siempre puedes completar esto más tarde en los ajustes, donde hay aún más opciones de personalización disponibles.",
+  "onboarding.profile.note": "Biografía",
+  "onboarding.profile.note_hint": "Puedes @mencionar a otras personas o #hashtags…",
+  "onboarding.profile.save_and_continue": "Guardar y continuar",
+  "onboarding.profile.title": "Configuración del perfil",
+  "onboarding.profile.upload_avatar": "Subir foto de perfil",
+  "onboarding.profile.upload_header": "Subir foto de cabecera",
   "onboarding.share.lead": "¡Dile a la gente cómo te pueden encontrar en Mastodon!",
   "onboarding.share.message": "¡Soy {username} en #Mastodon! Ven a seguirme en {url}",
   "onboarding.share.next_steps": "Posibles siguientes pasos:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
+  "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publicaciones que coinciden con {x}",
   "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.full_text_search_disabled_message": "No disponible en {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solo disponible si inicias sesión.",
   "search_popout.language_code": "Código de idioma ISO",
   "search_popout.options": "Opciones de búsqueda",
   "search_popout.quick_actions": "Acciones rápidas",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index f3735d9685..bbc8bcc759 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
+  "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocked": "Dominio bloqueado",
@@ -65,7 +66,7 @@
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Desbloquear dominio {domain}",
   "account.unblock_short": "Desbloquear",
-  "account.unendorse": "No destacar en el perfil",
+  "account.unendorse": "No mostrar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications_short": "Dejar de silenciar notificaciones",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiado al portapapeles",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar personas a las que seguir, o inténtalo de nuevo más tarde.",
   "onboarding.follows.lead": "Tu línea de inicio es la forma principal de experimentar Mastodon. Cuanta más personas sigas, más activa e interesante será. Para empezar, aquí hay algunas sugerencias:",
   "onboarding.follows.title": "Personaliza tu línea de inicio",
+  "onboarding.profile.discoverable": "Hacer que mi perfil aparezca en búsquedas",
+  "onboarding.profile.discoverable_hint": "Cuando permites que tu perfil aparezca en búsquedas en Mastodon, tus publicaciones podrán aparecer en los resultados de búsqueda y en tendencias, y tu perfil podrá recomendarse a gente con intereses similares a los tuyos.",
+  "onboarding.profile.display_name": "Nombre para mostrar",
+  "onboarding.profile.display_name_hint": "Tu nombre completo o tu apodo…",
+  "onboarding.profile.lead": "Siempre puedes completar esto más tarde en los ajustes, donde hay aún más opciones de personalización disponibles.",
+  "onboarding.profile.note": "Biografía",
+  "onboarding.profile.note_hint": "Puedes @mencionar a otras personas o #etiquetas…",
+  "onboarding.profile.save_and_continue": "Guardar y continuar",
+  "onboarding.profile.title": "Configuración del perfil",
+  "onboarding.profile.upload_avatar": "Subir foto de perfil",
+  "onboarding.profile.upload_header": "Subir encabezado de perfil",
   "onboarding.share.lead": "¡Cuéntale a otras personas cómo te pueden encontrar en Mastodon!",
   "onboarding.share.message": "¡Soy {username} en #Mastodon! Ven a seguirme en {url}",
   "onboarding.share.next_steps": "Posibles siguientes pasos:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
+  "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publicaciones que coinciden con {x}",
   "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.full_text_search_disabled_message": "No disponible en {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solo disponible si inicias sesión.",
   "search_popout.language_code": "Código de idioma ISO",
   "search_popout.options": "Opciones de búsqueda",
   "search_popout.quick_actions": "Acciones rápidas",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index c4182a073d..a67aa6feed 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokeeritud",
   "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
   "account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
+  "account.copy": "Kopeeri link profiili",
   "account.direct": "Maini privaatselt @{name}",
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
   "account.domain_blocked": "Domeen peidetud",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
   "conversation.with": "Koos {names}",
+  "copy_icon_button.copied": "Kopeeritud vahemällu",
   "copypaste.copied": "Kopeeritud",
   "copypaste.copy_to_clipboard": "Kopeeri vahemällu",
   "directory.federated": "Tuntud födiversumist",
@@ -390,7 +392,7 @@
   "lists.search": "Otsi enda jälgitavate inimeste hulgast",
   "lists.subheading": "Sinu nimekirjad",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
-  "loading_indicator.label": "Laeb..",
+  "loading_indicator.label": "Laadimine…",
   "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
   "mute_modal.duration": "Kestus",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Kahjuks ei saa hetkel tulemusi näidata. Proovi kasutada otsingut või lehitse uurimise lehte, et leida inimesi, keda jälgida, või proovi hiljem uuesti.",
   "onboarding.follows.lead": "Haldad ise oma koduvoogu. Mida rohkemaid inimesi jälgid, seda aktiivsem ja huvitavam see on. Need profiilid võiksid olla head alustamiskohad — saad nende jälgimise alati lõpetada!",
   "onboarding.follows.title": "Populaarne Mastodonis",
+  "onboarding.profile.discoverable": "Muuda mu profiil avastatavaks",
+  "onboarding.profile.discoverable_hint": "Kui nõustud enda avastamisega Mastodonis, võivad sinu postitused ilmuda otsingutulemustes ja trendides ning sinu profiili võidakse soovitada sinuga sarnaste huvidega inimestele.",
+  "onboarding.profile.display_name": "Näidatav nimi",
+  "onboarding.profile.display_name_hint": "Su täisnimi või naljanimi…",
+  "onboarding.profile.lead": "Saad selle alati hiljem seadetes lõpuni viia, kus on saadaval veel rohkem kohandamisvalikuid.",
+  "onboarding.profile.note": "Elulugu",
+  "onboarding.profile.note_hint": "Saad @mainida teisi kasutajaid või #sildistada…",
+  "onboarding.profile.save_and_continue": "Salvesta ja jätka",
+  "onboarding.profile.title": "Profiili seadistamine",
+  "onboarding.profile.upload_avatar": "Laadi üles profiilipilt",
+  "onboarding.profile.upload_header": "Laadi üles profiili päis",
   "onboarding.share.lead": "Anna inimestele teada, kuidas sind Mastodonist üles leida!",
   "onboarding.share.message": "Ma olen #Mastodon võrgustikus {username}! tule ja jälgi mind aadressil {url}",
   "onboarding.share.next_steps": "Võimalikud järgmised sammud:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Määramata",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
+  "recommended": "Soovitatud",
   "refresh": "Värskenda",
   "regeneration_indicator.label": "Laeb…",
   "regeneration_indicator.sublabel": "Su koduvoog on ettevalmistamisel!",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 7f109ea082..26ed7add1e 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -16,16 +16,17 @@
   "account.badges.bot": "Bot-a",
   "account.badges.group": "Taldea",
   "account.block": "Blokeatu @{name}",
-  "account.block_domain": "Ezkutatu {domain} domeinuko guztia",
+  "account.block_domain": "Blokeatu {domain} domeinua",
   "account.block_short": "Blokeatu",
   "account.blocked": "Blokeatuta",
   "account.browse_more_on_origin_server": "Arakatu gehiago jatorrizko profilean",
   "account.cancel_follow_request": "Baztertu jarraitzeko eskaera",
+  "account.copy": "Kopiatu profilerako esteka",
   "account.direct": "Aipatu pribatuki @{name}",
-  "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzailearen bidalketetan",
+  "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
   "account.domain_blocked": "Ezkutatutako domeinua",
   "account.edit_profile": "Aldatu profila",
-  "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak bidalketak egitean",
+  "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
   "account.featured_tags.last_status_never": "Bidalketarik ez",
@@ -39,7 +40,7 @@
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
   "account.follows_you": "Jarraitzen dizu",
   "account.go_to_profile": "Joan profilera",
-  "account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak",
+  "account.hide_reblogs": "Ezkutatu @{name} erabiltzailearen bultzadak",
   "account.in_memoriam": "Oroimenezkoa.",
   "account.joined_short": "Elkartuta",
   "account.languages": "Aldatu harpidetutako hizkuntzak",
@@ -59,8 +60,8 @@
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Egin klik jarraipen-eskaera ezeztatzeko",
   "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du",
-  "account.share": "@{name}(e)ren profila elkarbanatu",
-  "account.show_reblogs": "Erakutsi @{name}(r)en bultzadak",
+  "account.share": "Partekatu @{name} erabiltzailearen profila",
+  "account.show_reblogs": "Erakutsi @{name} erabiltzailearen bultzadak",
   "account.statuses_counter": "{count, plural, one {Bidalketa {counter}} other {{counter} bidalketa}}",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
   "conversation.with": "Hauekin: {names}",
+  "copy_icon_button.copied": "Arbelera kopiatu da",
   "copypaste.copied": "Kopiatuta",
   "copypaste.copy_to_clipboard": "Kopiatu arbelera",
   "directory.federated": "Fedibertso ezagunekoak",
@@ -389,8 +391,8 @@
   "lists.replies_policy.title": "Erakutsi erantzunak:",
   "lists.search": "Bilatu jarraitzen dituzun pertsonen artean",
   "lists.subheading": "Zure zerrendak",
-  "load_pending": "{count, plural, one {eleentuberri #} other {# elementu berri}}",
-  "loading_indicator.label": "Kargatzen...",
+  "load_pending": "{count, plural, one {elementu berri #} other {# elementu berri}}",
+  "loading_indicator.label": "Kargatzen…",
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
   "mute_modal.duration": "Iraupena",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Zoritxarrez, ezin da emaitzik erakutsi orain. Bilaketa erabil dezakezu edo Arakatu orrian jendea bilatu jarraitzeko, edo saiatu geroago.",
   "onboarding.follows.lead": "Hasierako orria zuk pertsonalizatzen duzu. Gero eta jende gehiagori jarraitu, orduan eta aktibo eta interesgarriago izango da. Profil hauek egokiak izan daitezke hasteko, beti ere, geroago jarraitzeari utz diezazkiekezu!",
   "onboarding.follows.title": "Mastodonen pil-pilean",
+  "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",
+  "onboarding.profile.display_name_hint": "Zure izena edo ezizena…",
+  "onboarding.profile.lead": "Geroagoago bete daiteke konfigurazioan, non pertsonalizatzeko aukera gehiago dauden.",
+  "onboarding.profile.note": "Biografia",
+  "onboarding.profile.note_hint": "Beste pertsona batzuk @aipa ditzakezu edo #traolak erabili…",
+  "onboarding.profile.save_and_continue": "Gorde eta jarraitu",
+  "onboarding.profile.title": "Profilaren konfigurazioa",
+  "onboarding.profile.upload_avatar": "Igo profilaren irudia",
+  "onboarding.profile.upload_header": "Igo profilaren goiburua",
   "onboarding.share.lead": "Esan jendeari nola aurki zaitzaketen Mastodonen!",
   "onboarding.share.message": "{username} naiz #Mastodon-en! Jarrai nazazu hemen: {url}",
   "onboarding.share.next_steps": "Hurrengo urrats posibleak:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Zerrendatu gabea",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
+  "recommended": "Gomendatua",
   "refresh": "Berritu",
   "regeneration_indicator.label": "Kargatzen…",
   "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "{x}-(r)ekin bat datozen argitalpenak",
   "search.search_or_paste": "Bilatu edo itsatsi URLa",
   "search_popout.full_text_search_disabled_message": "{domain}-en ez dago eskuragarri.",
+  "search_popout.full_text_search_logged_out_message": "Soilik erabilgarri saioa hastean.",
   "search_popout.language_code": "ISO hizkuntza-kodea",
   "search_popout.options": "Bilaketaren aukerak",
   "search_popout.quick_actions": "Ekintza azkarrak",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 246f218998..6951d5cb0b 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -390,7 +390,7 @@
   "lists.search": "جست‌وجو بین کسانی که پی‌گرفته‌اید",
   "lists.subheading": "سیاهه‌هایتان",
   "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}",
-  "loading_indicator.label": "بار کردن…",
+  "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
   "mute_modal.duration": "مدت زمان",
@@ -479,6 +479,13 @@
   "onboarding.follows.empty": "متأسفانه هم‌اکنون نتیجه‌ای قابل نمایش نیست. می‌توانید استفاده از جست‌وجو یا مرور صفحهٔ کاوش را برای یافتن افرادی برای پی‌گیری آزموده یا دوباره تلاش کنید.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "نمایه خود را قابل نمایش کنید",
+  "onboarding.profile.display_name": "نام نمایشی",
+  "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
+  "onboarding.profile.note": "درباره شما",
+  "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
+  "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
+  "onboarding.profile.title": "تنظیم نمایه",
   "onboarding.share.lead": "بگذارید افراد بدانند چگونه می‌توانند در ماستادون بیابندتان!",
   "onboarding.share.message": "من {username} روی #ماستودون هستم! مرا در {url} پی‌بگیرید",
   "onboarding.share.next_steps": "گام‌های ممکن بعدی:",
@@ -522,6 +529,7 @@
   "privacy.unlisted.short": "فهرست نشده",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
+  "recommended": "پیشنهادشده",
   "refresh": "نوسازی",
   "regeneration_indicator.label": "در حال بار شدن…",
   "regeneration_indicator.sublabel": "خوراک خانگیتان دارد آماده می‌شود!",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 9aa2e7355f..e99de4d03a 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -21,6 +21,7 @@
   "account.blocked": "Estetty",
   "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
+  "account.copy": "Kopioi profiililinkki",
   "account.direct": "Mainitse @{name} yksityisesti",
   "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} julkaisee",
   "account.domain_blocked": "Verkkotunnus estetty",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
   "conversation.with": "{names} kanssa",
+  "copy_icon_button.copied": "Kopioitiin leikepöydälle",
   "copypaste.copied": "Kopioitu",
   "copypaste.copy_to_clipboard": "Kopioi leikepöydälle",
   "directory.federated": "Koko tunnettu fediversumi",
@@ -390,7 +392,7 @@
   "lists.search": "Etsi seuraamistasi henkilöistä",
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
-  "loading_indicator.label": "Ladataan...",
+  "loading_indicator.label": "Ladataan…",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.duration": "Kesto",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa tai yrittää myöhemmin uudelleen.",
   "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
   "onboarding.follows.title": "Mukauta kotisyötettäsi",
+  "onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
+  "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa ja profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneet samoista aiheista kuin sinä.",
+  "onboarding.profile.display_name": "Näyttönimi",
+  "onboarding.profile.display_name_hint": "Koko nimesi tai lempinimesi…",
+  "onboarding.profile.lead": "Voit viimeistellä tämän milloin tahansa asetuksista, jotka tarjoavat vielä enemmän mukautusvalintoja.",
+  "onboarding.profile.note": "Elämäkerta",
+  "onboarding.profile.note_hint": "Voit @mainita muita käyttäjiä tai #aihetunnisteita…",
+  "onboarding.profile.save_and_continue": "Tallenna ja jatka",
+  "onboarding.profile.title": "Profiilin määritys",
+  "onboarding.profile.upload_avatar": "Lataa profiilikuva",
+  "onboarding.profile.upload_header": "Lataa profiilin otsakekuva",
   "onboarding.share.lead": "Kerro ihmisille, kuinka he voivat löytää sinut Mastodonista!",
   "onboarding.share.message": "Olen {username} #Mastodon⁠issa! Seuraa minua osoitteessa {url}",
   "onboarding.share.next_steps": "Mahdolliset seuraavat vaiheet:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Listaamaton",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
+  "recommended": "Suositeltu",
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",
   "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Julkaisut haulla {x}",
   "search.search_or_paste": "Hae tai liitä URL-osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Saatavilla vain sisäänkirjautuneena.",
   "search_popout.language_code": "ISO-kielikoodi",
   "search_popout.options": "Hakuvalinnat",
   "search_popout.quick_actions": "Pikatoiminnot",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 42a1317db7..45fafd15dc 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bannað/ur",
   "account.browse_more_on_origin_server": "Kaga meira á upprunaligu vangamyndina",
   "account.cancel_follow_request": "Strika fylgjaraumbøn",
+  "account.copy": "Avrita leinki til vangan",
   "account.direct": "Umrøð @{name} privat",
   "account.disable_notifications": "Ikki boða mær frá, tá @{name} skrivar",
   "account.domain_blocked": "Økisnavn bannað",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
   "conversation.with": "Við {names}",
+  "copy_icon_button.copied": "Avritað til setiborðið",
   "copypaste.copied": "Avritað",
   "copypaste.copy_to_clipboard": "Avrita til setiborðið",
   "directory.federated": "Frá tí kenda fediversinum",
@@ -390,7 +392,6 @@
   "lists.search": "Leita millum fólk, sum tú fylgir",
   "lists.subheading": "Tínir listar",
   "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
-  "loading_indicator.label": "Innlesi...",
   "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
   "mute_modal.duration": "Tíðarbil",
@@ -479,6 +480,8 @@
   "onboarding.follows.empty": "Tíverri kunnu eingi úrslit vísast beint nú. Tú kanst royna at brúka leiting ella at kaga gjøgnum Rannsaka síðuna fyri at finna fólk at fylgja - ella royna aftur seinni.",
   "onboarding.follows.lead": "Tú snikkar sjálv/ur tína heimarás til. Jú fleiri fólk, tú fylgir, jú virknari og áhugaverdari verður tað. Hesir vangar kunnu vera ein góð byrjan — tú kanst altíð gevast at fylgja teimum seinni!",
   "onboarding.follows.title": "Vælumtókt á Mastodon",
+  "onboarding.profile.discoverable": "Ger tað møguligt hjá øðrum at finna vangan hjá mær",
+  "onboarding.profile.discoverable_hint": "Tá tú játtar at onnur skulu kunna finna teg á Mastodon, so kann henda, at postar tínir síggjast í leitiúrslitum og rákum, og vangin hjá tær kann vera skotin upp fyri fólki við áhugamálum sum minna um tíni.",
   "onboarding.share.lead": "Lat fólk vita, hvussu tey kunnu finna teg á Mastodon!",
   "onboarding.share.message": "Eg eri {username} á #Mastodon! Kom og fylg mær á {url}",
   "onboarding.share.next_steps": "Møgulig næstu stig:",
@@ -522,6 +525,7 @@
   "privacy.unlisted.short": "Ikki listað",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
+  "recommended": "Viðmælt",
   "refresh": "Endurles",
   "regeneration_indicator.label": "Innlesur…",
   "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!",
@@ -592,6 +596,7 @@
   "search.quick_action.status_search": "Postar, ið samsvara {x}",
   "search.search_or_paste": "Leita ella set URL inn",
   "search_popout.full_text_search_disabled_message": "Ikki tøkt á {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Einans tøkt um innritað er.",
   "search_popout.language_code": "ISO málkoda",
   "search_popout.options": "Leitimøguleikar",
   "search_popout.quick_actions": "Skjótar atgerðir",
diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json
index a6dd91becf..e2067cc460 100644
--- a/app/javascript/mastodon/locales/fr-QC.json
+++ b/app/javascript/mastodon/locales/fr-QC.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqué·e",
   "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Retirer cette demande d'abonnement",
+  "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie",
   "account.domain_blocked": "Domaine bloqué",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher cette conversation",
   "conversation.with": "Avec {names}",
+  "copy_icon_button.copied": "Copié dans le presse-papier",
   "copypaste.copied": "Copié",
   "copypaste.copy_to_clipboard": "Copier dans le presse-papiers",
   "directory.federated": "D'un fediverse connu",
@@ -308,7 +310,7 @@
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
+  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
   "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer de rechercher ou de parcourir la page \"Explorer\" pour trouver des personnes à suivre, ou réessayer plus tard.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Rendre mon profil découvrable",
+  "onboarding.profile.discoverable_hint": "Lorsque vous acceptez d'être découvert sur Mastodon, vos messages peuvent apparaître dans les résultats de recherche et les tendances, et votre profil peut être suggéré à des personnes ayant des intérêts similaires aux vôtres.",
+  "onboarding.profile.display_name": "Nom affiché",
+  "onboarding.profile.display_name_hint": "Votre nom complet ou votre nom rigolo…",
+  "onboarding.profile.lead": "Vous pouvez toujours compléter cela plus tard dans les paramètres. Vous y trouverez encore plus d'options de personnalisation.",
+  "onboarding.profile.note": "Biographie",
+  "onboarding.profile.note_hint": "Vous pouvez @mentionner d'autres personnes ou #hashtags…",
+  "onboarding.profile.save_and_continue": "Enregistrer et continuer",
+  "onboarding.profile.title": "Configuration du profil",
+  "onboarding.profile.upload_avatar": "Importer une photo de profil",
+  "onboarding.profile.upload_header": "Importer un entête de profil",
   "onboarding.share.lead": "Faites savoir aux gens comment vous trouver sur Mastodon!",
   "onboarding.share.message": "Je suis {username} sur #Mastodon! Suivez-moi sur {url}",
   "onboarding.share.next_steps": "Étapes suivantes possibles:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
+  "recommended": "Recommandé",
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publications correspondant à {x}",
   "search.search_or_paste": "Rechercher ou saisir un URL",
   "search_popout.full_text_search_disabled_message": "Non disponible sur {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Disponible uniquement lorsque vous êtes connecté.",
   "search_popout.language_code": "code de langue ISO",
   "search_popout.options": "Options de recherche",
   "search_popout.quick_actions": "Actions rapides",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 0d2ba2bb9b..03b656cc47 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqué·e",
   "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Annuler le suivi",
+  "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
   "account.domain_blocked": "Domaine bloqué",
@@ -107,7 +108,7 @@
   "closed_registrations_modal.preamble": "Mastodon est décentralisé : peu importe où vous créez votre compte, vous serez en mesure de suivre et d'interagir avec quiconque sur ce serveur. Vous pouvez même l'héberger !",
   "closed_registrations_modal.title": "Inscription sur Mastodon",
   "column.about": "À propos",
-  "column.blocks": "Comptes bloqués",
+  "column.blocks": "Utilisateurs bloqués",
   "column.bookmarks": "Marque-pages",
   "column.community": "Fil public local",
   "column.direct": "Mentions privées",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
   "conversation.with": "Avec {names}",
+  "copy_icon_button.copied": "Copié dans le presse-papier",
   "copypaste.copied": "Copié",
   "copypaste.copy_to_clipboard": "Copier dans le presse-papiers",
   "directory.federated": "Du fédiverse connu",
@@ -308,7 +310,7 @@
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
+  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
   "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page de découverte pour trouver des personnes à suivre, ou réessayez plus tard.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Personnaliser votre flux principal",
+  "onboarding.profile.discoverable": "Rendre mon profil découvrable",
+  "onboarding.profile.discoverable_hint": "Lorsque vous acceptez d'être découvert sur Mastodon, vos messages peuvent apparaître dans les résultats de recherche et les tendances, et votre profil peut être suggéré à des personnes ayant des intérêts similaires aux vôtres.",
+  "onboarding.profile.display_name": "Nom affiché",
+  "onboarding.profile.display_name_hint": "Votre nom complet ou votre nom rigolo…",
+  "onboarding.profile.lead": "Vous pouvez toujours compléter cela plus tard dans les paramètres. Vous y trouverez encore plus d'options de personnalisation.",
+  "onboarding.profile.note": "Biographie",
+  "onboarding.profile.note_hint": "Vous pouvez @mentionner d'autres personnes ou #hashtags…",
+  "onboarding.profile.save_and_continue": "Enregistrer et continuer",
+  "onboarding.profile.title": "Configuration du profil",
+  "onboarding.profile.upload_avatar": "Importer une photo de profil",
+  "onboarding.profile.upload_header": "Importer un entête de profil",
   "onboarding.share.lead": "Faites savoir aux gens comment ils peuvent vous trouver sur Mastodon!",
   "onboarding.share.message": "Je suis {username} sur #Mastodon ! Suivez-moi sur {url}",
   "onboarding.share.next_steps": "Étapes suivantes possibles :",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
+  "recommended": "Recommandé",
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publications correspondant à {x}",
   "search.search_or_paste": "Rechercher ou saisir une URL",
   "search_popout.full_text_search_disabled_message": "Non disponible sur {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Disponible uniquement lorsque vous êtes connecté.",
   "search_popout.language_code": "code de langue ISO",
   "search_popout.options": "Options de recherche",
   "search_popout.quick_actions": "Actions rapides",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 9d3b416068..2ec4a53bfd 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokkearre",
   "account.browse_more_on_origin_server": "Mear op it orizjinele profyl besjen",
   "account.cancel_follow_request": "Folchfersyk annulearje",
+  "account.copy": "Keppeling nei profyl kopiearje",
   "account.direct": "Privee fermelde @{name}",
   "account.disable_notifications": "Jou gjin melding mear wannear @{name} in berjocht pleatst",
   "account.domain_blocked": "Domein blokkearre",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "As lêzen markearje",
   "conversation.open": "Petear toane",
   "conversation.with": "Mei {names}",
+  "copy_icon_button.copied": "Nei klamboerd kopiearre",
   "copypaste.copied": "Kopiearre",
   "copypaste.copy_to_clipboard": "Nei klamboerd kopiearje",
   "directory.federated": "Fediverse (wat bekend is)",
@@ -479,6 +481,17 @@
   "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.lead": "Jo beheare jo eigen startside. Hoe mear minsken jo folgje, hoe aktiver en ynteressanter it wêze sil. Dizze profilen kinne in goed startpunt wêze, jo kinne se letter altyd ûntfolgje!",
   "onboarding.follows.title": "Populêr op Mastodon",
+  "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",
+  "onboarding.profile.display_name_hint": "Jo folsleine namme of in aardige bynamme…",
+  "onboarding.profile.lead": "Jo kinne dit letter altyd oanfolje yn de ynstellingen, wêr’t noch mear oanpassingsopsjes beskikber binne.",
+  "onboarding.profile.note": "Biografy",
+  "onboarding.profile.note_hint": "Jo kinne oare minsken @fermelde of #hashtags brûke…",
+  "onboarding.profile.save_and_continue": "Bewarje en trochgean",
+  "onboarding.profile.title": "Profyl ynstelle",
+  "onboarding.profile.upload_avatar": "Profylfoto oplade",
+  "onboarding.profile.upload_header": "Omslachfoto foar profyl oplade",
   "onboarding.share.lead": "Lit minsken witte hoe’t se jo fine kinne op Mastodon!",
   "onboarding.share.message": "Ik bin {username} op #Mastodon! Folgje my op {url}",
   "onboarding.share.next_steps": "Mooglike folgjende stappen:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
+  "recommended": "Oanrekommandearre",
   "refresh": "Ferfarskje",
   "regeneration_indicator.label": "Lade…",
   "regeneration_indicator.sublabel": "Jo starttiidline wurdt oanmakke!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Berjochten dy’t oerienkomme mei {x}",
   "search.search_or_paste": "Sykje of fier URL yn",
   "search_popout.full_text_search_disabled_message": "Net beskikber op {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Allinnich beskikber as jo oanmeld binne.",
   "search_popout.language_code": "ISO-taalkoade",
   "search_popout.options": "Sykopsjes",
   "search_popout.quick_actions": "Flugge aksjes",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 388a557e8d..ee6b44c884 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -316,7 +316,6 @@
   "lists.replies_policy.title": "Taispeáin freagraí:",
   "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
   "lists.subheading": "Do liostaí",
-  "loading_indicator.label": "Ag lódáil...",
   "mute_modal.duration": "Tréimhse",
   "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
   "mute_modal.indefinite": "Gan téarma",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 4f485cfc55..91333c1a0a 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -389,7 +389,6 @@
   "lists.search": "Lorg am measg nan daoine a leanas tu",
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
-  "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.duration": "Faide",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e79e549264..08d7d49776 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueada",
   "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
   "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
+  "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
   "account.domain_blocked": "Dominio agochado",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiada ao portapapeis",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar ao portapapeis",
   "directory.federated": "Do fediverso coñecido",
@@ -390,7 +392,7 @@
   "lists.search": "Procurar entre as persoas que segues",
   "lists.subheading": "As túas listaxes",
   "load_pending": "{count, plural, one {# novo elemento} other {# novos elementos}}",
-  "loading_indicator.label": "Estase a cargar...",
+  "loading_indicator.label": "Estase a cargar…",
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
   "mute_modal.duration": "Duración",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
   "onboarding.follows.lead": "Podes facer que a túa cronoloxía de inicio sexa como ti a queres. Canta máis xente sigas máis interesante será. Estes perfís poderían axudarche a comezar —sempre poderás deixar de seguilos despois!",
   "onboarding.follows.title": "Popular en Mastodon",
+  "onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
+  "onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
+  "onboarding.profile.display_name": "Nome público",
+  "onboarding.profile.display_name_hint": "O teu nome completo ou un nome divertido…",
+  "onboarding.profile.lead": "Sempre poderás incluír esta información mais tarde nos axustes, onde terás máis opcións dispoñibles.",
+  "onboarding.profile.note": "Acerca de ti",
+  "onboarding.profile.note_hint": "Podes @mencionar a outras persoas ou usar #cancelos…",
+  "onboarding.profile.save_and_continue": "Gardar e continuar",
+  "onboarding.profile.title": "Configuración do perfil",
+  "onboarding.profile.upload_avatar": "Subir imaxe do perfil",
+  "onboarding.profile.upload_header": "Subir cabeceira para o perfil",
   "onboarding.share.lead": "Fai que as persoas saiban como atoparte en Mastodon!",
   "onboarding.share.message": "Son {username} en #Mastodon! Ségueme en {url}",
   "onboarding.share.next_steps": "Seguintes pasos:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Sen listar",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
+  "recommended": "Aconsellable",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Estase a cargar…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publicacións coincidentes {x}",
   "search.search_or_paste": "Busca ou insire URL",
   "search_popout.full_text_search_disabled_message": "Non está dispoñible en {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Só dispoñible ao iniciar sesión.",
   "search_popout.language_code": "Código ISO do idioma",
   "search_popout.options": "Opcións de busca",
   "search_popout.quick_actions": "Accións rápidas",
@@ -672,7 +687,7 @@
   "status.translated_from_with": "Traducido do {lang} usando {provider}",
   "status.uncached_media_warning": "A vista previa non está dispoñíble",
   "status.unmute_conversation": "Deixar de silenciar conversa",
-  "status.unpin": "Desafixar do perfil",
+  "status.unpin": "Non fixar no perfil",
   "subscribed_languages.lead": "Ao facer cambios só as publicacións nos idiomas seleccionados aparecerán nas túas cronoloxías. Non elixas ningún para poder ver publicacións en tódolos idiomas.",
   "subscribed_languages.save": "Gardar cambios",
   "subscribed_languages.target": "Cambiar a subscrición a idiomas para {target}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 485e8313ad..dda92c5c9a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -21,6 +21,7 @@
   "account.blocked": "לחסום",
   "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
   "account.cancel_follow_request": "משיכת בקשת מעקב",
+  "account.copy": "להעתיק קישור לפרופיל",
   "account.direct": "הודעה פרטית אל @{name}",
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
   "account.domain_blocked": "הדומיין חסום",
@@ -30,7 +31,7 @@
   "account.featured_tags.last_status_at": "חצרוץ אחרון בתאריך {date}",
   "account.featured_tags.last_status_never": "אין חצרוצים",
   "account.featured_tags.title": "התגיות המועדפות של {name}",
-  "account.follow": "עקוב",
+  "account.follow": "לעקוב",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
   "conversation.with": "עם {names}",
+  "copy_icon_button.copied": "הועתק ללוח",
   "copypaste.copied": "הועתק",
   "copypaste.copy_to_clipboard": "העתקה ללוח הגזירים",
   "directory.federated": "מהפדרציה הידועה",
@@ -300,15 +302,15 @@
   "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{count} משתתפיםות}}",
   "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}} היום",
-  "hashtag.follow": "מעקב אחר תגית",
-  "hashtag.unfollow": "ביטול מעקב אחר תגית",
+  "hashtag.follow": "לעקוב אחרי תגית",
+  "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
   "home.actions.go_to_explore": "הצגת מגמות",
   "home.actions.go_to_suggestions": "למצוא א.נשים לעקוב אחריהן.ם",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.explore_prompt.body": "זרם הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת לעקיבה, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
+  "home.explore_prompt.body": "פיד הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת למעקב, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
   "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.",
   "home.hide_announcements": "הסתר הכרזות",
   "home.pending_critical_update.body": "יש לעדכן את תוכנת מסטודון בהקדם האפשרי!",
@@ -390,7 +392,7 @@
   "lists.search": "חיפוש בין אנשים שאני עוקב\\ת אחריהם",
   "lists.subheading": "הרשימות שלך",
   "load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
-  "loading_indicator.label": "טוען...",
+  "loading_indicator.label": "בטעינה…",
   "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
   "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
   "mute_modal.duration": "משך הזמן",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "למצער, תוצאות לחיפושך אינן בנמצא. ניתן להשתמש בחיפוש או בדף החקירות לשם מציאת אנשים ולעקבם. אפשר גם לנסות שוב אחר כך.",
   "onboarding.follows.lead": "אתם אוצרים את הזרם הבייתי שלכם. ככל שתעקבו אחרי יותר אנשים, הוא יהיה עשיר ופעיל יותר. הנה כמה פרופילים להתחיל בהם - תמיד ניתן להפסיק מעקב אחריהם בהמשך!",
   "onboarding.follows.title": "פופולארי על מסטודון",
+  "onboarding.profile.discoverable": "כלול את הפרופיל שלי בעמודת התגליות",
+  "onboarding.profile.discoverable_hint": "כשתבחרו להכלל ב\"תגליות\" על מסטודון, ההודעות שלכם עשויות להופיע בתוצאות חיפוש ועמודות \"נושאים חמים\", והפרופיל יוצע לאחרים עם תחומי עניין משותפים לכם.",
+  "onboarding.profile.display_name": "שם להצגה",
+  "onboarding.profile.display_name_hint": "שמך המלא או כינוי הכיף שלך…",
+  "onboarding.profile.lead": "תמיד ניתן להשלים זאת אחר כך בהגדרות, שם יש אפילו עוד אפשרויות להתאמה אישית.",
+  "onboarding.profile.note": "אודות",
+  "onboarding.profile.note_hint": "ניתן @לאזכר משתמשים אחרים או #תגיות…",
+  "onboarding.profile.save_and_continue": "לשמור ולהמשיך",
+  "onboarding.profile.title": "הגדרת פרופיל",
+  "onboarding.profile.upload_avatar": "העלאת תמונת פרופיל",
+  "onboarding.profile.upload_header": "העלאת כותרת פרופיל",
   "onboarding.share.lead": "כדאי להודיע לחברים היכן למצוא אותך במסטודון!",
   "onboarding.share.message": "אני {username} ברשת #מסטודון! בואו לעקוב אחרי בכתובת {url}",
   "onboarding.share.next_steps": "לאיפה להמשיך מכאן:",
@@ -518,10 +531,11 @@
   "privacy.private.short": "לעוקבים בלבד",
   "privacy.public.long": "גלוי לכל",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי גילוי",
+  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
   "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
+  "recommended": "מומלץ",
   "refresh": "רענון",
   "regeneration_indicator.label": "טוען…",
   "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "הודעות המכילות {x}",
   "search.search_or_paste": "חפש או הזן קישור",
   "search_popout.full_text_search_disabled_message": "בלתי זמין על {domain}.",
+  "search_popout.full_text_search_logged_out_message": "זמין רק לאחר כניסה לאתר.",
   "search_popout.language_code": "קוד ISO לשפה",
   "search_popout.options": "אפשרויות חיפוש",
   "search_popout.quick_actions": "פעולות זריזות",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 71694db76a..387941b5e4 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -360,7 +360,6 @@
   "lists.replies_policy.none": "कोई नहीं",
   "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.subheading": "आपकी सूचियाँ",
-  "loading_indicator.label": "लोड हो रहा है...",
   "mute_modal.duration": "अवधि",
   "mute_modal.hide_notifications": "इस सभ्य की ओरसे आनेवाली सूचनाए शांत करे",
   "mute_modal.indefinite": "अनिश्चितकालीन",
@@ -416,6 +415,8 @@
   "onboarding.compose.template": "नमस्कार #मस्टोडोन",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "अपना प्रोफाइल खोजने योग्य बनाएं",
+  "onboarding.profile.discoverable_hint": "जब आप मॅस्टोडॉन पर डिस्कवरेबिलिटी चुनते हैं तो आपके पोस्ट ट्रेंडिंग और सर्च में दिख सकते हैं और आपका प्रोफाइल आपके ही जैसे अकाउंट्स को सुझाया जा सकता है।",
   "onboarding.share.message": "मैं {username} मॅस्टोडॉन पर हूं! मुझे यहां {url} फॉलो करें",
   "onboarding.share.next_steps": "आगे कि संभवित विधि",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -442,6 +443,7 @@
   "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
   "privacy.unlisted.short": "अनलिस्टेड",
+  "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
   "relative_time.full.just_now": "अभी-अभी",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 16d25e7846..6da7d6cd8d 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -225,6 +225,7 @@
   "follow_request.authorize": "Autoriziraj",
   "follow_request.reject": "Odbij",
   "footer.about": "O aplikaciji",
+  "footer.directory": "Direktorij profila",
   "footer.get_app": "Preuzmi aplikaciju",
   "footer.invite": "Pozovi ljude",
   "footer.keyboard_shortcuts": "Tipkovni prečaci",
@@ -244,6 +245,7 @@
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
   "hashtag.follow": "Prati hashtag",
   "hashtag.unfollow": "Prestani pratiti hashtag",
+  "home.actions.go_to_explore": "Vidi trendove",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -306,11 +308,11 @@
   "lists.replies_policy.none": "Nitko",
   "lists.search": "Traži među praćenim ljudima",
   "lists.subheading": "Vaše liste",
-  "loading_indicator.label": "Učitavanje...",
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
   "mute_modal.duration": "Trajanje",
   "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
   "navigation_bar.about": "O aplikaciji",
+  "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
@@ -365,6 +367,7 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.upload_avatar": "Učitaj sliku profila",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
@@ -394,6 +397,7 @@
   "privacy.unlisted.short": "Neprikazano",
   "privacy_policy.last_updated": "Zadnje ažurirannje {date}",
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
+  "recommended": "Preporučeno",
   "refresh": "Osvježi",
   "regeneration_indicator.label": "Učitavanje…",
   "regeneration_indicator.sublabel": "Priprema se Vaša početna stranica!",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index ca20271619..9bef814178 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -21,6 +21,7 @@
   "account.blocked": "Letiltva",
   "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
   "account.cancel_follow_request": "Követési kérés visszavonása",
+  "account.copy": "Hivatkozás másolása a profilba",
   "account.direct": "@{name} személyes említése",
   "account.disable_notifications": "Ne figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.domain_blocked": "Letiltott domain",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
   "conversation.with": "Velük: {names}",
+  "copy_icon_button.copied": "A szöveg a vágólapra másolva",
   "copypaste.copied": "Másolva",
   "copypaste.copy_to_clipboard": "Másolás vágólapra",
   "directory.federated": "Az ismert fediverzumból",
@@ -390,7 +392,7 @@
   "lists.search": "Keresés a követett személyek között",
   "lists.subheading": "Saját listák",
   "load_pending": "{count, plural, one {# új elem} other {# új elem}}",
-  "loading_indicator.label": "Betöltés...",
+  "loading_indicator.label": "Betöltés…",
   "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
   "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
   "mute_modal.duration": "Időtartam",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.",
   "onboarding.follows.lead": "A saját hírfolyamod az elsődleges tapasztalás a Mastodonon. Minél több embert követsz, annál aktívabb és érdekesebb a dolog. Az induláshoz itt van néhány javaslat:",
   "onboarding.follows.title": "Népszerű a Mastodonon",
+  "onboarding.profile.discoverable": "Saját profil beállítása felfedezhetőként",
+  "onboarding.profile.discoverable_hint": "A Mastodonon a felfedezhetőség választása esetén a saját bejegyzéseid megjelenhetnek a keresési eredmények és a felkapott tartalmak között, valamint a profilod a hozzád hasonló érdeklődési körrel rendelkező embereknél is ajánlásra kerülhet.",
+  "onboarding.profile.display_name": "Megjelenített név",
+  "onboarding.profile.display_name_hint": "Teljes neved vagy vicces neved…",
+  "onboarding.profile.lead": "Ezt később bármikor befejezheted a beállításokban, ahol még több testreszabási lehetőség áll rendelkezésre.",
+  "onboarding.profile.note": "Bemutatkozás",
+  "onboarding.profile.note_hint": "Megemlíthetsz @másokat vagy #hashtag-eket…",
+  "onboarding.profile.save_and_continue": "Mentés és folytatás",
+  "onboarding.profile.title": "Profilbeállítás",
+  "onboarding.profile.upload_avatar": "Profilkép feltöltése",
+  "onboarding.profile.upload_header": "Profil fejléc feltöltése",
   "onboarding.share.lead": "Tudassuk az emberekkel, hogyan találhatnak meg a Mastodonon!",
   "onboarding.share.message": "{username} vagyok a #Mastodon hálózaton! Kövess itt: {url}.",
   "onboarding.share.next_steps": "Lehetséges következő lépések:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Listázatlan",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
+  "recommended": "Ajánlott",
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Betöltés…",
   "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Bejegyzések a következő keresésre: {x}",
   "search.search_or_paste": "Keresés vagy URL beillesztése",
   "search_popout.full_text_search_disabled_message": "Nem érhető el ezen: {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Csak bejelentkezve érhető el.",
   "search_popout.language_code": "ISO nyelvkód",
   "search_popout.options": "Keresési beállítások",
   "search_popout.quick_actions": "Gyors műveletek",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 776991b014..f2548c7d3a 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -314,7 +314,6 @@
   "lists.search": "Փնտրել քո հետեւած մարդկանց մէջ",
   "lists.subheading": "Քո ցանկերը",
   "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
-  "loading_indicator.label": "Բեռնւում է…",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "mute_modal.duration": "Տեւողութիւն",
   "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 76542cc52c..8ecf36125d 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -353,7 +353,6 @@
   "lists.search": "Cari di antara orang yang Anda ikuti",
   "lists.subheading": "Daftar Anda",
   "load_pending": "{count, plural, other {# item baru}}",
-  "loading_indicator.label": "Tunggu sebentar...",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
   "mute_modal.duration": "Durasi",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 201bebc05f..c24d28eea9 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -88,7 +88,6 @@
   "lists.delete": "Hichapụ ndepụta",
   "lists.edit": "Dezie ndepụta",
   "lists.subheading": "Ndepụta gị",
-  "loading_indicator.label": "Na-adọnye...",
   "navigation_bar.about": "Maka",
   "navigation_bar.bookmarks": "Ebenrụtụakā",
   "navigation_bar.domain_blocks": "Hidden domains",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index cfe1b43445..552debdb50 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -383,7 +383,6 @@
   "lists.search": "Trovez inter personi quon vu sequas",
   "lists.subheading": "Vua listi",
   "load_pending": "{count, plural, one {# nova kozo} other {# nova kozi}}",
-  "loading_indicator.label": "Kargante...",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
   "mute_modal.duration": "Durado",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 0b6a8012ad..0df1a5e753 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -21,6 +21,7 @@
   "account.blocked": "Útilokaður",
   "account.browse_more_on_origin_server": "Skoða nánari upplýsingar á notandasniðinu",
   "account.cancel_follow_request": "Taka fylgjendabeiðni til baka",
+  "account.copy": "Afrita tengil í notandasnið",
   "account.direct": "Einkaspjall við @{name}",
   "account.disable_notifications": "Hætta að láta mig vita þegar @{name} sendir inn",
   "account.domain_blocked": "Lén útilokað",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
   "conversation.with": "Við {names}",
+  "copy_icon_button.copied": "Afritað á klippispjald",
   "copypaste.copied": "Afritað",
   "copypaste.copy_to_clipboard": "Afrita á klippispjald",
   "directory.federated": "Frá samtengdum vefþjónum",
@@ -303,7 +305,7 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
-  "home.actions.go_to_explore": "Sjáðu hvað er í umræðunni",
+  "home.actions.go_to_explore": "Sjá hvað er í umræðunni",
   "home.actions.go_to_suggestions": "Finna fólk til að fylgjast með",
   "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
@@ -390,7 +392,7 @@
   "lists.search": "Leita meðal þeirra sem þú fylgist með",
   "lists.subheading": "Listarnir þínir",
   "load_pending": "{count, plural, one {# nýtt atriði} other {# ný atriði}}",
-  "loading_indicator.label": "Hleð inn...",
+  "loading_indicator.label": "Hleð inn…",
   "media_gallery.toggle_visible": "Víxla sýnileika",
   "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
   "mute_modal.duration": "Lengd",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Því miður er ekki hægt að birta neinar niðurstöður í augnablikinu. Þú getur reynt að nota leitina eða skoðað könnunarsíðuna til að finna fólk til að fylgjast með, nú eða prófað aftur síðar.",
   "onboarding.follows.lead": "Þú ræktar heimastreymið þitt. Því fleira fólki sem þú fylgist með, því virkara og áhugaverðara verður það. Að fylgjast með þessum notendum gæti verið ágætt til að byrja með - þú getur alltaf hætt að fylgjast með þeim síðar!",
   "onboarding.follows.title": "Vinsælt á Mastodon",
+  "onboarding.profile.discoverable": "Gera notandasniðið mitt uppgötvanlegt",
+  "onboarding.profile.discoverable_hint": "Þegar þú velur að hægt sé að uppgötva þig á Mastodon, munu færslurnar þínar birtast í leitarniðurstöðum og vinsældalistum, auk þess sem stungið verður upp á notandasniðinu þínu við fólk sem er með svipuð áhugamál og þú.",
+  "onboarding.profile.display_name": "Birtingarnafn",
+  "onboarding.profile.display_name_hint": "Fullt nafn þitt eða eitthvað til gamans…",
+  "onboarding.profile.lead": "Þú getur alltaf klárað þetta seinna í stillingunum, þar sem enn fleiri möguleikar bjóðast á sérsníðingum.",
+  "onboarding.profile.note": "Æviágrip",
+  "onboarding.profile.note_hint": "Þú getur @minnst á annað fólk eða #myllumerki…",
+  "onboarding.profile.save_and_continue": "Vista og halda áfram",
+  "onboarding.profile.title": "Uppsetning notandasniðs",
+  "onboarding.profile.upload_avatar": "Sendu inn auðkennismynd",
+  "onboarding.profile.upload_header": "Sendu inn bakgrunnsmynd í haus notandasniðs",
   "onboarding.share.lead": "Láttu fólk vita hvernig það getur fundið þig á Mastodon!",
   "onboarding.share.message": "Ég heiti {username} á #Mastodon! Þú getur fylgst með mér á {url}",
   "onboarding.share.next_steps": "Möguleg næstu skref:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Óskráð",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
+  "recommended": "Mælt með",
   "refresh": "Endurlesa",
   "regeneration_indicator.label": "Hleð inn…",
   "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Færslur sem samsvara {x}",
   "search.search_or_paste": "Leita eða líma slóð",
   "search_popout.full_text_search_disabled_message": "Ekki tiltækt á {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Aðeins tiltækt eftir innskráningu.",
   "search_popout.language_code": "ISO-kóði tungumáls",
   "search_popout.options": "Leitarvalkostir",
   "search_popout.quick_actions": "Flýtiaðgerðir",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4a2f41ce64..fa659506a1 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloccato",
   "account.browse_more_on_origin_server": "Sfoglia di più sul profilo originale",
   "account.cancel_follow_request": "Annulla la richiesta di seguire",
+  "account.copy": "Copia link del profilo",
   "account.direct": "Menziona privatamente @{name}",
   "account.disable_notifications": "Smetti di avvisarmi quando @{name} pubblica un post",
   "account.domain_blocked": "Dominio bloccato",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiato negli appunti",
   "copypaste.copied": "Copiato",
   "copypaste.copy_to_clipboard": "Copia negli Appunti",
   "directory.federated": "Da un fediverse noto",
@@ -252,7 +254,7 @@
   "explore.search_results": "Risultati della ricerca",
   "explore.suggested_follows": "Persone",
   "explore.title": "Esplora",
-  "explore.trending_links": "Novità",
+  "explore.trending_links": "Notizie",
   "explore.trending_statuses": "Post",
   "explore.trending_tags": "Hashtag",
   "filter_modal.added.context_mismatch_explanation": "La categoria di questo filtro non si applica al contesto in cui hai acceduto a questo post. Se desideri che il post sia filtrato anche in questo contesto, dovrai modificare il filtro.",
@@ -390,7 +392,7 @@
   "lists.search": "Cerca tra le persone che segui",
   "lists.subheading": "Le tue liste",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
-  "loading_indicator.label": "Caricamento...",
+  "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
   "mute_modal.duration": "Durata",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Sfortunatamente, nessun risultato può essere mostrato in questo momento. Puoi provare a utilizzare la ricerca o sfogliare la pagina di esplorazione per trovare persone da seguire, oppure riprova più tardi.",
   "onboarding.follows.lead": "La cronologia della tua home è gestita da te. Più persone segui, più attiva e interessante sarà. Questi profili possono essere un buon punto di partenza; puoi sempre smettere di seguirli in seguito!",
   "onboarding.follows.title": "Popolare su Mastodon",
+  "onboarding.profile.discoverable": "Rendi il mio profilo rilevabile",
+  "onboarding.profile.discoverable_hint": "Quando attivi la rilevabilità su Mastodon, i tuoi post potrebbero apparire nei risultati di ricerca e nelle tendenze e il tuo profilo potrebbe essere suggerito a persone con interessi simili ai tuoi.",
+  "onboarding.profile.display_name": "Nome da visualizzare",
+  "onboarding.profile.display_name_hint": "Il tuo nome completo o il tuo nome divertente…",
+  "onboarding.profile.lead": "Puoi sempre completarlo in un secondo momento nelle impostazioni, dove sono disponibili ancora più opzioni di personalizzazione.",
+  "onboarding.profile.note": "Biografia",
+  "onboarding.profile.note_hint": "Puoi @menzionare altre persone o #hashtags…",
+  "onboarding.profile.save_and_continue": "Salva e continua",
+  "onboarding.profile.title": "Configurazione del profilo",
+  "onboarding.profile.upload_avatar": "Carica l'immagine del profilo",
+  "onboarding.profile.upload_header": "Carica l'intestazione del profilo",
   "onboarding.share.lead": "Fai sapere alle persone come possono trovarti su Mastodon!",
   "onboarding.share.message": "Sono {username} su #Mastodon! Vieni a seguirmi su {url}",
   "onboarding.share.next_steps": "Possibili passaggi successivi:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Non elencato",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
+  "recommended": "Consigliato",
   "refresh": "Ricarica",
   "regeneration_indicator.label": "Caricamento…",
   "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Post corrispondenti a {x}",
   "search.search_or_paste": "Cerca o incolla URL",
   "search_popout.full_text_search_disabled_message": "Non disponibile in {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Disponibile solo dopo aver effettuato l'accesso.",
   "search_popout.language_code": "Codice ISO lingua",
   "search_popout.options": "Opzioni di ricerca",
   "search_popout.quick_actions": "Azioni rapide",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 4cd7228c8c..3cb0565d0e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -21,6 +21,7 @@
   "account.blocked": "ブロック済み",
   "account.browse_more_on_origin_server": "リモートで表示",
   "account.cancel_follow_request": "フォローリクエストの取り消し",
+  "account.copy": "プロフィールのリンクをコピーして下さい",
   "account.direct": "@{name}さんに非公開でメンション",
   "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
   "account.domain_blocked": "ドメインブロック中",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
   "conversation.with": "{names}",
+  "copy_icon_button.copied": "クリップボードにコピーされた",
   "copypaste.copied": "コピーしました",
   "copypaste.copy_to_clipboard": "クリップボードにコピー",
   "directory.federated": "既知の連合より",
@@ -390,7 +392,7 @@
   "lists.search": "フォローしている人の中から検索",
   "lists.subheading": "あなたのリスト",
   "load_pending": "{count}件の新着",
-  "loading_indicator.label": "読み込み中...",
+  "loading_indicator.label": "",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
   "mute_modal.duration": "ミュートする期間",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "表示できる結果はありません。検索やエクスプローラーを使ったり、ほかのアカウントをフォローしたり、後でもう一度試しください。",
   "onboarding.follows.lead": "ホームタイムラインはMastodonの軸足となる場所です。たくさんのユーザーをフォローすることで、ホームタイムラインはよりにぎやかでおもしろいものになります。手はじめに、おすすめのアカウントから何人かフォローしてみましょう:",
   "onboarding.follows.title": "ホームタイムラインを埋める",
+  "onboarding.profile.discoverable": "自分のプロフィールが発見できないようにする",
+  "onboarding.profile.discoverable_hint": "マストドンの見つけやすくする機能が個人情報を利用することに承諾すると、あなたの投稿が検索結果やトレンドに表示されることがあります。また、あなたのプロフィールがあなたと似た興味関心を持つ人に提案されることがあります。",
+  "onboarding.profile.display_name": "表示名",
+  "onboarding.profile.display_name_hint": "あなたのフルネーム、または楽しい名前…",
+  "onboarding.profile.lead": "このことは後でいつでも設定から完了させることが出来ますし、設定では更に多くのカスタマイズが利用可能になっています。",
+  "onboarding.profile.note": "自己紹介",
+  "onboarding.profile.note_hint": "@を使用して他の人々にメンションをすることができます。また#でハッシュタグが使用できます",
+  "onboarding.profile.save_and_continue": "保存してから続行して下さい",
+  "onboarding.profile.title": "プロフィールの設定",
+  "onboarding.profile.upload_avatar": "プロフィール画像をアップロードしてください",
+  "onboarding.profile.upload_header": "プロフィールのヘッダー画像をアップロードして下さい",
   "onboarding.share.lead": "新しいMastodonのアカウントをみんなに紹介しましょう。",
   "onboarding.share.message": "「{username}」で #Mastodon はじめました！ {url}",
   "onboarding.share.next_steps": "次のステップに進む:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "非収載",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
+  "recommended": "おすすめ",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 256aa93f4a..875ac3c195 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -165,7 +165,6 @@
   "lists.new.title_placeholder": "ახალი სიის სათაური",
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
-  "loading_indicator.label": "იტვირთება...",
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
   "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 8f9576c263..e9d4b57de8 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -274,7 +274,6 @@
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
   "lists.subheading": "Tibdarin-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
-  "loading_indicator.label": "Yessalay-d…",
   "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
   "mute_modal.duration": "Tanzagt",
   "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 6a4b2161b2..189d792e38 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -242,7 +242,6 @@
   "lists.search": "Сіз іздеген адамдар арасында іздеу",
   "lists.subheading": "Тізімдеріңіз",
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
-  "loading_indicator.label": "Жүктеу...",
   "media_gallery.toggle_visible": "Көрінуді қосу",
   "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "navigation_bar.blocks": "Бұғатталғандар",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 574d8e211b..46caf32b07 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -21,10 +21,11 @@
   "account.blocked": "차단함",
   "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
   "account.cancel_follow_request": "팔로우 취소",
+  "account.copy": "프로필 링크 복사",
   "account.direct": "@{name} 님에게 개인적으로 멘션",
   "account.disable_notifications": "@{name} 의 게시물 알림 끄기",
   "account.domain_blocked": "도메인 차단함",
-  "account.edit_profile": "프로필 수정",
+  "account.edit_profile": "프로필 편집",
   "account.enable_notifications": "@{name} 의 게시물 알림 켜기",
   "account.endorse": "프로필에 추천하기",
   "account.featured_tags.last_status_at": "{date}에 마지막으로 게시",
@@ -175,7 +176,7 @@
   "confirmations.domain_block.confirm": "도메인 전체를 차단",
   "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.edit.confirm": "수정",
-  "confirmations.edit.message": "지금 수정하면 작성 중인 메시지를 덮어쓰게 됩니다. 정말 진행합니까?",
+  "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.mute.confirm": "뮤트",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
   "conversation.with": "{names} 님과",
+  "copy_icon_button.copied": "클립보드에 복사됨",
   "copypaste.copied": "복사됨",
   "copypaste.copy_to_clipboard": "클립보드에 복사",
   "directory.federated": "알려진 연합우주로부터",
@@ -324,7 +326,7 @@
   "interaction_modal.no_account_yet": "Mastodon 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
-  "interaction_modal.sign_in": "이 서버에 로그인되어 있지 않습니다. 계정이 어디에 속해 있나요?",
+  "interaction_modal.sign_in": "이 서버에 로그인하지 않았습니다. 계정이 어디에 속해있습니까?",
   "interaction_modal.sign_in_hint": "팁: 여러분이 가입한 사이트입니다. 만약 기억이 나지 않는다면 가입환영 이메일을 찾아보는 것도 좋습니다. 전체 사용자이름(예: @mastodon@mastodon.social)을 넣어도 됩니다!",
   "interaction_modal.title.favourite": "{name} 님의 게시물을 좋아하기",
   "interaction_modal.title.follow": "{name} 님을 팔로우",
@@ -479,7 +481,18 @@
   "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 발견하기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
   "onboarding.follows.lead": "홈 피드는 마스토돈을 경험하는 주된 경로입니다. 더 많은 사람들을 팔로우 할수록 더 활발하고 흥미로워질 것입니다. 여기 시작을 위한 몇몇 추천을 드립니다:",
   "onboarding.follows.title": "내게 맞는 홈 피드 꾸미기",
-  "onboarding.share.lead": "여러 사람에게 마스토돈에서 나를 찾을 수 있는 방법을 알려주세요!",
+  "onboarding.profile.discoverable": "내 프로필을 발견 가능하도록 설정",
+  "onboarding.profile.discoverable_hint": "마스토돈의 발견하기 기능에 참여하면 게시물이 검색 결과와 유행 란에 표시될 수 있고, 비슷한 관심사를 가진 사람들에게 자신의 프로필이 추천될 수 있습니다.",
+  "onboarding.profile.display_name": "표시되는 이름",
+  "onboarding.profile.display_name_hint": "진짜 이름 또는 재미난 이름…",
+  "onboarding.profile.lead": "언제든지 나중에 설정 메뉴에서 마저 할 수 있고, 그곳에서 더 많은 맞춤 옵션을 고를 수 있습니다.",
+  "onboarding.profile.note": "자기소개",
+  "onboarding.profile.note_hint": "남을 @mention 하거나 #hashtag 태그를 달 수 있습니다…",
+  "onboarding.profile.save_and_continue": "저장 및 계속",
+  "onboarding.profile.title": "프로필 설정",
+  "onboarding.profile.upload_avatar": "프로필 사진 업로드",
+  "onboarding.profile.upload_header": "프로필 헤더 업로드",
+  "onboarding.share.lead": "여러 사람에게 마스토돈에서 나를 찾을 수 있는 방법을 알립니다!",
   "onboarding.share.message": "#마스토돈 이용하는 {username}입니다! {url} 에서 저를 팔로우 해보세요",
   "onboarding.share.next_steps": "할만한 다음 단계:",
   "onboarding.share.title": "프로필 공유하기",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "미등재",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
+  "recommended": "추천함",
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",
   "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!",
@@ -543,7 +557,7 @@
   "report.categories.other": "기타",
   "report.categories.spam": "스팸",
   "report.categories.violation": "콘텐츠가 한 개 이상의 서버 규칙을 위반합니다",
-  "report.category.subtitle": "가장 알맞은 것을 선택하세요",
+  "report.category.subtitle": "가장 알맞은 것을 선택",
   "report.category.title": "이 {type}에 무슨 문제가 있는지 알려주세요",
   "report.category.title_account": "프로필",
   "report.category.title_status": "게시물",
@@ -565,9 +579,9 @@
   "report.reasons.spam_description": "악성 링크, 반응 스팸, 또는 반복적인 답글",
   "report.reasons.violation": "서버 규칙을 위반합니다",
   "report.reasons.violation_description": "특정 규칙을 위반합니다",
-  "report.rules.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.rules.subtitle": "해당하는 사항을 모두 선택",
   "report.rules.title": "어떤 규칙을 위반했나요?",
-  "report.statuses.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.statuses.subtitle": "해당하는 사항을 모두 선택",
   "report.statuses.title": "이 신고에 대해서 더 참고해야 할 게시물이 있나요?",
   "report.submit": "신고하기",
   "report.target": "{target} 신고하기",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "{x}에 맞는 게시물",
   "search.search_or_paste": "검색하거나 URL 붙여넣기",
   "search_popout.full_text_search_disabled_message": "{domain}에서는 이용할 수 없습니다.",
+  "search_popout.full_text_search_logged_out_message": "로그인되어 있을 때만 할 수 있습니다.",
   "search_popout.language_code": "ISO 언어코드",
   "search_popout.options": "검색 옵션",
   "search_popout.quick_actions": "빠른 작업",
@@ -670,7 +685,7 @@
   "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부} other {{attachmentCount}개 첨부}}하여 게시",
   "status.translate": "번역",
   "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
-  "status.uncached_media_warning": "미리보기를 사용할 수 없습니다",
+  "status.uncached_media_warning": "마리보기 허용되지 않음",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
   "subscribed_languages.lead": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
@@ -696,7 +711,7 @@
   "upload_area.title": "드래그 & 드롭으로 업로드",
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
-  "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없어요.",
+  "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
   "upload_form.description_missing": "설명이 추가되지 않음",
@@ -704,12 +719,12 @@
   "upload_form.thumbnail": "썸네일 변경",
   "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
-  "upload_modal.analyzing_picture": "이미지 분석 중…",
+  "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
   "upload_modal.applying": "적용 중...",
   "upload_modal.choose_image": "이미지 선택",
   "upload_modal.description_placeholder": "다람쥐 헌 쳇바퀴 타고파",
-  "upload_modal.detect_text": "이미지에서 텍스트 추출",
+  "upload_modal.detect_text": "사진에서 문자 탐색",
   "upload_modal.edit_media": "미디어 수정",
   "upload_modal.hint": "미리보기를 클릭하거나 드래그 해서 포컬 포인트를 맞추세요. 이 점은 썸네일에 항상 보여질 부분을 나타냅니다.",
   "upload_modal.preparing_ocr": "OCR 준비 중…",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 8c9aaf3e8c..b940542677 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -339,7 +339,6 @@
   "lists.search": "Di navbera kesên ku te dişopînin bigere",
   "lists.subheading": "Lîsteyên te",
   "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
-  "loading_indicator.label": "Tê barkirin...",
   "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
   "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
   "mute_modal.duration": "Dem",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 6b46d82313..ca08ca836e 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -235,7 +235,6 @@
   "lists.search": "Hwilas yn-mysk tus a holyewgh",
   "lists.subheading": "Agas rolyow",
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
-  "loading_indicator.label": "Ow karga...",
   "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
   "mute_modal.duration": "Duryans",
   "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 5cdc575dee..a976d5907f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
   "about.contact": "Kontaktuoti:",
-  "about.disclaimer": "Mastodon – nemokama atvirojo šaltinio programa ir Mastodon gGmbH prekės ženklas.",
+  "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nežinoma",
   "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
   "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
@@ -21,40 +21,68 @@
   "account.blocked": "Užblokuota",
   "account.browse_more_on_origin_server": "Naršyti daugiau originaliame profilyje",
   "account.cancel_follow_request": "Atšaukti sekimą",
+  "account.copy": "Kopijuoti nuorodą į profilį",
   "account.direct": "Privačiai paminėti @{name}",
   "account.disable_notifications": "Nustoti man pranešti, kai @{name} paskelbia",
   "account.domain_blocked": "Užblokuotas domenas",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
+  "account.endorse": "Savybė profilyje",
   "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
+  "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
   "account.follow": "Sekti",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
   "account.followers_counter": "{count, plural, one {{counter} sekėjas (-a)} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Seka",
-  "account.follows.empty": "Šis naudotojas (-a) dar nieko neseka.",
+  "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
+  "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
   "account.follows_you": "Seka tave",
   "account.go_to_profile": "Eiti į profilį",
+  "account.hide_reblogs": "Slėpti \"boosts\" iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
+  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
   "account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
   "account.media": "Medija",
   "account.mention": "Paminėti @{name}",
   "account.moved_to": "{name} nurodė, kad dabar jų nauja paskyra yra:",
   "account.mute": "Užtildyti @{name}",
+  "account.mute_notifications_short": "Nutildyti pranešimus",
+  "account.mute_short": "Nutildyti",
   "account.muted": "Užtildytas",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Pranešti apie @{name}",
-  "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock_domain": "Unhide {domain}",
+  "account.no_bio": "Nėra pateikto aprašymo.",
+  "account.open_original_page": "Atidaryti originalinį tinklalapį",
+  "account.posts": "Įrašai",
+  "account.posts_with_replies": "Įrašai ir atsakymai",
+  "account.report": "Pranešti @{name}",
+  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą.",
+  "account.requested_follow": "{name} paprašė tave sekti",
+  "account.share": "Bendrinti @{name} profilį",
+  "account.show_reblogs": "Rodyti \"boosts\" iš @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
+  "account.unblock": "Atblokuoti @{name}",
+  "account.unblock_domain": "Atblokuoti domeną {domain}",
   "account.unblock_short": "Atblokuoti",
+  "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
+  "account.unmute": "Atitildyti @{name}",
+  "account.unmute_notifications_short": "Atitildyti pranešimus",
   "account.unmute_short": "Atitildyti",
-  "account_note.placeholder": "Click to add a note",
+  "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
+  "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
+  "admin.dashboard.monthly_retention": "Vartotojų išbuvimo rodiklis pagal mėnesį po registracijos",
+  "admin.dashboard.retention.average": "Vidurkis",
+  "admin.dashboard.retention.cohort": "Registravimo mėnuo",
+  "admin.dashboard.retention.cohort_size": "Nauji naudotojai",
+  "admin.impact_report.instance_accounts": "Paskyrų profiliai, kuriuos tai ištrintų",
+  "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
+  "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
+  "admin.impact_report.title": "Poveikio apibendrinimas",
+  "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Spartos ribojimas",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
@@ -65,40 +93,108 @@
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
-  "column.domain_blocks": "Hidden domains",
+  "bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
+  "bundle_column_error.network.title": "Tinklo klaida",
+  "bundle_column_error.retry": "Bandyti dar kartą",
+  "bundle_column_error.return": "Grįžti į pradžią",
+  "bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Uždaryti",
+  "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
+  "bundle_modal_error.retry": "Bandyti dar kartą",
+  "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
+  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą {domain}.",
+  "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
+  "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
+  "closed_registrations_modal.title": "Užsiregistravimas į Mastodon",
+  "column.about": "Apie",
+  "column.blocks": "Užblokuoti naudotojai",
+  "column.bookmarks": "Žymės",
+  "column.community": "Vietinė laiko skalė",
+  "column.direct": "Privatūs paminėjimai",
+  "column.directory": "Naršyti profilius",
+  "column.domain_blocks": "Užblokuoti domenai",
+  "column.favourites": "Mėgstamiausi",
+  "column.firehose": "Tiesioginiai padavimai",
+  "column.follow_requests": "Sekti prašymus",
+  "column.home": "Pradžia",
   "column.lists": "Sąrašai",
-  "column.mutes": "Užtildyti vartotojai",
-  "column.pins": "Pinned toot",
+  "column.mutes": "Užtildyti naudotojai",
+  "column.notifications": "Pranešimai",
+  "column.pins": "Prisegti įrašai",
+  "column.public": "Federacinė laiko skalė",
   "column_back_button.label": "Atgal",
   "column_header.hide_settings": "Slėpti nustatymus",
+  "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
+  "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
   "column_header.pin": "Prisegti",
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_subheading.settings": "Nustatymai",
+  "community.column_settings.local_only": "Tik vietinis",
   "community.column_settings.media_only": "Tik medija",
+  "community.column_settings.remote_only": "Tik nuotolinis",
   "compose.language.change": "Keisti kalbą",
   "compose.language.search": "Ieškoti kalbų...",
   "compose.published.body": "Įrašas paskelbtas.",
+  "compose.published.open": "Atidaryti",
+  "compose.saved.body": "Įrašas išsaugotas.",
+  "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijos kaip jautrios} other {Žymėti medijų kaip jautrių}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijos pažymėta kaip jautrios} other {Medijų pažymėtos kaip jautrios}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijos nepažymėta kaip jautri} other {Medijų nepažymėta kaip jautrios}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.lock_disclaimer": "Jūsų paskyra nėra {locked}. Kiekvienas gali jus sekti ir peržiūrėti tik sekėjams skirtus įrašus.",
+  "compose_form.lock_disclaimer.lock": "užrakinta",
+  "compose_form.placeholder": "Kas tavo mintyse?",
+  "compose_form.poll.add_option": "Pridėti pasirinkimą",
+  "compose_form.poll.duration": "Apklausos trukmė",
+  "compose_form.poll.option_placeholder": "Pasirinkimas {number}",
+  "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
+  "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.publish": "Skelbti",
+  "compose_form.publish_form": "Naujas įrašas",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Išsaugoti pakeitimus",
+  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+  "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
+  "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
+  "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+  "confirmation_modal.cancel": "Atšaukti",
+  "confirmations.block.block_and_report": "Blokuoti ir pranešti",
+  "confirmations.block.confirm": "Blokuoti",
+  "confirmations.block.message": "Ar tikrai nori užblokuoti {name}?",
+  "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
+  "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Ištrinti",
+  "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
   "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.edit.confirm": "Redaguoti",
+  "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
+  "confirmations.logout.confirm": "Atsijungti",
+  "confirmations.logout.message": "Ar tikrai nori atsijungti?",
+  "confirmations.mute.confirm": "Nutildyti",
+  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, tačiau jie vis tiek galės matyti tavo įrašus ir sekti.",
   "confirmations.reply.confirm": "Atsakyti",
-  "confirmations.reply.message": "Atsakydamas (-a) dabar perrašysi šiuo metu rašomą žinutę. Ar tikrai nori tęsti?",
+  "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.unfollow.confirm": "Nebesekti",
+  "conversation.mark_as_read": "Žymėti kaip skaitytą",
+  "conversation.open": "Peržiūrėti pokalbį",
+  "conversation.with": "Su {names}",
+  "copy_icon_button.copied": "Nukopijuota į iškarpinę",
+  "copypaste.copied": "Nukopijuota",
+  "copypaste.copy_to_clipboard": "Kopijuoti į iškarpinę",
+  "disabled_account_banner.account_settings": "Paskyros nustatymai",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Štai kaip tai atrodys:",
+  "emoji_button.objects": "Objektai",
   "emoji_button.search": "Paieška...",
   "empty_column.account_hides_collections": "Šis naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą",
   "empty_column.account_timeline": "No toots here!",
@@ -107,12 +203,64 @@
   "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "explore.title": "Naršyti",
+  "explore.trending_links": "Naujienos",
+  "explore.trending_statuses": "Įrašai",
+  "explore.trending_tags": "Saitažodžiai",
+  "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekste, kuriame peržiūrėjote šį pranešimą. Jei norite, kad pranešimas būtų filtruojamas ir šiame kontekste, turėsite redaguoti filtrą.",
+  "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas!",
+  "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti, kad ji būtų taikoma, turėsite pakeisti galiojimo datą.",
+  "filter_modal.added.expired_title": "Pasibaigė filtro galiojimo laikas!",
+  "filter_modal.added.review_and_configure": "Norėdami peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eikite į {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtro nuostatos",
+  "filter_modal.added.settings_link": "nustatymų puslapis",
+  "filter_modal.added.short_explanation": "Šis pranešimas buvo įtrauktas į šią filtro kategoriją: {title}.",
+  "filter_modal.added.title": "Pridėtas filtras!",
+  "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste",
+  "filter_modal.select_filter.expired": "nebegalioja",
+  "filter_modal.select_filter.prompt_new": "Nauja kategorija: {name}",
+  "filter_modal.select_filter.search": "Ieškoti arba sukurti",
+  "filter_modal.select_filter.subtitle": "Naudoti esamą kategoriją arba sukurti naują",
+  "filter_modal.select_filter.title": "Filtruoti šį įrašą",
+  "filter_modal.title.status": "Filtruoti šį įrašą",
+  "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
+  "firehose.remote": "Kiti serveriai",
+  "follow_request.authorize": "Autorizuoti",
+  "follow_request.reject": "Atmesti",
   "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
   "followed_tags": "Sekamos saitažodžiai",
   "footer.about": "Apie",
+  "footer.directory": "Profilių katalogas",
+  "footer.get_app": "Gauti programėlę",
   "footer.invite": "Kviesti žmones",
+  "footer.keyboard_shortcuts": "Spartieji klavišai",
+  "footer.privacy_policy": "Privatumo politika",
+  "footer.source_code": "Peržiūrėti šaltinio kodą",
+  "footer.status": "Būsena",
+  "generic.saved": "Išsaugoti",
+  "getting_started.heading": "Pradedant",
+  "hashtag.column_header.tag_mode.all": "ir {additional}",
+  "hashtag.column_header.tag_mode.any": "ar {additional}",
+  "hashtag.column_header.tag_mode.none": "be {additional}",
+  "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta",
+  "hashtag.column_settings.select.placeholder": "Įvesti grotažymes…",
+  "hashtag.column_settings.tag_mode.all": "Visi šie",
+  "hashtag.column_settings.tag_mode.any": "Bet kuris šių",
+  "hashtag.column_settings.tag_mode.none": "Nė vienas iš šių",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural,one {{counter} dalyvis}other {{counter} dalyviai}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}} šiandien",
+  "hashtag.follow": "Sekti grotažymę",
+  "hashtag.unfollow": "Nesekti grotažymės",
+  "hashtags.and_other": "…ir{count, plural,other {#daugiau}}",
+  "home.actions.go_to_explore": "Žiūrėti kas populiaru",
+  "home.actions.go_to_suggestions": "Rasti žmonių sekimui",
+  "home.column_settings.basic": "Pagrindinis",
+  "home.column_settings.show_reblogs": "Rodyti \"boosts\"",
+  "home.column_settings.show_replies": "Rodyti atsakymus",
+  "home.hide_announcements": "Slėpti skelbimus",
   "interaction_modal.no_account_yet": "Nesi Mastodon?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
@@ -151,9 +299,20 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Uždaryti",
+  "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
+  "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
+  "mute_modal.duration": "Trukmė",
+  "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Redaguoti profilį",
+  "navigation_bar.explore": "Naršyti",
+  "navigation_bar.favourites": "Mėgstamiausi",
+  "navigation_bar.filters": "Nutylėti žodžiai",
+  "navigation_bar.follow_requests": "Sekti prašymus",
+  "navigation_bar.followed_tags": "Sekti grotažymę",
   "navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
   "navigation_bar.lists": "Sąrašai",
   "navigation_bar.logout": "Atsijungti",
@@ -162,7 +321,16 @@
   "navigation_bar.personal": "Asmeninis",
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Nuostatos",
+  "navigation_bar.public_timeline": "Federuota laiko juosta",
+  "navigation_bar.search": "Ieškoti",
+  "navigation_bar.security": "Apsauga",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} pranešė.{target}",
+  "notification.admin.sign_up": "{name} užsiregistravo",
+  "notification.favourite": "{name} pamėgo jūsų įrašą",
+  "notification.follow": "{name} pradėjo jus sekti",
+  "notification.follow_request": "{name} nori tapti jūsų sekėju",
+  "notification.mention": "{name} paminėjo jus",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} boosted your status",
@@ -171,18 +339,67 @@
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
   "notifications.column_settings.admin.report": "Nauji ataskaitos:",
+  "notifications.column_settings.admin.sign_up": "Nauji prisiregistravimai:",
+  "notifications.column_settings.alert": "Darbalaukio pranešimai",
+  "notifications.column_settings.favourite": "Mėgstamiausi:",
+  "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
+  "notifications.column_settings.filter_bar.category": "Greito filtro juosta",
+  "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
+  "notifications.column_settings.follow": "Nauji sekėjai:",
+  "notifications.column_settings.follow_request": "Nauji prašymai sekti:",
+  "notifications.column_settings.mention": "Paminėjimai:",
+  "notifications.column_settings.poll": "Balsavimo rezultatai:",
+  "notifications.column_settings.push": "\"Push\" pranešimai",
+  "notifications.column_settings.reblog": "\"Boost\" kiekis:",
+  "notifications.column_settings.show": "Rodyti stulpelyje",
+  "notifications.column_settings.sound": "Paleisti garsą",
   "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.unread_notifications.category": "Neperskaityti pranešimai",
+  "notifications.column_settings.unread_notifications.highlight": "Paryškinti neperskaitytus pranešimus",
+  "notifications.column_settings.update": "Redagavimai:",
+  "notifications.filter.all": "Visi",
+  "notifications.filter.boosts": "\"Boost\" kiekis",
+  "notifications.filter.favourites": "Mėgstamiausi",
+  "notifications.filter.follows": "Sekimai",
   "notifications.filter.mentions": "Paminėjimai",
+  "notifications.filter.polls": "Balsavimo rezultatai",
+  "notifications.filter.statuses": "Atnaujinimai iš žmonių kuriuos sekate",
+  "notifications.grant_permission": "Suteikti leidimą.",
+  "notifications.group": "{count} pranešimai",
+  "notifications.mark_as_read": "Pažymėti kiekvieną pranešimą kaip perskaitytą",
+  "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos",
+  "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas",
+  "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nesuteiktas reikiamas leidimas.",
+  "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
+  "notifications_permission_banner.how_to_control": "Jei norite gauti pranešimus, kai \"Mastodon\" nėra atidarytas, įjunkite darbalaukio pranešimus. Įjungę darbalaukio pranešimus, galite tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudodamiesi pirmiau esančiu mygtuku {icon}.",
+  "onboarding.action.back": "Gražinkite mane atgal",
+  "onboarding.actions.back": "Gražinkite mane atgal",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.compose.template": "Sveiki #Mastodon!",
+  "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Galite pabandyti naudoti paiešką arba naršyti atradimo puslapyje, kad surastumėte žmonių, kuriuos norite sekti, arba pabandyti vėliau.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Padaryti mano profilį atrandamą",
+  "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir trendose, o profilis gali būti siūlomas panašių interesų turintiems žmonėms.",
+  "onboarding.profile.display_name": "Rodomas vardas",
+  "onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
+  "onboarding.profile.lead": "Gali visada tai užbaigti vėliau nustatymuose, kur yra dar daugiau pritaikymo parinkčių.",
+  "onboarding.profile.note": "Biografija",
+  "onboarding.profile.note_hint": "Gali @paminėti kitus žmones arba #saitažodžius…",
+  "onboarding.profile.save_and_continue": "Išsaugoti ir tęsti",
+  "onboarding.profile.title": "Profilio konfigūravimas",
+  "onboarding.profile.upload_avatar": "Įkelti profilio nuotrauką",
+  "onboarding.profile.upload_header": "Įkelti profilio antraštę",
+  "onboarding.share.lead": "Praneškite žmonėms, kaip jus rasti \"Mastodon\"!",
   "onboarding.share.message": "Aš {username} #Mastodon! Ateik sekti manęs adresu {url}",
+  "onboarding.share.next_steps": "Galimi kiti žingsniai:",
   "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės žiniasklaidos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Susikūrk savo pirmąjį įrašą",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -198,28 +415,109 @@
   "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
   "privacy.unlisted.short": "Neįtrauktas į sąrašą",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
-  "report.placeholder": "Type or paste additional comments",
-  "report.submit": "Submit report",
+  "recommended": "Rekomenduojama",
+  "relative_time.hours": "{number} val.",
+  "relative_time.just_now": "dabar",
+  "relative_time.minutes": "{number} min.",
+  "relative_time.seconds": "{number} sek.",
+  "relative_time.today": "šiandien",
+  "report.mute_explanation": "Jų įrašų nematysi. Jie vis tiek gali tave sekti ir matyti įrašus, bet nežinos, kad jie nutildyti.",
+  "report.next": "Tęsti",
+  "report.placeholder": "Papildomi komentarai",
+  "report.reasons.dislike": "Man tai nepatinka",
+  "report.reasons.dislike_description": "Tai nėra tai, ką nori matyti",
+  "report.reasons.legal": "Tai nelegalu",
+  "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
+  "report.reasons.other": "Tai kažkas kita",
+  "report.rules.subtitle": "Pasirink viską, kas tinka",
+  "report.rules.title": "Kokios taisyklės pažeidžiamos?",
+  "report.statuses.subtitle": "Pasirinkti viską, kas tinka",
+  "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį pranešimą?",
+  "report.submit": "Pateikti",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Čia pateikiamos galimybės kontroliuoti, ką matote \"Mastodon\":",
+  "report.thanks.take_action_actionable": "Kol tai peržiūrėsime, galite imtis veiksmų prieš @{name}:",
+  "report.thanks.title": "Nenorite to matyti?",
+  "report.thanks.title_actionable": "Ačiū, kad pranešėte, mes tai išnagrinėsime.",
+  "report.unfollow": "Nebesekti @{name}",
+  "report.unfollow_explanation": "Jūs sekate šią paskyrą. Norėdami nebematyti jų įrašų savo pagrindiniame kanale, panaikinkite jų sekimą.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "search.placeholder": "Paieška",
+  "search.search_or_paste": "Ieškok arba įklijuok URL",
+  "search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
+  "search_popout.language_code": "ISO kalbos kodas",
+  "search_popout.specific_date": "konkreti data",
+  "search_popout.user": "naudotojas",
+  "search_results.accounts": "Profiliai",
+  "search_results.all": "Visi",
+  "search_results.hashtags": "Saitažodžiai",
+  "search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
   "search_results.statuses": "Toots",
-  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.sign_in": "Prisijungimas",
+  "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.copy": "Copy link to status",
+  "status.copy": "Kopijuoti nuorodą į įrašą",
+  "status.delete": "Ištrinti",
+  "status.edit": "Redaguoti",
+  "status.edited": "Redaguota {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.hide": "Slėpti įrašą",
+  "status.load_more": "Pakrauti daugiau",
   "status.media.open": "Spausk, kad atidaryti",
-  "status.media.show": "Spausk, kad pamatyti",
+  "status.media.show": "Spausk, kad matyti",
   "status.media_hidden": "Paslėpta medija",
+  "status.mention": "Paminėti @{name}",
+  "status.more": "Daugiau",
   "status.open": "Expand this status",
-  "status.pinned": "Pinned toot",
+  "status.pin": "Prisegti prie profilio",
+  "status.pinned": "Prisegtas įrašas",
+  "status.read_more": "Skaityti daugiau",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.redraft": "Ištrinti ir iš naujo parengti juodraštį",
+  "status.reply": "Atsakyti",
+  "status.replyAll": "Atsakyti į giją",
+  "status.report": "Pranešti @{name}",
+  "status.sensitive_warning": "Jautrus turinys",
+  "status.share": "Bendrinti",
+  "status.show_filter_reason": "Rodyti vis tiek",
+  "status.show_less": "Rodyti mažiau",
+  "status.show_less_all": "Rodyti mažiau visiems",
+  "status.show_more": "Rodyti daugiau",
+  "status.show_more_all": "Rodyti daugiau visiems",
+  "status.show_original": "Rodyti originalą",
+  "status.title.with_attachments": "{user}{attachmentCount, plural, one {priedas} few {{attachmentCount} priedai} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
+  "status.translate": "Versti",
+  "status.translated_from_with": "Išversta iš {lang} naudojant {provider}",
   "status.uncached_media_warning": "Peržiūra nepasiekiama",
-  "timeline_hint.resources.statuses": "Older toots",
+  "tabs_bar.home": "Pradžia",
+  "tabs_bar.notifications": "Pranešimai",
+  "time_remaining.days": "Liko {number, plural, one {# diena} few {# dienos} many {# dieno} other {# dienų}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomas.",
+  "timeline_hint.resources.followers": "Sekėjai",
+  "timeline_hint.resources.follows": "Seka",
+  "timeline_hint.resources.statuses": "Senesni įrašai",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",
+  "units.short.thousand": "{count} tūkst.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "Nėra pridėto aprašymo",
+  "upload_form.edit": "Redaguoti",
+  "upload_form.undo": "Ištrinti",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.choose_image": "Pasirinkti vaizdą",
+  "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
   "upload_modal.edit_media": "Redaguoti mediją",
-  "upload_progress.label": "Uploading…"
+  "upload_progress.label": "Įkeliama...",
+  "upload_progress.processing": "Apdorojama…",
+  "username.taken": "Šis naudotojo vardas užimtas. Pabandyk kitą.",
+  "video.close": "Uždaryti vaizdo įrašą",
+  "video.download": "Atsisiųsti failą",
+  "video.exit_fullscreen": "Išeiti iš viso ekrano",
+  "video.fullscreen": "Visas ekranas",
+  "video.hide": "Slėpti vaizdo įrašą",
+  "video.mute": "Nutildyti garsą",
+  "video.play": "Leisti",
+  "video.unmute": "Atitildyti garsą"
 }
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 5d681b8291..63ec6275ba 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -390,7 +390,6 @@
   "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
-  "loading_indicator.label": "Ielādē...",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
   "mute_modal.duration": "Ilgums",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 6bf04ce758..b00cedc6fc 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -237,7 +237,6 @@
   "lists.replies_policy.none": "ആരുമില്ല",
   "lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
   "lists.subheading": "എന്റെ പട്ടികകൾ",
-  "loading_indicator.label": "ലോഡിംഗ്...",
   "mute_modal.duration": "കാലാവധി",
   "mute_modal.indefinite": "അനിശ്ചിതകാല",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index ef0efbdece..75b75375b7 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -196,7 +196,6 @@
   "lists.search": "तुम्ही फॉलो करत असलेल्या लोकांमध्ये शोधा",
   "lists.subheading": "तुमच्या याद्या",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "लोड करत आहे...",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.pins": "Pinned toots",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index a3bbd0067d..724e07ae76 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -386,7 +386,6 @@
   "lists.search": "Cari dalam kalangan orang yang anda ikuti",
   "lists.subheading": "Senarai anda",
   "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
-  "loading_indicator.label": "Memuatkan...",
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
   "mute_modal.duration": "Tempoh",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 103f4e0f8d..4078a4c066 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -389,7 +389,6 @@
   "lists.search": "မိမိဖောလိုးထားသူများမှရှာဖွေမည်",
   "lists.subheading": "သင့်၏စာရင်းများ",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
   "mute_modal.duration": "ကြာချိန်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 131d2e4aa0..295b420fd4 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -21,6 +21,7 @@
   "account.blocked": "Geblokkeerd",
   "account.browse_more_on_origin_server": "Zie meer op het originele profiel",
   "account.cancel_follow_request": "Ontvolgen",
+  "account.copy": "Link naar profiel kopiëren",
   "account.direct": "@{name} een privébericht sturen",
   "account.disable_notifications": "Geen melding meer geven wanneer @{name} een bericht plaatst",
   "account.domain_blocked": "Domein geblokkeerd",
@@ -142,7 +143,7 @@
   "compose_form.encryption_warning": "Berichten op Mastodon worden, net zoals op andere social media, niet end-to-end versleuteld. Deel daarom geen gevoelige informatie via Mastodon.",
   "compose_form.hashtag_warning": "Dit bericht valt niet onder een hashtag te bekijken, omdat deze niet openbaar is. Alleen openbare berichten kunnen via hashtags gevonden worden.",
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
-  "compose_form.lock_disclaimer.lock": "besloten",
+  "compose_form.lock_disclaimer.lock": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
   "compose_form.poll.add_option": "Keuze toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
   "conversation.with": "Met {names}",
+  "copy_icon_button.copied": "Gekopieerd naar klembord",
   "copypaste.copied": "Gekopieerd",
   "copypaste.copy_to_clipboard": "Naar klembord kopiëren",
   "directory.federated": "Fediverse (wat bekend is)",
@@ -380,7 +382,7 @@
   "lists.delete": "Lijst verwijderen",
   "lists.edit": "Lijst bewerken",
   "lists.edit.submit": "Titel veranderen",
-  "lists.exclusive": "Verberg deze berichten op je starttijdlijn",
+  "lists.exclusive": "Verberg lijstleden op je starttijdlijn",
   "lists.new.create": "Lijst toevoegen",
   "lists.new.title_placeholder": "Naam nieuwe lijst",
   "lists.replies_policy.followed": "Elke gevolgde gebruiker",
@@ -393,7 +395,7 @@
   "loading_indicator.label": "Laden…",
   "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
-  "mute_modal.duration": "Duur",
+  "mute_modal.duration": "Tijdsduur",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
   "mute_modal.indefinite": "Voor onbepaalde tijd",
   "navigation_bar.about": "Over",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
   "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het zal zijn. Om te beginnen, zijn hier enkele suggesties:",
   "onboarding.follows.title": "Je starttijdlijn aan jouw wensen aanpassen",
+  "onboarding.profile.discoverable": "Maak mijn profiel vindbaar",
+  "onboarding.profile.discoverable_hint": "Wanneer je akkoord gaat met het vindbaar zijn op Mastodon, verschijnen je berichten in zoekresultaten en kunnen ze trending worden, en je profiel kan aan andere mensen worden aanbevolen wanneer ze vergelijkbare interesses hebben.",
+  "onboarding.profile.display_name": "Weergavenaam",
+  "onboarding.profile.display_name_hint": "Jouw volledige naam of een leuke bijnaam…",
+  "onboarding.profile.lead": "Je kunt dit later altijd aanvullen in de instellingen, waar nog meer aanpassingsopties beschikbaar zijn.",
+  "onboarding.profile.note": "Biografie",
+  "onboarding.profile.note_hint": "Je kunt andere mensen @vermelden of #hashtags gebruiken…",
+  "onboarding.profile.save_and_continue": "Opslaan en doorgaan",
+  "onboarding.profile.title": "Profiel instellen",
+  "onboarding.profile.upload_avatar": "Profielfoto uploaden",
+  "onboarding.profile.upload_header": "Omslagfoto voor het profiel uploaden",
   "onboarding.share.lead": "Laat mensen weten hoe ze je kunnen vinden op Mastodon!",
   "onboarding.share.message": "Ik ben {username} op #Mastodon! Volg mij op {url}",
   "onboarding.share.next_steps": "Mogelijke volgende stappen:",
@@ -491,7 +504,7 @@
   "onboarding.steps.publish_status.body": "Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen {emoji}",
   "onboarding.steps.publish_status.title": "Maak je eerste bericht",
   "onboarding.steps.setup_profile.body": "Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.",
-  "onboarding.steps.setup_profile.title": "Pas je profiel aan",
+  "onboarding.steps.setup_profile.title": "Je profiel aanpassen",
   "onboarding.steps.share_profile.body": "Laat je vrienden weten waar je te vinden bent op Mastodon",
   "onboarding.steps.share_profile.title": "Deel je Mastodonprofiel",
   "onboarding.tips.2fa": "<strong>Wist je dat?</strong> Je kunt je account beveiligen door tweestapsverificatie in te stellen in je accountinstellingen. Het werkt met elke TOTP-app naar keuze, geen telefoonnummer nodig!",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
+  "recommended": "Aanbevolen",
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
   "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Berichten die overeenkomen met {x}",
   "search.search_or_paste": "Zoek of voer een URL in",
   "search_popout.full_text_search_disabled_message": "Niet beschikbaar op {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Alleen beschikbaar als je bent ingelogd.",
   "search_popout.language_code": "ISO-taalcode",
   "search_popout.options": "Zoekopties",
   "search_popout.quick_actions": "Snelle acties",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index aa30aef7d2..4750b1adc3 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Sjå gjennom meir på den opphavlege profilen",
   "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
+  "account.copy": "Kopier lenka til profilen",
   "account.direct": "Nevn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} skriv innlegg",
   "account.domain_blocked": "Domenet er sperra",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
   "conversation.with": "Med {names}",
+  "copy_icon_button.copied": "Kopiert til utklyppstavla",
   "copypaste.copied": "Kopiert",
   "copypaste.copy_to_clipboard": "Kopier til utklyppstavla",
   "directory.federated": "Frå den kjende allheimen",
@@ -390,7 +392,7 @@
   "lists.search": "Søk blant folk du fylgjer",
   "lists.subheading": "Listene dine",
   "load_pending": "{count, plural, one {# nytt element} other {# nye element}}",
-  "loading_indicator.label": "Lastar...",
+  "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
   "mute_modal.duration": "Varigheit",
@@ -479,6 +481,15 @@
   "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Synleg namn",
+  "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
+  "onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.",
+  "onboarding.profile.note": "Om meg",
+  "onboarding.profile.note_hint": "Du kan @nemna folk eller #emneknaggar…",
+  "onboarding.profile.save_and_continue": "Lagre og hald fram",
+  "onboarding.profile.title": "Profiloppsett",
+  "onboarding.profile.upload_avatar": "Last opp profilbilete",
+  "onboarding.profile.upload_header": "Last opp profiltoppbilete",
   "onboarding.share.lead": "La folk vita korleis dei kan finna deg på Mastodon!",
   "onboarding.share.message": "Eg er {username} på #Mastodon! Du kan fylgja meg på {url}",
   "onboarding.share.next_steps": "Dette kan du gjera no:",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 7421c780f5..1739d4aa31 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Bla mer på den opprinnelige profilen",
   "account.cancel_follow_request": "Avbryt følgeforespørselen",
+  "account.copy": "Kopier lenke til profil",
   "account.direct": "Nevn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} legger ut innlegg",
   "account.domain_blocked": "Domene blokkert",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marker som lest",
   "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
+  "copy_icon_button.copied": "Kopiert til utklippstavlen",
   "copypaste.copied": "Kopiert",
   "copypaste.copy_to_clipboard": "Kopier til utklippstavle",
   "directory.federated": "Fra det kjente strømiverset",
@@ -390,7 +392,7 @@
   "lists.search": "Søk blant personer du følger",
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural,one {# ny gjenstand} other {# nye gjenstander}}",
-  "loading_indicator.label": "Laster...",
+  "loading_indicator.label": "Laster…",
   "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
   "mute_modal.duration": "Varighet",
@@ -479,6 +481,15 @@
   "onboarding.follows.empty": "Dessverre kan ingen resultater vises akkurat nå. Du kan prøve å bruke søk eller bla gjennom utforske-siden for å finne folk å følge, eller prøve igjen senere.",
   "onboarding.follows.lead": "Hjem-skjermen din er den viktigste måten å oppleve Mastodon på. Jo flere du følger, jo mer aktiv og interessant blir det. For å komme i gang, er her noen forslag:",
   "onboarding.follows.title": "Populært på Mastodon",
+  "onboarding.profile.display_name": "Visningsnavn",
+  "onboarding.profile.display_name_hint": "Ditt fulle navn eller ditt morsomme navn…",
+  "onboarding.profile.lead": "Du kan alltid fullføre dette senere i innstillingene, der enda flere tilpasningsalternativer er tilgjengelige.",
+  "onboarding.profile.note": "Om meg",
+  "onboarding.profile.note_hint": "Du kan @nevne andre eller #emneknagger…",
+  "onboarding.profile.save_and_continue": "Lagre og fortsett",
+  "onboarding.profile.title": "Konfigurering av profil",
+  "onboarding.profile.upload_avatar": "Last opp profilbilde",
+  "onboarding.profile.upload_header": "Last opp profiltoppbilde",
   "onboarding.share.lead": "La folk vite hvordan de kan finne deg på Mastodon!",
   "onboarding.share.message": "Jeg er {username} på #Mastodon! Kom og følg meg på {url}",
   "onboarding.share.next_steps": "Mulige neste trinn:",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 6b82654500..3812057fb0 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -340,7 +340,6 @@
   "lists.search": "Cercar demest lo mond que seguètz",
   "lists.subheading": "Vòstras listas",
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
-  "loading_indicator.label": "Cargament…",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 371f9622d2..7faf279719 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -122,7 +122,6 @@
   "lightbox.next": "ਅਗਲੀ",
   "lightbox.previous": "ਪਿਛਲੀ",
   "lists.delete": "ਸੂਚੀ ਮਿਟਾਓ",
-  "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...",
   "mute_modal.duration": "ਮਿਆਦ",
   "navigation_bar.about": "ਸਾਡੇ ਬਾਰੇ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 643f78a884..dc77f8f4e0 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -21,6 +21,7 @@
   "account.blocked": "Zablokowany(-a)",
   "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu",
   "account.cancel_follow_request": "Wycofaj żądanie obserwowania",
+  "account.copy": "Skopiuj odnośnik do profilu",
   "account.direct": "Prywatna wzmianka @{name}",
   "account.disable_notifications": "Przestań powiadamiać mnie o wpisach @{name}",
   "account.domain_blocked": "Ukryto domenę",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
   "conversation.with": "Z {names}",
+  "copy_icon_button.copied": "Skopiowano do schowka",
   "copypaste.copied": "Skopiowano",
   "copypaste.copy_to_clipboard": "Skopiuj do schowka",
   "directory.federated": "Ze znanego fediwersum",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Niestety w tej chwili nie można przedstawić żadnych wyników. Możesz spróbować wyszukać lub przeglądać stronę, aby znaleźć osoby do śledzenia, lub spróbować ponownie później.",
   "onboarding.follows.lead": "Zarządasz swoim własnym kanałem. Im więcej ludzi śledzisz, tym bardziej aktywny i ciekawy będzie Twój kanał. Te profile mogą być dobrym punktem wyjścia— możesz przestać je obserwować w dowolnej chwili!",
   "onboarding.follows.title": "Popularne na Mastodonie",
+  "onboarding.profile.discoverable": "Spraw mój profil odkrywalnym",
+  "onboarding.profile.discoverable_hint": "Kiedy zapisujesz się do odkrywalności w Mastodonie, twoje wpisy mogą pokazywać się w wynikach wyszukiwania i trendach, a twój profil może być sugerowany użytkownikom o podobnych zainteresowaniach.",
+  "onboarding.profile.display_name": "Nazwa wyświetlana",
+  "onboarding.profile.display_name_hint": "Twoje imię lub pseudonim…",
+  "onboarding.profile.lead": "Możesz wypełnić te dane później w menu ustawień, gdzie dostępnych jest jeszcze więcej opcji.",
+  "onboarding.profile.note": "O mnie",
+  "onboarding.profile.note_hint": "Możesz @wspomnieć użytkowników albo #hasztagi…",
+  "onboarding.profile.save_and_continue": "Zapisz i kontynuuj",
+  "onboarding.profile.title": "Ustawienia profilu",
+  "onboarding.profile.upload_avatar": "Dodaj zdjęcie profilowe",
+  "onboarding.profile.upload_header": "Dodaj zdjęcie nagłówkowe",
   "onboarding.share.lead": "Daj znać ludziom, jak mogą cię znaleźć na Mastodonie!",
   "onboarding.share.message": "Jestem {username} na #Mastodon! Śledź mnie tutaj {url}",
   "onboarding.share.next_steps": "Możliwe dalsze kroki:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
+  "recommended": "Zalecane",
   "refresh": "Odśwież",
   "regeneration_indicator.label": "Ładuję…",
   "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Wpisy pasujące do {x}",
   "search.search_or_paste": "Wyszukaj lub wklej adres",
   "search_popout.full_text_search_disabled_message": "Niedostępne na {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dostępne tylko po zalogowaniu.",
   "search_popout.language_code": "Kod języka wg ISO",
   "search_popout.options": "Opcje wyszukiwania",
   "search_popout.quick_actions": "Szybkie akcje",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 9c09e2d719..e7975dd76e 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Veja mais no perfil original",
   "account.cancel_follow_request": "Cancelar solicitação para seguir",
+  "account.copy": "Copiar link do perfil",
   "account.direct": "Mencione em privado @{name}",
   "account.disable_notifications": "Cancelar notificações de @{name}",
   "account.domain_blocked": "Domínio bloqueado",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
+  "copy_icon_button.copied": "Copiado para a área de transferência",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
@@ -390,7 +392,7 @@
   "lists.search": "Procurar entre as pessoas que segue",
   "lists.subheading": "Suas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos items}}",
-  "loading_indicator.label": "Carregando...",
+  "loading_indicator.label": "Carregando…",
   "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
   "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
   "mute_modal.duration": "Duração",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Infelizmente, não é possível mostrar resultados agora. Você pode tentar usar a busca ou navegar na página de exploração para encontrar pessoas para seguir, ou tentar novamente mais tarde.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular no Mastodon",
+  "onboarding.profile.discoverable": "Tornar meu perfil descobrível",
+  "onboarding.profile.discoverable_hint": "Quando você aceita a capacidade de descoberta no Mastodon, suas postagens podem aparecer nos resultados de pesquisa e nas tendências, e seu perfil pode ser sugerido a pessoas com interesses similares aos seus.",
+  "onboarding.profile.display_name": "Nome de exibição",
+  "onboarding.profile.display_name_hint": "Seu nome completo ou apelido…",
+  "onboarding.profile.lead": "Você sempre pode completar isso mais tarde nas configurações, onde ainda mais opções de personalização estão disponíveis.",
+  "onboarding.profile.note": "Biografia",
+  "onboarding.profile.note_hint": "Você pode @mencionar outras pessoas ou usar #hashtags…",
+  "onboarding.profile.save_and_continue": "Salvar e continuar",
+  "onboarding.profile.title": "Configuração do perfil",
+  "onboarding.profile.upload_avatar": "Enviar imagem de perfil",
+  "onboarding.profile.upload_header": "Carregar cabeçalho do perfil",
   "onboarding.share.lead": "Deixe as pessoas saberem como elas podem te encontrar no Mastodon!",
   "onboarding.share.message": "Eu sou {username} no #Mastodon! Venha me seguir em {url}",
   "onboarding.share.next_steps": "Possíveis próximos passos:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Não-listado",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
+  "recommended": "Recomendado",
   "refresh": "Atualizar",
   "regeneration_indicator.label": "Carregando…",
   "regeneration_indicator.sublabel": "Sua página inicial está sendo preparada!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publicações correspondentes a {x}",
   "search.search_or_paste": "Buscar ou colar URL",
   "search_popout.full_text_search_disabled_message": "Não disponível em {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Disponível apenas quando conectado.",
   "search_popout.language_code": "Código ISO do idioma",
   "search_popout.options": "Opções de pesquisa",
   "search_popout.quick_actions": "Ações rápidas",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 988bec9b03..2d1616960a 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -21,6 +21,7 @@
   "account.blocked": "Bloqueado(a)",
   "account.browse_more_on_origin_server": "Encontrar mais no perfil original",
   "account.cancel_follow_request": "Retirar pedido para seguir",
+  "account.copy": "Copiar hiperligação para o perfil",
   "account.direct": "Mencionar @{name} em privado",
   "account.disable_notifications": "Parar de me notificar das publicações de @{name}",
   "account.domain_blocked": "Domínio bloqueado",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
+  "copy_icon_button.copied": "Copiado para a área de transferência",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
@@ -390,7 +392,7 @@
   "lists.search": "Pesquisa entre as pessoas que segues",
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
-  "loading_indicator.label": "A carregar...",
+  "loading_indicator.label": "A carregar…",
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
   "mute_modal.duration": "Duração",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Infelizmente, não é possível mostrar resultados neste momento. Pode tentar utilizar a pesquisa ou navegar na página \"Explorar\" para encontrar pessoas para seguir ou tentar novamente mais tarde.",
   "onboarding.follows.lead": "Você personaliza a sua própria página inicial. Quanto mais pessoas seguir, mais ativa e interessante ela será. Estes perfis podem ser um bom ponto de partida - pode sempre deixar de os seguir mais tarde!",
   "onboarding.follows.title": "Popular no Mastodon",
+  "onboarding.profile.discoverable": "Permitir que o meu perfil seja descoberto",
+  "onboarding.profile.discoverable_hint": "Quando opta pela possibilidade de ser descoberto no Mastodon, as suas mensagens podem aparecer nos resultados de pesquisa e nas tendências, e o seu perfil pode ser sugerido a pessoas com interesses semelhantes aos seus.",
+  "onboarding.profile.display_name": "Nome a apresentar",
+  "onboarding.profile.display_name_hint": "O seu nome completo ou o seu nome divertido…",
+  "onboarding.profile.lead": "Pode sempre completar isto mais tarde, nas configurações, onde ainda estão disponíveis mais opções de personalização.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "Pode @mencionar outras pessoas ou #hashtags…",
+  "onboarding.profile.save_and_continue": "Guardar e continuar",
+  "onboarding.profile.title": "Configuração do perfil",
+  "onboarding.profile.upload_avatar": "Carregar foto de perfil",
+  "onboarding.profile.upload_header": "Carregar cabeçalho do perfil",
   "onboarding.share.lead": "Deixe as pessoas saber como o podem encontrar no Mastodon!",
   "onboarding.share.message": "Eu sou {username} no #Mastodon! Venha seguir-me em {url}",
   "onboarding.share.next_steps": "Próximos passos possíveis:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Não listar",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
+  "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "A carregar…",
   "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Publicações com correspondência a {x}",
   "search.search_or_paste": "Pesquisar ou introduzir URL",
   "search_popout.full_text_search_disabled_message": "Não disponível em {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Apenas disponível quando tem sessão iniciada.",
   "search_popout.language_code": "Código ISO do idioma",
   "search_popout.options": "Opções de pesquisa",
   "search_popout.quick_actions": "Ações rápidas",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index f0e84463b2..5355f9935a 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -353,7 +353,6 @@
   "lists.search": "Caută printre persoanele la care ești abonat",
   "lists.subheading": "Listele tale",
   "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
-  "loading_indicator.label": "Se încarcă...",
   "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
   "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
   "mute_modal.duration": "Durata",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 69db89dc86..f0c48236b9 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -21,6 +21,7 @@
   "account.blocked": "Заблокировано",
   "account.browse_more_on_origin_server": "Посмотреть в оригинальном профиле",
   "account.cancel_follow_request": "Отозвать запрос на подписку",
+  "account.copy": "Скопировать ссылку на профиль",
   "account.direct": "Лично упоминать @{name}",
   "account.disable_notifications": "Не уведомлять о постах от @{name}",
   "account.domain_blocked": "Домен заблокирован",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
   "conversation.with": "С {names}",
+  "copy_icon_button.copied": "Скопировано в буфер обмена",
   "copypaste.copied": "Скопировано",
   "copypaste.copy_to_clipboard": "Копировать в буфер обмена",
   "directory.federated": "Со всей федерации",
@@ -222,6 +224,7 @@
   "emoji_button.search_results": "Результаты поиска",
   "emoji_button.symbols": "Символы",
   "emoji_button.travel": "Путешествия и места",
+  "empty_column.account_hides_collections": "Данный пользователь решил не предоставлять эту информацию",
   "empty_column.account_suspended": "Учетная запись заблокирована",
   "empty_column.account_timeline": "Здесь нет постов!",
   "empty_column.account_unavailable": "Профиль недоступен",
@@ -389,7 +392,7 @@
   "lists.search": "Искать среди подписок",
   "lists.subheading": "Ваши списки",
   "load_pending": "{count, plural, one {# новый элемент} few {# новых элемента} other {# новых элементов}}",
-  "loading_indicator.label": "Загрузка...",
+  "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
   "mute_modal.duration": "Продолжительность",
@@ -478,6 +481,17 @@
   "onboarding.follows.empty": "К сожалению, сейчас нет результатов. Вы можете попробовать использовать поиск или просмотреть страницу \"Исследования\", чтобы найти людей, за которыми можно следить, или повторить попытку позже.",
   "onboarding.follows.lead": "Вы сами формируете свою домашнюю ленту. Чем больше людей, за которыми вы следите, тем активнее и интереснее она будет. Эти профили могут быть хорошей отправной точкой - вы всегда можете от них отказаться!",
   "onboarding.follows.title": "Популярно на Mastodon",
+  "onboarding.profile.discoverable": "Сделать мой профиль открытым",
+  "onboarding.profile.discoverable_hint": "Если вы соглашаетесь на открытость на Mastodon, ваши сообщения могут появляться в результатах поиска и трендах, а ваш профиль может быть предложен людям со схожими с вами интересами.",
+  "onboarding.profile.display_name": "Отображаемое имя",
+  "onboarding.profile.display_name_hint": "Ваше полное имя или псевдоним…",
+  "onboarding.profile.lead": "Вы всегда можете завершить это позже в настройках, где доступны еще более широкие возможности настройки.",
+  "onboarding.profile.note": "О себе",
+  "onboarding.profile.note_hint": "Вы можете @упоминать других людей или использовать #хэштеги…",
+  "onboarding.profile.save_and_continue": "Сохранить и продолжить",
+  "onboarding.profile.title": "Настройка профиля",
+  "onboarding.profile.upload_avatar": "Загрузить фотографию профиля",
+  "onboarding.profile.upload_header": "Загрузить заголовок профиля",
   "onboarding.share.lead": "Расскажите людям, как они могут найти вас на Mastodon!",
   "onboarding.share.message": "Я {username} на #Mastodon! Следуйте за мной по адресу {url}",
   "onboarding.share.next_steps": "Возможные дальнейшие шаги:",
@@ -521,6 +535,7 @@
   "privacy.unlisted.short": "Скрытый",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
+  "recommended": "Рекомендуется",
   "refresh": "Обновить",
   "regeneration_indicator.label": "Загрузка…",
   "regeneration_indicator.sublabel": "Один момент, мы подготавливаем вашу ленту!",
@@ -591,6 +606,7 @@
   "search.quick_action.status_search": "Посты, соответствующие {x}",
   "search.search_or_paste": "Поиск (или вставьте URL)",
   "search_popout.full_text_search_disabled_message": "Недоступно на {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Доступно только при авторизации.",
   "search_popout.language_code": "Код языка по стандарту ISO",
   "search_popout.options": "Параметры поиска",
   "search_popout.quick_actions": "Быстрые действия",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index cb92914e50..59379343b9 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -345,7 +345,6 @@
   "lists.search": "त्वया अनुसारितजनेषु अन्विष्य",
   "lists.subheading": "तव सूचयः",
   "load_pending": "{count, plural, one {# नूतनवस्तु} other {# नूतनवस्तूनि}}",
-  "loading_indicator.label": "आरोपयति...",
   "media_gallery.toggle_visible": "{number, plural, one {चित्रं प्रच्छादय} other {चित्राणि प्रच्छादय}}",
   "moved_to_account_banner.text": "तव एकौण्ट् {disabledAccount} अधुना निष्कृतो यतोहि {movedToAccount} अस्मिन्त्वमसार्षीः।",
   "mute_modal.duration": "परिमाणम्",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 4528e161b6..59c834b950 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -263,7 +263,6 @@
   "lists.search": "Chirca intre sa gente chi ses sighende",
   "lists.subheading": "Is listas tuas",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
-  "loading_indicator.label": "Carrighende...",
   "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 9b8e6a215f..28dac9c2a2 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -330,7 +330,6 @@
   "lists.search": "Seirch amang the fowk ye ken",
   "lists.subheading": "Yer lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loadin...",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
   "mute_modal.duration": "Lenth",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 7b26a9b488..835f699b82 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -261,7 +261,6 @@
   "lists.replies_policy.none": "කිසිවෙක් නැත",
   "lists.replies_policy.title": "පිළිතුරු පෙන්වන්න:",
   "lists.subheading": "ඔබගේ ලැයිස්තු",
-  "loading_indicator.label": "පූරණය වෙමින්...",
   "mute_modal.duration": "පරාසය",
   "mute_modal.hide_notifications": "මෙම පුද්ගලයාගේ දැනුම්දීම් සඟවන්නද?",
   "navigation_bar.about": "පිළිබඳව",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index f2616b31c4..9115695d87 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokovaný/á",
   "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
   "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
+  "account.copy": "Skopíruj odkaz pre profil",
   "account.direct": "Spomeň @{name} súkromne",
   "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky",
   "account.domain_blocked": "Doména skrytá",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Označ za prečítané",
   "conversation.open": "Ukáž konverzáciu",
   "conversation.with": "S {names}",
+  "copy_icon_button.copied": "Skopírovaný do schránky",
   "copypaste.copied": "Skopírované",
   "copypaste.copy_to_clipboard": "Skopíruj do schránky",
   "directory.federated": "Zo známého fedivesmíru",
@@ -389,7 +391,6 @@
   "lists.search": "Vyhľadávaj medzi užívateľmi, ktorých sleduješ",
   "lists.subheading": "Tvoje zoznamy",
   "load_pending": "{count, plural, one {# nová položka} other {# nových položiek}}",
-  "loading_indicator.label": "Načítam...",
   "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
   "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.duration": "Trvanie",
@@ -478,6 +479,7 @@
   "onboarding.follows.empty": "Žiaľ, momentálne sa nedajú zobraziť žiadne výsledky. Môžete skúsiť použiť vyhľadávanie alebo navštíviť stránku objavovania a nájsť ľudí, ktorých chcete sledovať, alebo to skúste znova neskôr.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Urob môj profil objaviteľný",
   "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
   "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
   "onboarding.share.next_steps": "Ďalšie možné kroky:",
@@ -521,6 +523,7 @@
   "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
+  "recommended": "Odporúčané",
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítava sa…",
   "regeneration_indicator.sublabel": "Tvoja domovská nástenka sa pripravuje!",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index f16a91d65a..4ef2681f9a 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokirano",
   "account.browse_more_on_origin_server": "Brskaj več po izvirnem profilu",
   "account.cancel_follow_request": "Umakni zahtevo za sledenje",
+  "account.copy": "Kopiraj povezavo do profila",
   "account.direct": "Zasebno omeni @{name}",
   "account.disable_notifications": "Ne obveščaj me več, ko ima @{name} novo objavo",
   "account.domain_blocked": "Blokirana domena",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Označi kot prebrano",
   "conversation.open": "Pokaži pogovor",
   "conversation.with": "Z {names}",
+  "copy_icon_button.copied": "Kopirano v odložišče",
   "copypaste.copied": "Kopirano",
   "copypaste.copy_to_clipboard": "Kopiraj na odložišče",
   "directory.federated": "Iz znanega fediverzuma",
@@ -390,7 +392,7 @@
   "lists.search": "Iščite med ljudmi, katerim sledite",
   "lists.subheading": "Vaši seznami",
   "load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}",
-  "loading_indicator.label": "Nalaganje ...",
+  "loading_indicator.label": "Nalaganje …",
   "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
   "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
   "mute_modal.duration": "Trajanje",
@@ -479,6 +481,17 @@
   "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.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Priljubljeno na Mastodonu",
+  "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.",
+  "onboarding.profile.display_name": "Pojavno ime",
+  "onboarding.profile.display_name_hint": "Vaše polno ime ali lažno ime ...",
+  "onboarding.profile.lead": "To lahko vedno dokončate med nastavitvami, kjer je na voljo še več možnosti prilagajanja.",
+  "onboarding.profile.note": "Biografija",
+  "onboarding.profile.note_hint": "Druge osebe lahko @omenite ali #ključite ...",
+  "onboarding.profile.save_and_continue": "Shrani in nadaljuj",
+  "onboarding.profile.title": "Nastavitev profila",
+  "onboarding.profile.upload_avatar": "Naloži sliko profila",
+  "onboarding.profile.upload_header": "Naloži glavo profila",
   "onboarding.share.lead": "Povejte vsem, kako vas lahko najdejo na Mastodonu!",
   "onboarding.share.message": "Sem {username} na #Mastodon! Sledite mi na {url}",
   "onboarding.share.next_steps": "Možni naslednji koraki:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Ni prikazano",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
+  "recommended": "Priporočeno",
   "refresh": "Osveži",
   "regeneration_indicator.label": "Nalaganje …",
   "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Objave, ki se ujemajo z {x}",
   "search.search_or_paste": "Iščite ali prilepite URL",
   "search_popout.full_text_search_disabled_message": "Ni dostopno na {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Na voljo le, če ste prijavljeni.",
   "search_popout.language_code": "Koda ISO jezika",
   "search_popout.options": "Možnosti iskanja",
   "search_popout.quick_actions": "Hitra dejanja",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 8d54ef41b1..86042a91e5 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -21,6 +21,7 @@
   "account.blocked": "E bllokuar",
   "account.browse_more_on_origin_server": "Shfletoni më tepër rreth profilit origjinal",
   "account.cancel_follow_request": "Tërhiq mbrapsht kërkesë për ndjekje",
+  "account.copy": "Kopjoje lidhjen te profili",
   "account.direct": "Përmendje private për @{name}",
   "account.disable_notifications": "Resht së njoftuari mua, kur poston @{name}",
   "account.domain_blocked": "Përkatësia u bllokua",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
   "conversation.with": "Me {names}",
+  "copy_icon_button.copied": "U kopjua në të papastër",
   "copypaste.copied": "U kopjua",
   "copypaste.copy_to_clipboard": "Kopjoje në të papastër",
   "directory.federated": "Nga fedivers i njohur",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Mjerisht, s’mund të shfaqen përfundime tani. Mund të provoni të përdorni kërkimin, ose të shfletoni faqen e eksplorimit, që të gjeni persona për ndjekje, ose të riprovoni më vonë.",
   "onboarding.follows.lead": "Ju kujdeseni për prurjen tuaj. Sa më tepër persona të tjerë të ndiqni, aq më aktive dhe interesante do të bëhet ajo. Këto profile mund të jenë një pikënisje e mirë—mundeni përherë të ndërpritni ndjekjen e tyre më vonë!",
   "onboarding.follows.title": "Popullore në Mastodon",
+  "onboarding.profile.discoverable": "Bëje profilin tim të zbulueshëm",
+  "onboarding.profile.discoverable_hint": "Kur zgjidhni të jeni i zbulueshëm në Mastodon, postimet tuaja mund të shfaqen në përfundime kërkimesh dhe gjëra në modë dhe profili juaj mund t’u sugjerohet njerëzve me interesa të ngjashme me ju.",
+  "onboarding.profile.display_name": "Emër në ekran",
+  "onboarding.profile.display_name_hint": "Emri juaj i plotë, ose ç’të doni…",
+  "onboarding.profile.lead": "Këtë mund ta plotësoni përherë më vonë, te rregullimet, ku ka edhe më tepër mundësi përshtatjeje.",
+  "onboarding.profile.note": "Jetëshkrim",
+  "onboarding.profile.note_hint": "Mund të @përmendni persona të tjerë, ose #hashtagë…",
+  "onboarding.profile.save_and_continue": "Ruaje dhe vazhdo",
+  "onboarding.profile.title": "Udjisje profili",
+  "onboarding.profile.upload_avatar": "Ngarkoni foto profili",
+  "onboarding.profile.upload_header": "Ngarkoni krye profili",
   "onboarding.share.lead": "Bëjuni të ditur njerëzve se si mund t’ju gjejnë në Mastodon!",
   "onboarding.share.message": "Jam {username} në #Mastodon! Ejani dhe ndiqmëni te {url}",
   "onboarding.share.next_steps": "Hapa pasues të mundshëm:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Jo në lista",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
+  "recommended": "E rekomanduar",
   "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",
   "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index aa948b1f0e..35bb8f9929 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokiran",
   "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
   "account.cancel_follow_request": "Povuci zahtev za praćenje",
+  "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno pomeni @{name}",
   "account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
   "account.domain_blocked": "Domen je blokiran",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
   "conversation.with": "Sa {names}",
+  "copy_icon_button.copied": "Kopirano",
   "copypaste.copied": "Kopirano",
   "copypaste.copy_to_clipboard": "Kopiraj",
   "directory.federated": "Sa znanog fediverzuma",
@@ -390,7 +392,7 @@
   "lists.search": "Pretraži među ljudima koje pratite",
   "lists.subheading": "Vaše liste",
   "load_pending": "{count, plural, one {# nova stavka} few {# nove stavke} other {# novih stavki}}",
-  "loading_indicator.label": "Učitavanje...",
+  "loading_indicator.label": "Učitavanje…",
   "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
   "mute_modal.duration": "Trajanje",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Nažalost, trenutno se ne mogu prikazati rezultati. Možete pokušati sa korišćenjem pretrage ili pregledanjem stranice za istraživanje da biste pronašli ljude koje ćete pratiti ili pokušajte ponovo kasnije.",
   "onboarding.follows.lead": "Vi sami birate svoju početnu stranicu. Što više ljudi pratite, to će biti aktivnije i zanimljivije. Ovi profili mogu biti dobra polazna tačka—uvek možete da ih prestanete pratiti kasnije!",
   "onboarding.follows.title": "Personalizujte svoju početnu stranicu",
+  "onboarding.profile.discoverable": "Neka se moj profil može otkriti drugima",
+  "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
+  "onboarding.profile.display_name": "Ime za prikaz",
+  "onboarding.profile.display_name_hint": "Vaše puno ime ili nadimak…",
+  "onboarding.profile.lead": "Ovo možete uvek dovršiti kasnije u podešavanjima, gde je dostupno još više opcija prilagođavanja.",
+  "onboarding.profile.note": "Biografija",
+  "onboarding.profile.note_hint": "Možete da @pomenete druge ljude ili #heš oznake…",
+  "onboarding.profile.save_and_continue": "Sačuvaj i nastavi",
+  "onboarding.profile.title": "Podešavanje profila",
+  "onboarding.profile.upload_avatar": "Otpremi sliku profila",
+  "onboarding.profile.upload_header": "Otpremi zaglavlje profila",
   "onboarding.share.lead": "Neka ljudi znaju kako mogu da vas pronađu na Mastodon-u!",
   "onboarding.share.message": "Ja sam {username} na #Mastodon-u! Pratite me na {url}",
   "onboarding.share.next_steps": "Mogući sledeći koraci:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Neizlistano",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
+  "recommended": "Preporučeno",
   "refresh": "Osveži",
   "regeneration_indicator.label": "Učitavanje…",
   "regeneration_indicator.sublabel": "Vaša početna stranica se priprema!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Podudaranje objava {x}",
   "search.search_or_paste": "Pretražite ili unesite adresu",
   "search_popout.full_text_search_disabled_message": "Nije dostupno na {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dostupno samo kada ste prijavljeni.",
   "search_popout.language_code": "ISO kod jezika",
   "search_popout.options": "Opcije pretrage",
   "search_popout.quick_actions": "Brze radnje",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 9e67169272..552c04d13f 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -21,6 +21,7 @@
   "account.blocked": "Блокиран",
   "account.browse_more_on_origin_server": "Прегледајте још на оригиналном профилу",
   "account.cancel_follow_request": "Откажи праћење",
+  "account.copy": "Копирај везу у профил",
   "account.direct": "Приватно помени @{name}",
   "account.disable_notifications": "Заустави обавештавање за објаве корисника @{name}",
   "account.domain_blocked": "Домен је блокиран",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Означи као прочитано",
   "conversation.open": "Прикажи разговор",
   "conversation.with": "Са {names}",
+  "copy_icon_button.copied": "Копирано",
   "copypaste.copied": "Копирано",
   "copypaste.copy_to_clipboard": "Копирај",
   "directory.federated": "Са знаног федиверзума",
@@ -390,7 +392,7 @@
   "lists.search": "Претражи међу људима које пратите",
   "lists.subheading": "Ваше листе",
   "load_pending": "{count, plural, one {# нова ставка} few {# нове ставке} other {# нових ставки}}",
-  "loading_indicator.label": "Учитавање...",
+  "loading_indicator.label": "Учитавање…",
   "media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
   "moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
   "mute_modal.duration": "Трајање",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Нажалост, тренутно се не могу приказати резултати. Можете покушати са коришћењем претраге или прегледањем странице за истраживање да бисте пронашли људе које ћете пратити или покушајте поново касније.",
   "onboarding.follows.lead": "Ваша почетна страница је примарни начин да доживите Mastodon. Што више људи будете пратили, то ће бити активније и занимљивије. Да бисте започели, ево неколико предлога:",
   "onboarding.follows.title": "Персонализујте своју почетну страницу",
+  "onboarding.profile.discoverable": "Нека се мој профил може открити другима",
+  "onboarding.profile.discoverable_hint": "Када омогућите могућност откривања на Mastodon-у, ваше објаве се могу појавити у резултатима претраге и у тренду, а ваш профил може бити предложен људима са сличним интересовањима.",
+  "onboarding.profile.display_name": "Име за приказ",
+  "onboarding.profile.display_name_hint": "Ваше пуно име или надимак…",
+  "onboarding.profile.lead": "Ово можете увек довршити касније у подешавањима, где је доступно још више опција прилагођавања.",
+  "onboarding.profile.note": "Биографија",
+  "onboarding.profile.note_hint": "Можете да @поменете друге људе или #хеш ознаке…",
+  "onboarding.profile.save_and_continue": "Сачувај и настави",
+  "onboarding.profile.title": "Подешавање профила",
+  "onboarding.profile.upload_avatar": "Отпреми слику профила",
+  "onboarding.profile.upload_header": "Отпреми заглавље профила",
   "onboarding.share.lead": "Нека људи знају како могу да вас пронађу на Mastodon-у!",
   "onboarding.share.message": "Ја сам {username} на #Mastodon-у! Пратите ме на {url}",
   "onboarding.share.next_steps": "Могући следећи кораци:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Неизлистано",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
+  "recommended": "Препоручено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Учитавање…",
   "regeneration_indicator.sublabel": "Ваша почетна страница се припрема!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Подударање објава {x}",
   "search.search_or_paste": "Претражите или унесите адресу",
   "search_popout.full_text_search_disabled_message": "Није доступно на {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Доступно само када сте пријављени.",
   "search_popout.language_code": "ISO код језика",
   "search_popout.options": "Опције претраге",
   "search_popout.quick_actions": "Брзе радње",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index edf981e112..8a07da72d8 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blockerad",
   "account.browse_more_on_origin_server": "Läs mer på den ursprungliga profilen",
   "account.cancel_follow_request": "Återkalla din begäran om att få följa",
+  "account.copy": "Kopiera länk till profil",
   "account.direct": "Nämn @{name} privat",
   "account.disable_notifications": "Sluta notifiera mig när @{name} gör inlägg",
   "account.domain_blocked": "Domän blockerad",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Markera som läst",
   "conversation.open": "Visa konversation",
   "conversation.with": "Med {names}",
+  "copy_icon_button.copied": "Kopierad till urklipp",
   "copypaste.copied": "Kopierad",
   "copypaste.copy_to_clipboard": "Kopiera till urklipp",
   "directory.federated": "Från känt fediversum",
@@ -390,7 +392,7 @@
   "lists.search": "Sök bland personer du följer",
   "lists.subheading": "Dina listor",
   "load_pending": "{count, plural, one {# nytt objekt} other {# nya objekt}}",
-  "loading_indicator.label": "Laddar...",
+  "loading_indicator.label": "Laddar…",
   "media_gallery.toggle_visible": "Växla synlighet",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
   "mute_modal.duration": "Varaktighet",
@@ -479,6 +481,15 @@
   "onboarding.follows.empty": "Tyvärr kan inga resultat visas just nu. Du kan prova att använda sökfunktionen eller utforska sidan för att hitta personer att följa, eller försök igen senare.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Gör min profil upptäckbar",
+  "onboarding.profile.discoverable_hint": "När du väljer att vara upptäckbar på Mastodon kan dina inlägg visas i sök- och trendresultat, och din profil kan föreslås för personer med liknande intressen som du.",
+  "onboarding.profile.display_name": "Visningsnamn",
+  "onboarding.profile.display_name_hint": "Fullständigt namn eller ditt roliga namn…",
+  "onboarding.profile.lead": "Du kan alltid slutföra detta senare i inställningarna, där ännu fler anpassningsalternativ finns tillgängliga.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "Du kan @nämna andra personer eller #hashtags…",
+  "onboarding.profile.save_and_continue": "Spara och fortsätt",
+  "onboarding.profile.upload_avatar": "Ladda upp profilbild",
   "onboarding.share.lead": "Låt folk veta hur de kan hitta dig på Mastodon!",
   "onboarding.share.message": "Jag är {username} på #Mastodon! Följ mig på {url}",
   "onboarding.share.next_steps": "Möjliga nästa steg:",
@@ -522,6 +533,7 @@
   "privacy.unlisted.short": "Olistad",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
+  "recommended": "Rekommenderas",
   "refresh": "Läs om",
   "regeneration_indicator.label": "Laddar…",
   "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!",
@@ -592,6 +604,7 @@
   "search.quick_action.status_search": "Inlägg som matchar {x}",
   "search.search_or_paste": "Sök eller klistra in URL",
   "search_popout.full_text_search_disabled_message": "Inte tillgänglig på {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Endast tillgängligt när du är inloggad.",
   "search_popout.language_code": "ISO språkkod",
   "search_popout.options": "Sökalternativ",
   "search_popout.quick_actions": "Snabbåtgärder",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index f62088f626..ce9042e62b 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -248,7 +248,6 @@
   "lists.search": "நீங்கள் பின்தொடரும் நபர்கள் மத்தியில் தேடுதல்",
   "lists.subheading": "உங்கள் பட்டியல்கள்",
   "load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
-  "loading_indicator.label": "ஏற்றுதல்...",
   "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
   "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 6cf735991f..f21c0ef57a 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -180,7 +180,6 @@
   "lists.new.title_placeholder": "కొత్త జాబితా శీర్షిక",
   "lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
   "lists.subheading": "మీ జాబితాలు",
-  "loading_indicator.label": "లోడ్ అవుతోంది...",
   "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
   "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 80f862cbe0..c020dc3625 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -21,6 +21,7 @@
   "account.blocked": "ปิดกั้นอยู่",
   "account.browse_more_on_origin_server": "เรียกดูเพิ่มเติมในโปรไฟล์ดั้งเดิม",
   "account.cancel_follow_request": "ยกเลิกการติดตาม",
+  "account.copy": "คัดลอกลิงก์ไปยังโปรไฟล์",
   "account.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "account.disable_notifications": "หยุดแจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
   "conversation.open": "ดูการสนทนา",
   "conversation.with": "กับ {names}",
+  "copy_icon_button.copied": "คัดลอกไปยังคลิปบอร์ดแล้ว",
   "copypaste.copied": "คัดลอกแล้ว",
   "copypaste.copy_to_clipboard": "คัดลอกไปยังคลิปบอร์ด",
   "directory.federated": "จากจักรวาลสหพันธ์ที่รู้จัก",
@@ -390,7 +392,7 @@
   "lists.search": "ค้นหาในหมู่ผู้คนที่คุณติดตาม",
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
-  "loading_indicator.label": "กำลังโหลด...",
+  "loading_indicator.label": "กำลังโหลด…",
   "media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
   "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
   "mute_modal.duration": "ระยะเวลา",
@@ -479,11 +481,22 @@
   "onboarding.follows.empty": "น่าเสียดาย ไม่สามารถแสดงผลลัพธ์ได้ในตอนนี้ คุณสามารถลองใช้การค้นหาหรือเรียกดูหน้าสำรวจเพื่อค้นหาผู้คนที่จะติดตาม หรือลองอีกครั้งในภายหลัง",
   "onboarding.follows.lead": "ฟีดหน้าแรกของคุณเป็นวิธีหลักในการสัมผัส Mastodon ยิ่งคุณติดตามผู้คนมากเท่าไร ฟีดหน้าแรกก็จะยิ่งมีการใช้งานและน่าสนใจมากขึ้นเท่านั้น เพื่อช่วยให้คุณเริ่มต้นใช้งาน นี่คือข้อเสนอแนะบางส่วน:",
   "onboarding.follows.title": "ปรับแต่งฟีดหน้าแรกของคุณ",
+  "onboarding.profile.discoverable": "ทำให้โปรไฟล์ของฉันสามารถค้นพบได้",
+  "onboarding.profile.discoverable_hint": "เมื่อคุณเลือกรับความสามารถในการค้นพบใน Mastodon โพสต์ของคุณอาจปรากฏในผลลัพธ์การค้นหาและกำลังนิยม และอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้คนที่มีความสนใจคล้ายกับคุณ",
+  "onboarding.profile.display_name": "ชื่อที่แสดง",
+  "onboarding.profile.display_name_hint": "ชื่อเต็มของคุณหรือชื่อแบบสนุกสนานของคุณ…",
+  "onboarding.profile.lead": "คุณสามารถทำสิ่งนี้ให้เสร็จสมบูรณ์ในภายหลังได้เสมอในการตั้งค่า ที่ซึ่งตัวเลือกการปรับแต่งเพิ่มเติมพร้อมใช้งาน",
+  "onboarding.profile.note": "ชีวประวัติ",
+  "onboarding.profile.note_hint": "คุณสามารถ @กล่าวถึง ผู้คนอื่น ๆ หรือ #แฮชแท็ก…",
+  "onboarding.profile.save_and_continue": "บันทึกและดำเนินการต่อ",
+  "onboarding.profile.title": "การตั้งค่าโปรไฟล์",
+  "onboarding.profile.upload_avatar": "อัปโหลดรูปภาพโปรไฟล์",
+  "onboarding.profile.upload_header": "อัปโหลดส่วนหัวโปรไฟล์",
   "onboarding.share.lead": "แจ้งให้ผู้คนทราบวิธีที่เขาสามารถค้นหาคุณใน Mastodon!",
   "onboarding.share.message": "ฉันคือ {username} ใน #Mastodon! มาติดตามฉันที่ {url}",
   "onboarding.share.next_steps": "ขั้นตอนถัดไปที่เป็นไปได้:",
   "onboarding.share.title": "แบ่งปันโปรไฟล์ของคุณ",
-  "onboarding.start.lead": "ตอนนี้คุณเป็นส่วนหนึ่งของ Mastodon แพลตฟอร์มสื่อสังคมที่มีเอกลักษณ์ กระจายศูนย์ ที่ซึ่งคุณ—ไม่ใช่อัลกอริทึม—เรียบเรียงประสบการณ์ของคุณเอง มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:",
+  "onboarding.start.lead": "ตอนนี้คุณเป็นส่วนหนึ่งของ Mastodon แพลตฟอร์มสื่อสังคมที่มีเอกลักษณ์เฉพาะตัว กระจายศูนย์ ที่ซึ่งคุณ—ไม่ใช่อัลกอริทึม—เรียบเรียงประสบการณ์ของคุณเอง มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:",
   "onboarding.start.skip": "ไม่ต้องการความช่วยเหลือในการเริ่มต้นใช้งาน?",
   "onboarding.start.title": "คุณทำสำเร็จแล้ว!",
   "onboarding.steps.follow_people.body": "การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
+  "recommended": "แนะนำ",
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
   "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "โพสต์ที่ตรงกับ {x}",
   "search.search_or_paste": "ค้นหาหรือวาง URL",
   "search_popout.full_text_search_disabled_message": "ไม่พร้อมใช้งานใน {domain}",
+  "search_popout.full_text_search_logged_out_message": "พร้อมใช้งานเฉพาะเมื่อเข้าสู่ระบบแล้วเท่านั้น",
   "search_popout.language_code": "รหัสภาษา ISO",
   "search_popout.options": "ตัวเลือกการค้นหา",
   "search_popout.quick_actions": "การกระทำด่วน",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 9ad2594930..8eb09bb7cb 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -21,6 +21,7 @@
   "account.blocked": "Engellendi",
   "account.browse_more_on_origin_server": "Orijinal profilde daha fazlasına göz atın",
   "account.cancel_follow_request": "Takip isteğini geri çek",
+  "account.copy": "Gönderi bağlantısını kopyala",
   "account.direct": "@{name} kullanıcısına özelden değin",
   "account.disable_notifications": "@{name} kişisinin gönderi bildirimlerini kapat",
   "account.domain_blocked": "Alan adı engellendi",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Okundu olarak işaretle",
   "conversation.open": "Sohbeti görüntüle",
   "conversation.with": "{names} ile",
+  "copy_icon_button.copied": "Panoya kopyalandı",
   "copypaste.copied": "Kopyalandı",
   "copypaste.copy_to_clipboard": "Panoya kopyala",
   "directory.federated": "Bilinen fediverse'lerden",
@@ -390,7 +392,7 @@
   "lists.search": "Takip ettiğiniz kişiler arasından arayın",
   "lists.subheading": "Listeleriniz",
   "load_pending": "{count, plural, one {# yeni öğe} other {# yeni öğe}}",
-  "loading_indicator.label": "Yükleniyor...",
+  "loading_indicator.label": "Yükleniyor…",
   "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
   "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
   "mute_modal.duration": "Süre",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Maalesef şu an bir sonuç gösterilemiyor. Takip edilecek kişileri bulmak için arama veya keşfet sayfasına gözatmayı kullanabilirsiniz veya daha sonra tekrar deneyin.",
   "onboarding.follows.lead": "Kendi ana akışınızı siz düzenliyorsunuz. Siz daha fazla insanı takip ettikçe, daha etkin ve ilgi çekici olacaktır. Bu profiller iyi bir başlangıç olabilir, isterseniz izlemeyi daha sonra bırakabilirsiniz:",
   "onboarding.follows.title": "Mastodon'da Popüler",
+  "onboarding.profile.discoverable": "Profilimi keşfedilebilir yap",
+  "onboarding.profile.discoverable_hint": "Mastodon'da keşfedilebilirliği etkinleştirdiğinizde, gönderileriniz arama sonuçlarında ve trendlerde görünebilir aynı zamanda profiliniz sizinle benzer ilgi alanlarına sahip kişilere önerilebilir.",
+  "onboarding.profile.display_name": "Görünen isim",
+  "onboarding.profile.display_name_hint": "Tam adınız veya kullanıcı adınız…",
+  "onboarding.profile.lead": "Bunu her zaman daha sonra ayarlardan tamamlayabilirsiniz, hatta daha fazla özelleştirme seçeneğine de ulaşabilirsiniz.",
+  "onboarding.profile.note": "Kişisel bilgiler",
+  "onboarding.profile.note_hint": "Diğer insanlara @değinebilir veya #etiketler kullanabilirsiniz…",
+  "onboarding.profile.save_and_continue": "Kaydet ve ilerle",
+  "onboarding.profile.title": "Profilini ayarla",
+  "onboarding.profile.upload_avatar": "Profil resmi yükle",
+  "onboarding.profile.upload_header": "Profil başlığı yükle",
   "onboarding.share.lead": "Kullanıcılara Mastodon'da size nasıl ulaşabileceklerini ifade edin!",
   "onboarding.share.message": "#Mastodon'da kullanıcı adım {username}! Beni takip etmek için {url} bağlantısını kullanın",
   "onboarding.share.next_steps": "Olası sonraki adımlar:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Listelenmemiş",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
+  "recommended": "Önerilen",
   "refresh": "Yenile",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Eşleşen gönderiler {x}",
   "search.search_or_paste": "Ara veya bağlantıyı yapıştır",
   "search_popout.full_text_search_disabled_message": "{domain} sunucusunda mevcut değil.",
+  "search_popout.full_text_search_logged_out_message": "Sadece oturum açıldığında mevcuttur.",
   "search_popout.language_code": "ISO dil kodu",
   "search_popout.options": "Arama seçenekleri",
   "search_popout.quick_actions": "Hızlı eylemler",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index e84bc66cc5..6727f3e59a 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -314,7 +314,6 @@
   "lists.replies_policy.none": "Һичкем",
   "lists.subheading": "Исемлегегегезләр",
   "load_pending": "{count, plural, one {# яңа элемент} other {# яңа элемент}}",
-  "loading_indicator.label": "Йөкләү...",
   "mute_modal.duration": "Дәвамлык",
   "mute_modal.indefinite": "Билгесез",
   "navigation_bar.about": "Проект турында",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 09fa58fbf9..58a14c0ed2 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -21,6 +21,7 @@
   "account.blocked": "Заблоковані",
   "account.browse_more_on_origin_server": "Переглянути більше в оригінальному профілі",
   "account.cancel_follow_request": "Відкликати запит на стеження",
+  "account.copy": "Копіювати посилання на профіль",
   "account.direct": "Особиста згадка @{name}",
   "account.disable_notifications": "Не повідомляти мене про дописи @{name}",
   "account.domain_blocked": "Домен заблоковано",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
   "conversation.with": "З {names}",
+  "copy_icon_button.copied": "Скопійовано до буфера обміну",
   "copypaste.copied": "Скопійовано",
   "copypaste.copy_to_clipboard": "Копіювати до буфера обміну",
   "directory.federated": "З відомого федесвіту",
@@ -390,7 +392,7 @@
   "lists.search": "Шукати серед людей, на яких ви підписані",
   "lists.subheading": "Ваші списки",
   "load_pending": "{count, plural, one {# новий елемент} other {# нових елементів}}",
-  "loading_indicator.label": "Завантаження...",
+  "loading_indicator.label": "Завантаження…",
   "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
   "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
   "mute_modal.duration": "Тривалість",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "На жаль, жоден результат не може бути показаний просто зараз. Ви можете спробувати скористатися пошуком або переглядом сторінки огляду, щоб знайти людей для слідкування або повторіть спробу пізніше.",
   "onboarding.follows.lead": "Ваша домашня стрічка - основний спосіб роботи Mastodon. Чим більше людей, які ви підписані, тим активнішою і цікавою. Ось деякі пропозиції на початок:",
   "onboarding.follows.title": "Персоналізуйте домашню стрічку",
+  "onboarding.profile.discoverable": "Зробити мій профіль видимим",
+  "onboarding.profile.discoverable_hint": "Якщо ви погоджуєтеся на видимість у Mastodon, ваші дописи можуть з'являтися в результатах пошуку і трендах, і ваш профіль може бути запропоновано людям зі схожими з вашими інтересами.",
+  "onboarding.profile.display_name": "Видиме ім'я",
+  "onboarding.profile.display_name_hint": "Ваше повне ім'я або ваш псевдонім…",
+  "onboarding.profile.lead": "Ви завжди можете завершити це пізніше в Налаштуваннях, де доступно ще більше опцій налаштування.",
+  "onboarding.profile.note": "Біографія",
+  "onboarding.profile.note_hint": "Ви можете @згадувати інших людей або #гештеґи…",
+  "onboarding.profile.save_and_continue": "Зберегти і продовжити",
+  "onboarding.profile.title": "Налаштування профілю",
+  "onboarding.profile.upload_avatar": "Завантажити зображення профілю",
+  "onboarding.profile.upload_header": "Завантажити заголовок профілю",
   "onboarding.share.lead": "Розкажіть людям про те, як вони можуть знайти вас на Mastodon!",
   "onboarding.share.message": "Я {username} на #Mastodon! Стежте за мною на {url}",
   "onboarding.share.next_steps": "Можливі такі кроки:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Прихований",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
+  "recommended": "Рекомендовано",
   "refresh": "Оновити",
   "regeneration_indicator.label": "Завантаження…",
   "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Збіг дописів {x}",
   "search.search_or_paste": "Введіть адресу або пошуковий запит",
   "search_popout.full_text_search_disabled_message": "Недоступно на {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Доступно лише після входу.",
   "search_popout.language_code": "Код мови ISO",
   "search_popout.options": "Опції пошуку",
   "search_popout.quick_actions": "Швидкі дії",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index afb4c4c4c2..026cc115c1 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -325,7 +325,6 @@
   "lists.search": "Siz kuzatadigan odamlar orasidan qidiring",
   "lists.subheading": "Sizning ro'yxatlaringiz",
   "load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}",
-  "loading_indicator.label": "Yuklanmoqda...",
   "media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}",
   "moved_to_account_banner.text": "{movedToAccount} hisobiga koʻchganingiz uchun {disabledAccount} hisobingiz hozirda oʻchirib qoʻyilgan.",
   "mute_modal.duration": "Davomiyligi",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index aa229eceb8..9ac90b407e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -21,6 +21,7 @@
   "account.blocked": "Đã chặn",
   "account.browse_more_on_origin_server": "Truy cập trang của người này",
   "account.cancel_follow_request": "Thu hồi yêu cầu theo dõi",
+  "account.copy": "Sao chép địa chỉ",
   "account.direct": "Nhắn riêng @{name}",
   "account.disable_notifications": "Tắt thông báo khi @{name} đăng tút",
   "account.domain_blocked": "Tên miền đã chặn",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
   "conversation.with": "Với {names}",
+  "copy_icon_button.copied": "Đã sao chép vào bộ nhớ tạm",
   "copypaste.copied": "Đã sao chép",
   "copypaste.copy_to_clipboard": "Sao chép vào bộ nhớ tạm",
   "directory.federated": "Từ mạng liên hợp",
@@ -390,7 +392,7 @@
   "lists.search": "Tìm kiếm những người mà bạn quan tâm",
   "lists.subheading": "Danh sách của bạn",
   "load_pending": "{count, plural, one {# tút mới} other {# tút mới}}",
-  "loading_indicator.label": "Đang tải...",
+  "loading_indicator.label": "Đang tải…",
   "media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
   "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
   "mute_modal.duration": "Thời hạn",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "Không có kết quả có thể được hiển thị lúc này. Bạn có thể thử sử dụng tính năng tìm kiếm hoặc duyệt qua trang khám phá để tìm những người theo dõi hoặc thử lại sau.",
   "onboarding.follows.lead": "Bạn quản lý bảng tin của riêng bạn. Bạn càng theo dõi nhiều người, nó sẽ càng sôi động và thú vị. Để bắt đầu, đây là vài gợi ý:",
   "onboarding.follows.title": "Thịnh hành trên Mastodon",
+  "onboarding.profile.discoverable": "Bật khám phá cho hồ sơ của tôi",
+  "onboarding.profile.discoverable_hint": "Khi bạn bật khám phá trên Mastodon, các tút của bạn có thể xuất hiện trong kết quả tìm kiếm và xu hướng, đồng thời hồ sơ của bạn sẽ được đề xuất cho những người có cùng sở thích với bạn.",
+  "onboarding.profile.display_name": "Biệt danh",
+  "onboarding.profile.display_name_hint": "Tên đầy đủ hoặc biệt danh đều được…",
+  "onboarding.profile.lead": "Bạn có thể cài đặt lại trong phần cài đặt, nơi thậm chí còn có nhiều tùy chọn hơn.",
+  "onboarding.profile.note": "Giới thiệu",
+  "onboarding.profile.note_hint": "Bạn có thể @nhắnriêng ai đó hoặc #hashtags…",
+  "onboarding.profile.save_and_continue": "Lưu và tiếp tục",
+  "onboarding.profile.title": "Thiết lập hồ sơ",
+  "onboarding.profile.upload_avatar": "Tải lên ảnh đại diện",
+  "onboarding.profile.upload_header": "Tải lên ảnh bìa",
   "onboarding.share.lead": "Hãy cho mọi người biết làm thế nào họ có thể tìm thấy bạn trên Mastodon!",
   "onboarding.share.message": "Tôi là {username} trên #Mastodon! Hãy theo dõi tôi tại {url}",
   "onboarding.share.next_steps": "Các bước kế tiếp:",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
+  "recommended": "Đề xuất",
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
   "regeneration_indicator.sublabel": "Trang chính của bạn đang được cập nhật!",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "Tút nhắc đến {x}",
   "search.search_or_paste": "Tìm kiếm hoặc nhập URL",
   "search_popout.full_text_search_disabled_message": "Không khả dụng trên {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Cần đăng nhập trước.",
   "search_popout.language_code": "Mã ngôn ngữ ISO",
   "search_popout.options": "Tùy chọn tìm kiếm",
   "search_popout.quick_actions": "Thao tác nhanh",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 7b19e0e6a7..5896a25b02 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -127,7 +127,6 @@
   "lists.replies_policy.title": "ⵙⴽⵏ ⵜⵉⵔⴰⵔⵉⵏ ⵉ:",
   "lists.subheading": "ⵜⵉⵍⴳⴰⵎⵉⵏ ⵏⵏⴽ",
   "load_pending": "{count, plural, one {# ⵓⴼⵔⴷⵉⵙ ⴰⵎⴰⵢⵏⵓ} other {# ⵉⴼⵔⴷⴰⵙ ⵉⵎⴰⵢⵏⵓⵜⵏ}}",
-  "loading_indicator.label": "ⴰⵣⴷⴰⵎ...",
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index f830aa2985..1678fd7293 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -21,6 +21,7 @@
   "account.blocked": "已屏蔽",
   "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
   "account.cancel_follow_request": "撤回关注请求",
+  "account.copy": "复制资料卡链接",
   "account.direct": "私下提及 @{name}",
   "account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
   "account.domain_blocked": "域名已屏蔽",
@@ -191,9 +192,10 @@
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
   "conversation.with": "与 {names}",
+  "copy_icon_button.copied": "已复制到剪贴板",
   "copypaste.copied": "已复制",
   "copypaste.copy_to_clipboard": "复制到剪贴板",
-  "directory.federated": "来自已知联邦宇宙",
+  "directory.federated": "来自已知的联邦宇宙",
   "directory.local": "仅来自 {domain}",
   "directory.new_arrivals": "新来者",
   "directory.recently_active": "最近活跃",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "很抱歉，现在无法显示任何结果。您可以尝试使用搜索或浏览探索页面来查找要关注的人，或稍后再试。",
   "onboarding.follows.lead": "你管理你自己的家庭饲料。你关注的人越多，它将越活跃和有趣。 这些配置文件可能是一个很好的起点——你可以随时取消关注它们！",
   "onboarding.follows.title": "定制您的主页动态",
+  "onboarding.profile.discoverable": "让我的资料卡可被他人发现",
+  "onboarding.profile.discoverable_hint": "当您选择在 Mastodon 上启用发现功能时，你的嘟文可能会出现在搜索结果和热门中，你的账户可能会被推荐给与你兴趣相似的人。",
+  "onboarding.profile.display_name": "昵称",
+  "onboarding.profile.display_name_hint": "您的全名或昵称…",
+  "onboarding.profile.lead": "您可以稍后在设置中完成此操作，设置中有更多的自定义选项。",
+  "onboarding.profile.note": "简介",
+  "onboarding.profile.note_hint": "您可以提及 @其他人 或 #标签…",
+  "onboarding.profile.save_and_continue": "保存并继续",
+  "onboarding.profile.title": "设置个人资料",
+  "onboarding.profile.upload_avatar": "上传头像",
+  "onboarding.profile.upload_header": "上传资料卡头图",
   "onboarding.share.lead": "让人们知道他们如何在Mastodon找到你！",
   "onboarding.share.message": "我是来自 #Mastodon 的 {username}！请在 {url} 关注我。",
   "onboarding.share.next_steps": "可能的下一步：",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "不公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
+  "recommended": "推荐",
   "refresh": "刷新",
   "regeneration_indicator.label": "加载中…",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "匹配 {x} 的嘟文",
   "search.search_or_paste": "搜索或输入网址",
   "search_popout.full_text_search_disabled_message": "在 {domain} 不可用",
+  "search_popout.full_text_search_logged_out_message": "只有登录后才可用。",
   "search_popout.language_code": "ISO语言代码",
   "search_popout.options": "搜索选项",
   "search_popout.quick_actions": "快捷操作",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 7121a7d03e..263c707993 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -21,6 +21,7 @@
   "account.blocked": "已封鎖",
   "account.browse_more_on_origin_server": "前往原始的個人檔案頁瀏覽更多",
   "account.cancel_follow_request": "撤回追蹤請求",
+  "account.copy": "複製個人檔案連結",
   "account.direct": "私下提及 @{name}",
   "account.disable_notifications": "當 @{name} 發文時不要再通知我",
   "account.domain_blocked": "網域被封鎖",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "標為已讀",
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
+  "copy_icon_button.copied": "已複製到剪貼簿",
   "copypaste.copied": "已複製",
   "copypaste.copy_to_clipboard": "複製到剪貼簿",
   "directory.federated": "來自已知的聯盟網絡",
@@ -390,7 +392,7 @@
   "lists.search": "從你關注的人搜索",
   "lists.subheading": "列表",
   "load_pending": "{count, plural, other {# 個新項目}}",
-  "loading_indicator.label": "載入中...",
+  "loading_indicator.label": "載入中…",
   "media_gallery.toggle_visible": "隱藏圖片",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.duration": "時間",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "很遺憾，現在無法顯示任何結果。你可以嘗試搜尋或瀏覽探索頁面來找使用者來追蹤，或者稍後再試。",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "將個人檔案設為可被搜尋",
+  "onboarding.profile.discoverable_hint": "當你在 Mastodon 上選擇可被搜尋時，你的帖文可能會出現在搜尋結果和熱門，你的個人檔案也可能被推薦給與你興趣相似的人。",
+  "onboarding.profile.display_name": "顯示名稱",
+  "onboarding.profile.display_name_hint": "你的全名或暱稱…",
+  "onboarding.profile.lead": "你可以隨時在設定中完成此動作，那裏有更多自訂選項。",
+  "onboarding.profile.note": "簡介",
+  "onboarding.profile.note_hint": "你可以 @提及他人 或使用 #標籤…",
+  "onboarding.profile.save_and_continue": "儲存並繼續",
+  "onboarding.profile.title": "個人檔案設定",
+  "onboarding.profile.upload_avatar": "上載個人檔案頭像",
+  "onboarding.profile.upload_header": "上載個人檔案橫幅圖片",
   "onboarding.share.lead": "讓大家知道如何在 Mastodon 上找到你吧！",
   "onboarding.share.message": "我在 #Mastodon 的使用者名稱是 {username}！快來追蹤我吧 {url}",
   "onboarding.share.next_steps": "接下來你可以：",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
+  "recommended": "推薦",
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中……",
   "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中！",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "符合的帖文 {x}",
   "search.search_or_paste": "搜尋或貼上網址",
   "search_popout.full_text_search_disabled_message": "在 {domain} 上無法使用。",
+  "search_popout.full_text_search_logged_out_message": "登入後才可使用。",
   "search_popout.language_code": "ISO 語言代碼",
   "search_popout.options": "搜尋選項",
   "search_popout.quick_actions": "快速動作",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index db4fe4eab2..7ba66ae8c3 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -12,7 +12,7 @@
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
   "about.rules": "伺服器規則",
   "account.account_note_header": "備註",
-  "account.add_or_remove_from_list": "從列表中新增或移除",
+  "account.add_or_remove_from_list": "自列表中新增或移除",
   "account.badges.bot": "機器人",
   "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
@@ -21,12 +21,13 @@
   "account.blocked": "已封鎖",
   "account.browse_more_on_origin_server": "在該伺服器上的個人檔案頁面瀏覽更多",
   "account.cancel_follow_request": "收回跟隨請求",
+  "account.copy": "複製個人檔案連結",
   "account.direct": "私訊 @{name}",
   "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
   "account.domain_blocked": "已封鎖網域",
   "account.edit_profile": "編輯個人檔案",
   "account.enable_notifications": "當 @{name} 嘟文時通知我",
-  "account.endorse": "在個人檔案推薦對方",
+  "account.endorse": "於個人檔案推薦對方",
   "account.featured_tags.last_status_at": "上次嘟文於 {date}",
   "account.featured_tags.last_status_never": "沒有嘟文",
   "account.featured_tags.title": "{name} 的推薦主題標籤",
@@ -65,7 +66,7 @@
   "account.unblock": "解除封鎖 @{name}",
   "account.unblock_domain": "解除封鎖網域 {domain}",
   "account.unblock_short": "解除封鎖",
-  "account.unendorse": "取消在個人檔案推薦對方",
+  "account.unendorse": "取消於個人檔案推薦對方",
   "account.unfollow": "取消跟隨",
   "account.unmute": "解除靜音 @{name}",
   "account.unmute_notifications_short": "取消靜音推播通知",
@@ -102,7 +103,7 @@
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
   "closed_registrations.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與這個伺服器互動。",
-  "closed_registrations_modal.description": "目前無法在 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon 。",
+  "closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon 。",
   "closed_registrations_modal.find_another_server": "尋找另一個伺服器",
   "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架一個自己的伺服器！",
   "closed_registrations_modal.title": "註冊 Mastodon",
@@ -171,11 +172,11 @@
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "您確定要永久刪除此列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
-  "confirmations.discard_edit_media.message": "您在媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
+  "confirmations.discard_edit_media.message": "您於媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
   "confirmations.domain_block.confirm": "封鎖整個網域",
   "confirmations.domain_block.message": "您真的非常確定要封鎖整個 {domain} 網域嗎？大部分情況下，封鎖或靜音少數特定的帳號就能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
   "confirmations.edit.confirm": "編輯",
-  "confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫的訊息。是否仍要繼續？",
+  "confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "標記為已讀",
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
+  "copy_icon_button.copied": "已複製到剪貼簿",
   "copypaste.copied": "已複製",
   "copypaste.copy_to_clipboard": "複製到剪貼簿",
   "directory.federated": "來自已知聯邦宇宙",
@@ -205,7 +207,7 @@
   "dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
   "dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
-  "embed.instructions": "要在您的網站嵌入此嘟文，請複製以下程式碼。",
+  "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
   "emoji_button.clear": "清除",
@@ -218,7 +220,7 @@
   "emoji_button.objects": "物件",
   "emoji_button.people": "人物",
   "emoji_button.recent": "最常使用",
-  "emoji_button.search": "搜尋…",
+  "emoji_button.search": "搜尋...",
   "emoji_button.search_results": "搜尋結果",
   "emoji_button.symbols": "符號",
   "emoji_button.travel": "旅遊與地點",
@@ -259,7 +261,7 @@
   "filter_modal.added.context_mismatch_title": "不符合情境！",
   "filter_modal.added.expired_explanation": "此過濾器類別已失效，您需要更新過期日期以套用。",
   "filter_modal.added.expired_title": "過期的過濾器！",
-  "filter_modal.added.review_and_configure": "要檢視和進一步設定此過濾器類別，請至 {settings_link}。",
+  "filter_modal.added.review_and_configure": "要檢視與進一步設定此過濾器類別，請至 {settings_link}。",
   "filter_modal.added.review_and_configure_title": "過濾器設定",
   "filter_modal.added.settings_link": "設定頁面",
   "filter_modal.added.short_explanation": "此嘟文已被新增至以下過濾器類別：{title}。",
@@ -362,7 +364,7 @@
   "keyboard_shortcuts.search": "將游標移至搜尋框",
   "keyboard_shortcuts.spoilers": "顯示或隱藏內容警告之嘟文",
   "keyboard_shortcuts.start": "開啟「開始使用」欄位",
-  "keyboard_shortcuts.toggle_hidden": "顯示或隱藏在內容警告之後的嘟文",
+  "keyboard_shortcuts.toggle_hidden": "顯示或隱藏於內容警告之後的嘟文",
   "keyboard_shortcuts.toggle_sensitivity": "顯示或隱藏媒體",
   "keyboard_shortcuts.toot": "發個新嘟文",
   "keyboard_shortcuts.unfocus": "跳離文字撰寫區塊或搜尋框",
@@ -376,7 +378,7 @@
   "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
   "link_preview.author": "由 {name} 提供",
   "lists.account.add": "新增至列表",
-  "lists.account.remove": "從列表中移除",
+  "lists.account.remove": "自列表中移除",
   "lists.delete": "刪除列表",
   "lists.edit": "編輯列表",
   "lists.edit.submit": "變更標題",
@@ -390,7 +392,7 @@
   "lists.search": "搜尋您跟隨的使用者",
   "lists.subheading": "您的列表",
   "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
-  "loading_indicator.label": "讀取中...",
+  "loading_indicator.label": "正在載入...",
   "media_gallery.toggle_visible": "切換可見性",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.duration": "持續時間",
@@ -469,7 +471,7 @@
   "notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
   "notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
   "notifications_permission_banner.enable": "啟用桌面通知",
-  "notifications_permission_banner.how_to_control": "啟用桌面通知以在 Mastodon 沒有開啟的時候接收通知。在已經啟用桌面通知的時候，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
+  "notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不要錯過任何東西！",
   "onboarding.action.back": "返回",
   "onboarding.actions.back": "返回",
@@ -479,6 +481,17 @@
   "onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
   "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
+  "onboarding.profile.discoverable": "使我的個人檔案可以被找到",
+  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+  "onboarding.profile.display_name": "顯示名稱",
+  "onboarding.profile.display_name_hint": "完整名稱或暱稱...",
+  "onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
+  "onboarding.profile.note": "個人簡介",
+  "onboarding.profile.note_hint": "您可以 @mention 其他人或者使用 #主題標籤...",
+  "onboarding.profile.save_and_continue": "儲存並繼續",
+  "onboarding.profile.title": "個人檔案設定",
+  "onboarding.profile.upload_avatar": "上傳個人檔案大頭貼",
+  "onboarding.profile.upload_header": "上傳個人檔案封面圖片",
   "onboarding.share.lead": "讓其他人知道他們如何於 Mastodon 上面找到您！",
   "onboarding.share.message": "我是 #Mastodon 上的 {username}！歡迎於 {url} 跟隨我",
   "onboarding.share.next_steps": "可能的下一步：",
@@ -490,7 +503,7 @@
   "onboarding.steps.follow_people.title": "客製化您的首頁時間軸",
   "onboarding.steps.publish_status.body": "向新世界打聲招呼吧。",
   "onboarding.steps.publish_status.title": "撰寫您第一則嘟文",
-  "onboarding.steps.setup_profile.body": "若您完整填寫個人檔案，其他人比較願意和您互動。",
+  "onboarding.steps.setup_profile.body": "若您完整填寫個人檔案，其他人比較願意與您互動。",
   "onboarding.steps.setup_profile.title": "客製化您的個人檔案",
   "onboarding.steps.share_profile.body": "讓您的朋友們知道如何於 Mastodon 找到您！",
   "onboarding.steps.share_profile.title": "分享您的 Mastodon 個人檔案",
@@ -522,6 +535,7 @@
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
+  "recommended": "推薦設定",
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中…",
   "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
@@ -592,6 +606,7 @@
   "search.quick_action.status_search": "符合的嘟文 {x}",
   "search.search_or_paste": "搜尋或輸入網址",
   "search_popout.full_text_search_disabled_message": "{domain} 上無法使用。",
+  "search_popout.full_text_search_logged_out_message": "僅於登入時能使用。",
   "search_popout.language_code": "ISO 語言代碼 (ISO language code)",
   "search_popout.options": "搜尋選項",
   "search_popout.quick_actions": "快捷操作",
@@ -614,10 +629,10 @@
   "sign_in_banner.create_account": "新增帳號",
   "sign_in_banner.sign_in": "登入",
   "sign_in_banner.sso_redirect": "登入或註冊",
-  "sign_in_banner.text": "登入以跟隨個人檔案和主題標籤，或收藏、分享和回覆嘟文。您也可以使用您的帳號在其他伺服器上進行互動。",
+  "sign_in_banner.text": "登入以跟隨個人檔案與主題標籤，或收藏、分享及回覆嘟文。您也可以使用您的帳號於其他伺服器進行互動。",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "開啟 {domain} 的管理介面",
-  "status.admin_status": "在管理介面開啟此嘟文",
+  "status.admin_status": "於管理介面開啟此嘟文",
   "status.block": "封鎖 @{name}",
   "status.bookmark": "書籤",
   "status.cancel_reblog_private": "取消轉嘟",
@@ -672,8 +687,8 @@
   "status.translated_from_with": "透過 {provider} 翻譯 {lang}",
   "status.uncached_media_warning": "無法預覽",
   "status.unmute_conversation": "解除此對話的靜音",
-  "status.unpin": "從個人檔案頁面取消釘選",
-  "subscribed_languages.lead": "僅選定語言的嘟文才會出現在您的首頁上，並在變更後列出時間軸。選取「無」以接收所有語言的嘟文。",
+  "status.unpin": "自個人檔案頁面取消釘選",
+  "subscribed_languages.lead": "僅選定語言的嘟文才會出現於您的首頁上，並於變更後列出時間軸。選取「無」以接收所有語言的嘟文。",
   "subscribed_languages.save": "儲存變更",
   "subscribed_languages.target": "變更 {target} 的訂閱語言",
   "tabs_bar.home": "首頁",
@@ -696,7 +711,7 @@
   "upload_area.title": "拖放來上傳",
   "upload_button.label": "上傳圖片、影片、或者音樂檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
-  "upload_error.poll": "不允許在投票中上傳檔案。",
+  "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
   "upload_form.description_missing": "沒有任何描述",
@@ -706,7 +721,7 @@
   "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
-  "upload_modal.applying": "正在套用⋯⋯",
+  "upload_modal.applying": "正在套用...",
   "upload_modal.choose_image": "選擇圖片",
   "upload_modal.description_placeholder": "我能吞下玻璃而不傷身體",
   "upload_modal.detect_text": "從圖片中偵測文字",
diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts
index 00066e2840..a04ebe6291 100644
--- a/app/javascript/mastodon/models/account.ts
+++ b/app/javascript/mastodon/models/account.ts
@@ -67,6 +67,7 @@ export const accountDefaultValues: AccountShape = {
   bot: false,
   created_at: '',
   discoverable: false,
+  indexable: false,
   display_name: '',
   display_name_html: '',
   emojis: List<CustomEmoji>(),
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 4a7a822a35..2ca301b19a 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -281,7 +281,7 @@ export default function notifications(state = initialState, action) {
   case blockAccountSuccess.type:
     return filterNotifications(state, [action.payload.relationship.id]);
   case muteAccountSuccess.type:
-    return action.relationship.muting_notifications ? filterNotifications(state, [action.payload.relationship.id]) : state;
+    return action.payload.relationship.muting_notifications ? filterNotifications(state, [action.payload.relationship.id]) : state;
   case blockDomainSuccess.type:
     return filterNotifications(state, action.payload.accounts);
   case authorizeFollowRequestSuccess.type:
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 50d017af69..add2456681 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -286,6 +286,17 @@
     font-size: 12px;
     font-weight: 500;
   }
+
+  &.copyable {
+    transition: all 300ms linear;
+  }
+
+  &.copied {
+    border-color: $valid-value-color;
+    color: $valid-value-color;
+    transition: none;
+    background-color: rgba($valid-value-color, 0.15);
+  }
 }
 
 .text-icon-button {
@@ -2288,8 +2299,7 @@ $ui-header-height: 55px;
 
   > .scrollable {
     background: $ui-base-color;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
+    border-radius: 0 0 4px 4px;
   }
 }
 
@@ -2552,7 +2562,7 @@ $ui-header-height: 55px;
 
 .column-title {
   text-align: center;
-  padding-bottom: 40px;
+  padding-bottom: 32px;
 
   h3 {
     font-size: 24px;
@@ -2743,58 +2753,6 @@ $ui-header-height: 55px;
   }
 }
 
-.onboarding__progress-indicator {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30px;
-  position: sticky;
-  background: $ui-base-color;
-
-  @media screen and (width >= 600) {
-    padding: 0 40px;
-  }
-
-  &__line {
-    height: 4px;
-    flex: 1 1 auto;
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__step {
-    flex: 0 0 auto;
-    width: 30px;
-    height: 30px;
-    background: lighten($ui-base-color, 4%);
-    border-radius: 50%;
-    color: $primary-text-color;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    svg {
-      width: 15px;
-      height: auto;
-    }
-
-    &.active {
-      background: $valid-value-color;
-    }
-  }
-
-  &__step.active,
-  &__line.active {
-    background: $valid-value-color;
-    background-image: linear-gradient(
-      90deg,
-      $valid-value-color,
-      lighten($valid-value-color, 8%),
-      $valid-value-color
-    );
-    background-size: 200px 100%;
-    animation: skeleton 1.2s ease-in-out infinite;
-  }
-}
-
 .follow-recommendations {
   background: darken($ui-base-color, 4%);
   border-radius: 8px;
@@ -2871,6 +2829,28 @@ $ui-header-height: 55px;
   }
 }
 
+.onboarding__profile {
+  position: relative;
+  margin-bottom: 40px + 20px;
+
+  .app-form__avatar-input {
+    border: 2px solid $ui-base-color;
+    position: absolute;
+    inset-inline-start: -2px;
+    bottom: -40px;
+    z-index: 2;
+  }
+
+  .app-form__header-input {
+    margin: 0 -20px;
+    border-radius: 0;
+
+    img {
+      border-radius: 0;
+    }
+  }
+}
+
 .compose-form__highlightable {
   display: flex;
   flex-direction: column;
@@ -3145,6 +3125,7 @@ $ui-header-height: 55px;
   cursor: pointer;
   background-color: transparent;
   border: 0;
+  border-radius: 10px;
   padding: 0;
   user-select: none;
   -webkit-tap-highlight-color: rgba($base-overlay-background, 0);
@@ -3169,81 +3150,41 @@ $ui-header-height: 55px;
 }
 
 .react-toggle-track {
-  width: 50px;
-  height: 24px;
+  width: 32px;
+  height: 20px;
   padding: 0;
-  border-radius: 30px;
-  background-color: $ui-base-color;
-  transition: background-color 0.2s ease;
+  border-radius: 10px;
+  background-color: #626982;
 }
 
-.react-toggle:is(:hover, :focus-within):not(.react-toggle--disabled)
-  .react-toggle-track {
-  background-color: darken($ui-base-color, 10%);
+.react-toggle--focus {
+  outline: $ui-button-focus-outline;
 }
 
 .react-toggle--checked .react-toggle-track {
-  background-color: darken($ui-highlight-color, 2%);
-}
-
-.react-toggle--checked:is(:hover, :focus-within):not(.react-toggle--disabled)
-  .react-toggle-track {
   background-color: $ui-highlight-color;
 }
 
-.react-toggle-track-check {
-  position: absolute;
-  width: 14px;
-  height: 10px;
-  top: 0;
-  bottom: 0;
-  margin-top: auto;
-  margin-bottom: auto;
-  line-height: 0;
-  inset-inline-start: 8px;
-  opacity: 0;
-  transition: opacity 0.25s ease;
-}
-
-.react-toggle--checked .react-toggle-track-check {
-  opacity: 1;
-  transition: opacity 0.25s ease;
-}
-
+.react-toggle-track-check,
 .react-toggle-track-x {
-  position: absolute;
-  width: 10px;
-  height: 10px;
-  top: 0;
-  bottom: 0;
-  margin-top: auto;
-  margin-bottom: auto;
-  line-height: 0;
-  inset-inline-end: 10px;
-  opacity: 1;
-  transition: opacity 0.25s ease;
-}
-
-.react-toggle--checked .react-toggle-track-x {
-  opacity: 0;
+  display: none;
 }
 
 .react-toggle-thumb {
   position: absolute;
-  top: 1px;
-  inset-inline-start: 1px;
-  width: 22px;
-  height: 22px;
-  border: 1px solid $ui-base-color;
+  top: 2px;
+  inset-inline-start: 2px;
+  width: 16px;
+  height: 16px;
   border-radius: 50%;
-  background-color: darken($simple-background-color, 2%);
+  background-color: $primary-text-color;
   box-sizing: border-box;
   transition: all 0.25s ease;
   transition-property: border-color, left;
 }
 
 .react-toggle--checked .react-toggle-thumb {
-  inset-inline-start: 27px;
+  inset-inline-start: 32px - 16px - 2px;
   border-color: $ui-highlight-color;
 }
 
@@ -4066,6 +4007,17 @@ a.status-card {
   justify-content: center;
 }
 
+.button .loading-indicator {
+  position: static;
+  transform: none;
+
+  .circular-progress {
+    color: $primary-text-color;
+    width: 22px;
+    height: 22px;
+  }
+}
+
 .circular-progress {
   color: lighten($ui-base-color, 26%);
   animation: 1.4s linear 0s infinite normal none running simple-rotate;
@@ -5799,12 +5751,14 @@ a.status-card {
   &__toggle {
     display: flex;
     align-items: center;
-    margin-bottom: 10px;
+    margin-bottom: 16px;
+    gap: 8px;
 
     & > span {
-      font-size: 17px;
+      display: block;
+      font-size: 14px;
       font-weight: 500;
-      margin-inline-start: 10px;
+      line-height: 20px;
     }
   }
 
@@ -7334,6 +7288,7 @@ noscript {
 
 .account__header {
   overflow: hidden;
+  container: account-header / inline-size;
 
   &.inactive {
     opacity: 0.5;
@@ -7429,6 +7384,16 @@ noscript {
           width: 24px;
           height: 24px;
         }
+
+        &.copied {
+          border-color: $valid-value-color;
+        }
+      }
+
+      @container account-header (max-width: 372px) {
+        .optional {
+          display: none;
+        }
       }
     }
 
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 0f8eecee01..555d43cc1c 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -36,7 +36,7 @@ code {
   }
 
   .input {
-    margin-bottom: 15px;
+    margin-bottom: 16px;
     overflow: hidden;
 
     &.hidden {
@@ -266,12 +266,13 @@ code {
       font-size: 14px;
       color: $primary-text-color;
       display: block;
-      font-weight: 500;
-      padding-top: 5px;
+      font-weight: 600;
+      line-height: 20px;
     }
 
     .hint {
-      margin-bottom: 15px;
+      line-height: 16px;
+      margin-bottom: 12px;
     }
 
     ul {
@@ -427,7 +428,8 @@ code {
   input[type='datetime-local'],
   textarea {
     box-sizing: border-box;
-    font-size: 16px;
+    font-size: 14px;
+    line-height: 20px;
     color: $primary-text-color;
     display: block;
     width: 100%;
@@ -435,9 +437,9 @@ code {
     font-family: inherit;
     resize: vertical;
     background: darken($ui-base-color, 10%);
-    border: 1px solid darken($ui-base-color, 14%);
-    border-radius: 4px;
-    padding: 10px;
+    border: 1px solid darken($ui-base-color, 10%);
+    border-radius: 8px;
+    padding: 10px 16px;
 
     &::placeholder {
       color: lighten($darker-text-color, 4%);
@@ -451,14 +453,13 @@ code {
       border-color: $valid-value-color;
     }
 
-    &:hover {
-      border-color: darken($ui-base-color, 20%);
-    }
-
     &:active,
     &:focus {
       border-color: $highlight-text-color;
-      background: darken($ui-base-color, 8%);
+    }
+
+    @media screen and (width <= 600px) {
+      font-size: 16px;
     }
   }
 
@@ -524,12 +525,11 @@ code {
     border-radius: 4px;
     background: $ui-button-background-color;
     color: $ui-button-color;
-    font-size: 18px;
-    line-height: inherit;
+    font-size: 15px;
+    line-height: 22px;
     height: auto;
-    padding: 10px;
+    padding: 7px 18px;
     text-decoration: none;
-    text-transform: uppercase;
     text-align: center;
     box-sizing: border-box;
     cursor: pointer;
@@ -1220,3 +1220,115 @@ code {
     background: $highlight-text-color;
   }
 }
+
+.app-form {
+  &__avatar-input,
+  &__header-input {
+    display: block;
+    border-radius: 8px;
+    background: var(--dropdown-background-color);
+    position: relative;
+    cursor: pointer;
+
+    img {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      border-radius: 8px;
+      z-index: 0;
+    }
+
+    .icon {
+      position: absolute;
+      inset-inline-start: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      color: $darker-text-color;
+      z-index: 3;
+    }
+
+    &.selected .icon {
+      color: $primary-text-color;
+      transform: none;
+      inset-inline-start: auto;
+      inset-inline-end: 8px;
+      top: auto;
+      bottom: 8px;
+    }
+
+    &.invalid img {
+      outline: 1px solid $error-value-color;
+      outline-offset: -1px;
+    }
+
+    &.invalid::before {
+      display: block;
+      content: '';
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      background: rgba($error-value-color, 0.25);
+      z-index: 2;
+      border-radius: 8px;
+    }
+
+    &:hover {
+      background-color: var(--dropdown-border-color);
+    }
+  }
+
+  &__avatar-input {
+    width: 80px;
+    height: 80px;
+  }
+
+  &__header-input {
+    aspect-ratio: 580/193;
+  }
+
+  &__toggle {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+    color: $darker-text-color;
+    font-size: 14px;
+    line-height: 20px;
+
+    .icon {
+      flex: 0 0 auto;
+    }
+
+    .icon {
+      width: 24px;
+      height: 24px;
+    }
+
+    &__label {
+      flex: 1 1 auto;
+
+      strong {
+        color: $primary-text-color;
+        font-weight: 600;
+      }
+
+      .recommended {
+        position: absolute;
+        margin: 0 4px;
+        margin-top: -2px;
+      }
+    }
+
+    &__toggle {
+      flex: 0 0 auto;
+      display: flex;
+      align-items: center;
+    }
+
+    &__toggle > div {
+      display: flex;
+      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      padding-inline-start: 16px;
+    }
+  }
+}
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 990b92c337..2a6fbb0ab7 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AdminMailer < ApplicationMailer
-  layout 'plain_mailer'
+  layout 'admin_mailer'
 
   helper :accounts
   helper :languages
diff --git a/app/models/concerns/account_search.rb b/app/models/concerns/account_search.rb
index 9f7720f11b..b855727b4d 100644
--- a/app/models/concerns/account_search.rb
+++ b/app/models/concerns/account_search.rb
@@ -106,6 +106,8 @@ module AccountSearch
     LIMIT :limit OFFSET :offset
   SQL
 
+  DEFAULT_LIMIT = 10
+
   def searchable_text
     PlainTextFormatter.new(note, local?).to_s if discoverable?
   end
@@ -118,7 +120,7 @@ module AccountSearch
   end
 
   class_methods do
-    def search_for(terms, limit: 10, offset: 0)
+    def search_for(terms, limit: DEFAULT_LIMIT, offset: 0)
       tsquery = generate_query_for_search(terms)
 
       find_by_sql([BASIC_SEARCH_SQL, { limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
@@ -126,7 +128,7 @@ module AccountSearch
       end
     end
 
-    def advanced_search_for(terms, account, limit: 10, following: false, offset: 0)
+    def advanced_search_for(terms, account, limit: DEFAULT_LIMIT, following: false, offset: 0)
       tsquery = generate_query_for_search(terms)
       sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
 
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index c0ee1bdce7..4cdbdeb473 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -52,9 +52,13 @@ module Attachmentable
     return if attachment.blank? || !/image.*/.match?(attachment.content_type) || attachment.queued_for_write[:original].blank?
 
     width, height = FastImage.size(attachment.queued_for_write[:original].path)
-    matrix_limit  = attachment.content_type == 'image/gif' ? GIF_MATRIX_LIMIT : MAX_MATRIX_LIMIT
+    return unless width.present? && height.present?
 
-    raise Mastodon::DimensionsValidationError, "#{width}x#{height} images are not supported" if width.present? && height.present? && (width * height > matrix_limit)
+    if attachment.content_type == 'image/gif' && width * height > GIF_MATRIX_LIMIT
+      raise Mastodon::DimensionsValidationError, "#{width}x#{height} GIF files are not supported"
+    elsif width * height > MAX_MATRIX_LIMIT
+      raise Mastodon::DimensionsValidationError, "#{width}x#{height} images are not supported"
+    end
   end
 
   def appropriate_extension(attachment)
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index fa35e38acb..c6f282d00f 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -40,7 +40,7 @@ class StatusEdit < ApplicationRecord
   belongs_to :status
   belongs_to :account, optional: true
 
-  default_scope { order(id: :asc) }
+  scope :ordered, -> { order(id: :asc) }
 
   delegate :local?, :application, :edited?, :edited_at,
            :discarded?, :visibility, to: :status
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 8fab98fb5c..46e55d74f9 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -37,7 +37,7 @@ class Tag < ApplicationRecord
 
   HASHTAG_RE = %r{(?<![=/)\w])#(#{HASHTAG_NAME_PAT})}i
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
-  HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/
+  HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
 
   validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
   validates :display_name, format: { with: HASHTAG_NAME_RE }
diff --git a/app/models/user.rb b/app/models/user.rb
index bb8e992617..846b95297b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -96,11 +96,9 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
   validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
-  validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
   validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
-  validates :time_zone, inclusion: { in: ActiveSupport::TimeZone.all.map { |tz| tz.tzinfo.name } }, allow_blank: true
 
   # Honeypot/anti-spam fields
   attr_accessor :registration_form_time, :website, :confirm_password
@@ -124,6 +122,8 @@ class User < ApplicationRecord
 
   before_validation :sanitize_languages
   before_validation :sanitize_role
+  before_validation :sanitize_time_zone
+  before_validation :sanitize_locale
   before_create :set_approved
   after_commit :send_pending_devise_notifications
   after_create_commit :trigger_webhooks
@@ -451,9 +451,15 @@ class User < ApplicationRecord
   end
 
   def sanitize_role
-    return if role.nil?
+    self.role = nil if role.present? && role.everyone?
+  end
 
-    self.role = nil if role.everyone?
+  def sanitize_time_zone
+    self.time_zone = nil if time_zone.present? && ActiveSupport::TimeZone[time_zone].nil?
+  end
+
+  def sanitize_locale
+    self.locale = nil if locale.present? && I18n.available_locales.exclude?(locale.to_sym)
   end
 
   def prepare_new_user!
diff --git a/app/serializers/node_info/serializer.rb b/app/serializers/node_info/serializer.rb
index f70cc38f06..3920b3ee42 100644
--- a/app/serializers/node_info/serializer.rb
+++ b/app/serializers/node_info/serializer.rb
@@ -38,7 +38,10 @@ class NodeInfo::Serializer < ActiveModel::Serializer
   end
 
   def metadata
-    {}
+    {
+      nodeName: Setting.site_title,
+      nodeDescription: Setting.site_short_description,
+    }
   end
 
   private
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 3fe2026674..3531b02e2c 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -6,7 +6,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
 
   # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes
 
-  attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at,
+  attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :indexable, :group, :created_at,
              :note, :url, :uri, :avatar, :avatar_static, :header, :header_static,
              :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections
 
@@ -116,6 +116,10 @@ class REST::AccountSerializer < ActiveModel::Serializer
     object.suspended? ? false : object.discoverable
   end
 
+  def indexable
+    object.suspended? ? false : object.indexable
+  end
+
   def moved_to_account
     object.suspended? ? nil : AccountDecorator.new(object.moved_to_account)
   end
diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb
index 4af7bd295c..fa997f1c5b 100644
--- a/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class StatusPinValidator < ActiveModel::Validator
-  MAX_PINNED = (ENV['MAX_PINNED_TOOTS'] || 5).to_i
+  PIN_LIMIT = (ENV['MAX_PINNED_TOOTS'] || 5).to_i
 
   def validate(pin)
     pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
     pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
     pin.errors.add(:base, I18n.t('statuses.pin_errors.direct')) if pin.status.direct_visibility?
-    pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= MAX_PINNED && pin.account.local?
+    pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= PIN_LIMIT && pin.account.local?
   end
 end
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index d56f10a7ff..dde9c50847 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -5,7 +5,7 @@
   - if @account.user_prefers_noindex?
     %meta{ name: 'robots', content: 'noindex, noarchive' }/
 
-  %link{ rel: 'alternate', type: 'application/rss+xml', href: @rss_url }/
+  %link{ rel: 'alternate', type: 'application/rss+xml', href: rss_url }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
 
   - @account.fields.select(&:verifiable?).each do |field|
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index 1ea931a2fa..69b0458ede 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -7,7 +7,7 @@
   .fields-group
     = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
   .fields-group
-    = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LOCAL_LIMIT))
+    = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LOCAL_LIMIT))
 
   .actions
     = f.button :button, t('admin.custom_emojis.upload'), type: :submit
diff --git a/app/views/admin/reports/_header_details.html.haml b/app/views/admin/reports/_header_details.html.haml
index 5878cd2ff8..45790b9cd5 100644
--- a/app/views/admin/reports/_header_details.html.haml
+++ b/app/views/admin/reports/_header_details.html.haml
@@ -22,7 +22,7 @@
         = t('admin.reports.resolved')
       - else
         = t('admin.reports.unresolved')
-  - unless report.target_account.local?
+  - if report.account.local? && !report.target_account.local?
     .report-header__details__item
       .report-header__details__item__header
         %strong= t('admin.reports.forwarded')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 13a4d48344..4376e5af4d 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -7,6 +7,9 @@
   - else
     = link_to t('admin.reports.mark_as_unresolved'), reopen_admin_report_path(@report), method: :post, class: 'button'
 
+- unless @report.account.local? || @report.target_account.local?
+  .flash-message= t('admin.reports.forwarded_replies_explanation')
+
 .report-header
   = render 'admin/reports/header_card', report: @report
   = render 'admin/reports/header_details', report: @report
diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb
index 85f3f8039d..0e2a6a20a6 100644
--- a/app/views/admin_mailer/_new_trending_links.text.erb
+++ b/app/views/admin_mailer/_new_trending_links.text.erb
@@ -1,6 +1,6 @@
 <%= raw t('admin_mailer.new_trends.new_trending_links.title') %>
 
-<% @links.each do |link| %>
+<% new_trending_links.each do |link| %>
 - <%= link.title %> · <%= link.url %>
   <%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %>
 <% end %>
diff --git a/app/views/admin_mailer/_new_trending_statuses.text.erb b/app/views/admin_mailer/_new_trending_statuses.text.erb
index eedbfff9d9..05bb9733fc 100644
--- a/app/views/admin_mailer/_new_trending_statuses.text.erb
+++ b/app/views/admin_mailer/_new_trending_statuses.text.erb
@@ -1,6 +1,6 @@
 <%= raw t('admin_mailer.new_trends.new_trending_statuses.title') %>
 
-<% @statuses.each do |status| %>
+<% new_trending_statuses.each do |status| %>
 - <%= ActivityPub::TagManager.instance.url_for(status) %>
   <%= standard_locale_name(status.language) %> · <%= raw t('admin.trends.tags.current_score', score: status.trend.score.round(2)) %>
 <% end %>
diff --git a/app/views/admin_mailer/_new_trending_tags.text.erb b/app/views/admin_mailer/_new_trending_tags.text.erb
index d528ab8eb7..f738caaf3d 100644
--- a/app/views/admin_mailer/_new_trending_tags.text.erb
+++ b/app/views/admin_mailer/_new_trending_tags.text.erb
@@ -1,14 +1,8 @@
 <%= raw t('admin_mailer.new_trends.new_trending_tags.title') %>
 
-<% @tags.each do |tag| %>
+<% new_trending_tags.each do |tag| %>
 - #<%= tag.display_name %>
   <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
 <% end %>
 
-<% if @lowest_trending_tag %>
-<%= raw t('admin_mailer.new_trends.new_trending_tags.requirements', lowest_tag_name: @lowest_trending_tag.display_name, lowest_tag_score: Trends.tags.score(@lowest_trending_tag.id).round(2), rank: Trends.tags.options[:review_threshold]) %>
-<% else %>
-<%= raw t('admin_mailer.new_trends.new_trending_tags.no_approved_tags') %>
-<% end %>
-
 <%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %>
diff --git a/app/views/admin_mailer/new_appeal.text.erb b/app/views/admin_mailer/new_appeal.text.erb
index 8b85823608..0494f88985 100644
--- a/app/views/admin_mailer/new_appeal.text.erb
+++ b/app/views/admin_mailer/new_appeal.text.erb
@@ -1,5 +1,3 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw t('admin_mailer.new_appeal.body', target: @appeal.account.username, action_taken_by: @appeal.strike.account.username, date: l(@appeal.strike.created_at, format: :with_time_zone), type: t(@appeal.strike.action, scope: 'admin_mailer.new_appeal.actions')) %>
 
 > <%= raw word_wrap(@appeal.text, break_sequence: "\n> ") %>
diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index c901bc50f7..63c170dc0d 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,5 +1,3 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw t('admin_mailer.new_critical_software_updates.body') %>
 
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb
index a8a2a35fa5..9eabb8f150 100644
--- a/app/views/admin_mailer/new_pending_account.text.erb
+++ b/app/views/admin_mailer/new_pending_account.text.erb
@@ -1,5 +1,3 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw t('admin_mailer.new_pending_account.body') %>
 
 <%= @account.user_email %> (@<%= @account.username %>)
diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb
index f8a5224a10..8482225abe 100644
--- a/app/views/admin_mailer/new_report.text.erb
+++ b/app/views/admin_mailer/new_report.text.erb
@@ -1,5 +1,3 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.pretty_acct, reporter: @report.account.pretty_acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
 
 <%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 2fc4d1a5f2..96808f3cb3 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,5 +1,3 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw t('admin_mailer.new_software_updates.body') %>
 
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_trends.text.erb b/app/views/admin_mailer/new_trends.text.erb
index 13b2968461..4bcfa14010 100644
--- a/app/views/admin_mailer/new_trends.text.erb
+++ b/app/views/admin_mailer/new_trends.text.erb
@@ -1,13 +1,5 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
 <%= raw t('admin_mailer.new_trends.body') %>
 
-<% unless @links.empty? %>
-<%= render 'new_trending_links' %>
-<% end %>
-<% unless @tags.empty? %>
-<%= render 'new_trending_tags' unless @tags.empty? %>
-<% end %>
-<% unless @statuses.empty? %>
-<%= render 'new_trending_statuses' unless @statuses.empty? %>
-<% end %>
+<%= render partial: 'new_trending_links', object: @links unless @links.empty? %>
+<%= render partial: 'new_trending_tags', object: @tags unless @tags.empty? %>
+<%= render partial: 'new_trending_statuses', object: @statuses unless @statuses.empty? %>
diff --git a/app/views/layouts/admin_mailer.text.erb b/app/views/layouts/admin_mailer.text.erb
new file mode 100644
index 0000000000..298007ac87
--- /dev/null
+++ b/app/views/layouts/admin_mailer.text.erb
@@ -0,0 +1,3 @@
+<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
+
+<%= yield %>
diff --git a/app/views/layouts/plain_mailer.html.haml b/app/views/layouts/plain_mailer.html.haml
deleted file mode 100644
index 0a90f092c5..0000000000
--- a/app/views/layouts/plain_mailer.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= yield
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 389096e89f..4d1c7c6383 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -60,15 +60,11 @@ unless Rails.env.development?
     p.base_uri        :none
     p.default_src     :none
     p.frame_ancestors :none
-    p.script_src      :self, assets_host, "'wasm-unsafe-eval'"
     p.font_src        :self, assets_host
     p.img_src         :self, :data, :blob, *data_hosts
     p.style_src       :self, assets_host
     p.media_src       :self, :data, *data_hosts
     p.frame_src       :self, :https
-    p.child_src       :self, :blob, assets_host
-    p.worker_src      :self, :blob, assets_host
-    p.connect_src     :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts, 'https://api.tenor.com'
     p.manifest_src    :self, assets_host
 
     if sso_host.present?
@@ -76,6 +72,11 @@ unless Rails.env.development?
     else
       p.form_action     :self
     end
+
+    p.child_src       :self, :blob, assets_host
+    p.worker_src      :self, :blob, assets_host
+    p.connect_src     :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts, 'https://api.tenor.com'
+    p.script_src      :self, assets_host, "'wasm-unsafe-eval'"
   end
 end
 
diff --git a/config/locales/activerecord.lt.yml b/config/locales/activerecord.lt.yml
index f54d00471b..cb6e21d8e8 100644
--- a/config/locales/activerecord.lt.yml
+++ b/config/locales/activerecord.lt.yml
@@ -1,6 +1,19 @@
 ---
 lt:
   activerecord:
+    attributes:
+      poll:
+        expires_at: Galutinė data
+        options: Pasirinkimai
+      user:
+        agreement: Paslaugos sutartis
+        email: El. laiško adresas
+        locale: Lokali
+        password: Slaptažodis
+      user/account:
+        username: Naudotojo vardas
+      user/invite_request:
+        text: Priežastis
     errors:
       models:
         account:
@@ -12,3 +25,35 @@ lt:
           attributes:
             url:
               invalid: nėra tinkamas URL adresas.
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nėra tinkamas URL adresas.
+        import:
+          attributes:
+            data:
+              malformed: yra netaisyklinga.
+        status:
+          attributes:
+            reblog:
+              taken: įrašas jau egzistuoja.
+        user:
+          attributes:
+            email:
+              blocked: naudoja neleidžiamą el. laiško paslaugų teikėją.
+              unreachable: neatrodo, kad egzistuoja.
+            role_id:
+              elevated: negali būti didesnis nei tavo dabartinis vaidmuo.
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: apima leidimus, kurie nėra saugūs pagrindiniam vaidmeniui.
+              elevated: negali apimti leidimų, kurių neturi tavo dabartinis vaidmuo.
+              own_role: negali būti pakeistas tavo dabartinis vaidmuo.
+            position:
+              elevated: negali būti didesnis nei tavo dabartinis vaidmuo.
+              own_role: negali būti pakeistas tavo dabartinis vaidmuo.
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: negali įtraukti įvykių, į kuriuos neturi teisių.
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 7922ccf585..de791679b6 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -900,8 +900,6 @@ an:
       new_trending_statuses:
         title: Publicacions en tendencia
       new_trending_tags:
-        no_approved_tags: Actualment no i hai garra etiqueta en tendencia aprebada.
-        requirements: 'Qualsequiera d''estes candidatos podría superar lo hashtag en tendencia aprebau per #%{rank}, que actualment ye #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
         title: Etiquetas en tendencia
       subject: Nuevas tendencias asperando estar revisadas en %{instance}
   aliases:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f43d1ad2a6..c1b2677dcc 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1068,8 +1068,6 @@ ar:
       new_trending_statuses:
         title: المنشورات الشائعة
       new_trending_tags:
-        no_approved_tags: لا توجد حاليًا وسوم شائعة موافق عليها.
-        requirements: 'يمكن لأي من هؤلاء المرشحين أن يتجاوز علامة #%{rank} من الوسوم الموافق عليها، وهي حاليا #%{lowest_tag_name} مع نتيجة %{lowest_tag_score}.'
         title: الوسوم المتداولة
       subject: تداولات جديدة في انتظار المراجعة على %{instance}
   aliases:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 96a2720126..d8703b7992 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -635,6 +635,7 @@ be:
       created_at: Створана
       delete_and_resolve: Выдаліць допісы
       forwarded: Пераслана
+      forwarded_replies_explanation: Гэтае паведамленне паступіла ад выдаленага карыстальніка і дакранаецца выдаленага змесціва. Яно было накіраванае вам, бо змесціва паведамлення з'яўляецца адказам аднаму з вашых карыстальнікаў.
       forwarded_to: Пераслана на %{domain}
       mark_as_resolved: Пазначыць як вырашаную
       mark_as_sensitive: Пазначыць як далікатны
@@ -1032,8 +1033,6 @@ be:
       new_trending_statuses:
         title: Папулярныя допісы
       new_trending_tags:
-        no_approved_tags: Зараз няма зацверджаных папулярных хэштэгаў.
-        requirements: 'Кожны з гэтых кандыдатаў можа перавысіць #%{rank} зацверджаных папулярных хэштэгаў. Зараз гэта #%{lowest_tag_name} з лікам %{lowest_tag_score}.'
         title: Папулярныя хэштэгі
       subject: Новае ў папулярным для разгляду %{instance}
   aliases:
@@ -1052,7 +1051,7 @@ be:
     localization:
       body: Mastodon перакладаецца добраахвотнікамі.
       guide_link: https://be.crowdin.com/project/mastodon/be
-      guide_link_text: Кожны можа зрабіць унёсак.
+      guide_link_text: Кожны і кожная можа зрабіць унёсак.
     sensitive_content: Далікатны змест
   application_mailer:
     notification_preferences: Змяніць налады эл. пошты
@@ -1575,7 +1574,7 @@ be:
       duration_too_short: гэта занадта хутка
       expired: Апытанне ўжо скончана
       invalid_choice: Абраны варыянт апытання не існуе
-      over_character_limit: не можа быць даўжэй за %{max} сімвалаў кожны
+      over_character_limit: кожны не можа быць даўжэй за %{max} сімвалаў
       self_vote: Вы не можаце галасаваць ва ўласных апытаннях
       too_few_options: павінна быць болей за адзін варыянт
       too_many_options: колькасць варыянтаў не можа перавышаць %{max}
@@ -1764,7 +1763,7 @@ be:
       public: Публічны
       public_long: Усе могуць бачыць
       unlisted: Не ў спісе
-      unlisted_long: Кожны можа ўбачыць гэты допіс, але ён не паказваецца ў публічных стужках
+      unlisted_long: Усе могуць пабачыць гэты допіс, але ён не паказваецца ў публічных стужках
   statuses_cleanup:
     enabled: Аўтаматычна выдаляць старыя допісы
     enabled_hint: Аўтаматычна выдаляць вашыя допісы, калі яны дасягаюць вызначанага тэрміну, акрамя наступных выпадкаў
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 9da8343019..b06c5404c7 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -611,6 +611,7 @@ bg:
       created_at: Докладвано
       delete_and_resolve: Изтриване на публикациите
       forwarded: Препратено
+      forwarded_replies_explanation: Този доклад е от отдалечен потребител и за отдалечено съдържание. То е препратено до вас, защото докладваното съдържание е в отговор на един от потребителите ви.
       forwarded_to: Препратено до %{domain}
       mark_as_resolved: Маркиране като решено
       mark_as_sensitive: Означаване като деликатно
@@ -996,8 +997,6 @@ bg:
       new_trending_statuses:
         title: Налагащи се публикации
       new_trending_tags:
-        no_approved_tags: Сега няма одобрени налагащи се хаштагове.
-        requirements: 'Всеки от тези кандидати може да надмине #%{rank} одобрен актуален хаштаг, който в момента е #%{lowest_tag_name} с резултат %{lowest_tag_score}.'
         title: Налагащи се хаштагове
       subject: Нови нашумели, готови за преглед в %{instance}
   aliases:
@@ -1368,6 +1367,7 @@ bg:
       '86400': 1 ден
     expires_in_prompt: Никога
     generate: Генериране на линк за покана
+    invalid: Тази покана не е валидна
     invited_by: 'Бяхте поканени от:'
     max_uses:
       one: 1 използване
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 03b3ff3c23..0d7605f023 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -534,6 +534,7 @@ ca:
       total_reported: Informes sobre ells
       total_storage: Adjunts multimèdia
       totals_time_period_hint_html: Els totals mostrats a sota incloeixen dades de tots els temps.
+      unknown_instance: A hores d'ara no hi ha cap registre d'aquest domini al servidor.
     invites:
       deactivate_all: Desactiva-ho tot
       filter:
@@ -610,6 +611,7 @@ ca:
       created_at: Denunciat
       delete_and_resolve: Elimina les publicacions
       forwarded: Reenviat
+      forwarded_replies_explanation: Aquesta denúncia és d'un usuari extern i sobre contingut extern. Se t'han reenviat perquè el contingut denunciat és en resposta a un dels teus usuaris.
       forwarded_to: Reenviat a %{domain}
       mark_as_resolved: Marca com a resolt
       mark_as_sensitive: Marca com a sensible
@@ -995,8 +997,6 @@ ca:
       new_trending_statuses:
         title: Tuts en tendència
       new_trending_tags:
-        no_approved_tags: Actualment no hi ha etiquetes en tendència aprovades.
-        requirements: 'Qualsevol d''aquests candidats podria superar el #%{rank} de la etiqueta en tendència aprovada, que actualment és "%{lowest_tag_name}" amb una puntuació de %{lowest_tag_score}.'
         title: Etiquetes en tendència
       subject: Noves tendències pendents de revisar a %{instance}
   aliases:
@@ -1040,6 +1040,13 @@ ca:
       hint_html: Una cosa més! Necessitem confirmar que ets una persona humana (és així com mantenim a ratlla l'spam). Resolt el CAPTCHA inferior i clica a "Segueix".
       title: Revisió de seguretat
     confirmations:
+      awaiting_review: S'ha confirmat la teva adreça-e. El personal de %{domain} revisa ara el registre. Rebràs un correu si t'aproven el compte.
+      awaiting_review_title: S'està revisant la teva inscripció
+      clicking_this_link: en clicar aquest enllaç
+      login_link: inici de sessió
+      proceed_to_login_html: Ara pots passar a %{login_link}.
+      registration_complete: La teva inscripció a %{domain} ja és completa.
+      welcome_title: Hola, %{name}!
       wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
     delete_account: Elimina el compte
     delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació.
@@ -1571,6 +1578,8 @@ ca:
     over_daily_limit: Has superat el límit de %{limit} tuts programats per a avui
     over_total_limit: Has superat el límit de %{limit} tuts programats
     too_soon: La data programada ha de ser futura
+  self_destruct:
+    title: Aquest servidor tancarà
   sessions:
     activity: Última activitat
     browser: Navegador
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 15ca094708..e3e804172a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1029,8 +1029,6 @@ cs:
       new_trending_statuses:
         title: Populární příspěvky
       new_trending_tags:
-        no_approved_tags: Momentálně nejsou žádné schválené populární hashtagy.
-        requirements: 'Kterýkoliv z těchto kandidátů by mohl předehnat schválený populární hashtag #%{rank}, kterým je momentálně #%{lowest_tag_name} se skóre %{lowest_tag_score}.'
         title: Populární hashtagy
       subject: Nové trendy k posouzení na %{instance}
   aliases:
@@ -1074,6 +1072,10 @@ cs:
       hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
       title: Bezpečnostní kontrola
     confirmations:
+      awaiting_review_title: Vaše registrace se ověřuje
+      clicking_this_link: kliknutím na tento odkaz
+      registration_complete: Vaše registrace na %{domain} je hotová!
+      welcome_title: Vítám uživatele %{name}!
       wrong_email_hint: Pokud není e-mail správný, můžete si ho změnit v nastavení účtu.
     delete_account: Odstranit účet
     delete_account_html: Chcete-li odstranit svůj účet, <a href="%{path}">pokračujte zde</a>. Budete požádáni o potvrzení.
@@ -1770,6 +1772,9 @@ cs:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+  translation:
+    errors:
+      too_many_requests: Na překladatelskou službu bylo zasláno v poslední době příliš mnoho požadavků.
   two_factor_authentication:
     add: Přidat
     disable: Vypnout 2FA
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index c9d5b88284..7f60e93422 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1068,8 +1068,6 @@ cy:
       new_trending_statuses:
         title: Postiadau sy'n trendio
       new_trending_tags:
-        no_approved_tags: Ar hyn o bryd nid oes unrhyw hashnodau trendio cymeradwy.
-        requirements: 'Gallai unrhyw un o''r ymgeiswyr hyn ragori ar yr hashnod trendio cymeradwy #%{rank}, sef #%{lowest_tag_name} gyda sgôr o %{lowest_tag_score} ar hyn o bryd.'
         title: Hashnodau sy'n trendio
       subject: Trendiau newydd i'w hadolygu ar %{instance}
   aliases:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 13010e1adf..6403ac1ccb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -611,6 +611,7 @@ da:
       created_at: Anmeldt
       delete_and_resolve: Slet indlæg
       forwarded: Videresendt
+      forwarded_replies_explanation: Denne anmeldelse er fra en ekstern bruger og om eksternt indhold. Den er videresendt til dig, da det anmeldte indhold er som svar til en af dine brugere.
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Markér som løst
       mark_as_sensitive: Markér som sensitiv
@@ -996,8 +997,6 @@ da:
       new_trending_statuses:
         title: Populære opslag
       new_trending_tags:
-        no_approved_tags: Der er pt. ingen godkendte populære hashtags.
-        requirements: 'Enhver af disse kandidater vil kunne overgå #%{rank} godkendte populære hastag, der med en score på #%{lowest_tag_score} pt. er %{lowest_tag_name}.'
         title: Populære hashtags
       subject: Nye tendenser klar til revision på %{instance}
   aliases:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 81fa4b57f3..e084fdf702 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -611,6 +611,7 @@ de:
       created_at: Gemeldet
       delete_and_resolve: Beiträge löschen
       forwarded: Weitergeleitet
+      forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an Dich weitergeleitet, weil er eine Antwort auf ein bei Dir registriertes Profil ist.
       forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als geklärt markieren
       mark_as_sensitive: Mit einer Inhaltswarnung versehen
@@ -996,8 +997,6 @@ de:
       new_trending_statuses:
         title: Angesagte Beiträge
       new_trending_tags:
-        no_approved_tags: Es gibt keine genehmigten Hashtags, die gerade im Trend liegen.
-        requirements: 'Jeder dieser Kandidaten könnte den #%{rank} genehmigten angesagten Hashtag übertreffen, der derzeit #%{lowest_tag_name} mit einer Punktzahl von %{lowest_tag_score} ist.'
         title: Angesagte Hashtags
       subject: Neue Trends zur Überprüfung auf %{instance}
   aliases:
@@ -1238,7 +1237,7 @@ de:
       home: Startseite und Listen
       notifications: Benachrichtigungen
       public: Öffentliche Timelines
-      thread: Unterhaltungen
+      thread: Private Erwähnungen
     edit:
       add_keyword: Schlagwort hinzufügen
       keywords: Schlagwörter
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 6c5cb837ac..5429b217d0 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -1 +1,117 @@
+---
 lt:
+  devise:
+    confirmations:
+      confirmed: Tavo el. pašto adresas buvo sėkmingai patvirtintas.
+      send_instructions: Po kelių minučių gausi el. laišką su instrukcijomis, kaip patvirtinti savo el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      send_paranoid_instructions: Jei tavo el. pašto adresas yra mūsų duomenų bazėje, po kelių minučių gausi el. laišką su instrukcijomis, kaip patvirtinti savo el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+    failure:
+      already_authenticated: Tu jau prisijungęs (-usi).
+      inactive: Tavo paskyra dar nėra aktyvuota.
+      invalid: Netinkami %{authentication_keys} arba slaptažodis.
+      last_attempt: Turi dar vieną bandymą, kol tavo paskyra bus užrakinta.
+      locked: Tavo paskyra užrakinta.
+      not_found_in_database: Netinkami %{authentication_keys} arba slaptažodis.
+      pending: Tavo paskyra vis dar peržiūrima.
+      timeout: Tavo seansas baigėsi. Norėdamas (-a) tęsti, prisijunk dar kartą.
+      unauthenticated: Prieš tęsdamas (-a) turi prisijungti arba užsiregistruoti.
+      unconfirmed: Prieš tęsdamas (-a) turi patvirtinti savo el. pašto adresą.
+    mailer:
+      confirmation_instructions:
+        action: Patvirtinti el. pašto adresą
+        action_with_app: Patvirtinti ir grįžti į %{app}
+        explanation: Šiuo el. pašto adresu sukūrei paskyrą %{host}. Iki jos aktyvavimo liko vienas paspaudimas. Jei tai buvo ne tu, ignoruok šį el. laišką.
+        explanation_when_pending: Šiuo el. pašto adresu pateikei paraišką pakvietimui į %{host}. Kai patvirtinsi savo el. pašto adresą, mes peržiūrėsime tavo paraišką. Gali prisijungti ir pakeisti savo duomenis arba ištrinti paskyrą, tačiau negalėsi naudotis daugeliu funkcijų, kol tavo paskyra nebus patvirtinta. Jei tavo paraiška bus atmesta, duomenys bus pašalinti, todėl jokių papildomų veiksmų iš tavęs nereikės. Jei tai buvo ne tu, ignoruok šį el. laišką.
+        extra_html: Taip pat peržiūrėk <a href="%{terms_path}">serverio taisykles</a> ir <a href="%{policy_path}">mūsų paslaugų teikimo sąlygas</a>.
+        subject: 'Mastodon: patvirtinimo instrukcijos %{instance}'
+        title: Patvirtinti el. pašto adresą
+      email_changed:
+        explanation: 'Tavo paskyros el. pašto adresas yra keičiamas į:'
+        extra: Jei el. pašto nepakeitei, tikėtina, kad kažkas įgijo prieigą prie tavo paskyros. Nedelsiant pakeisk slaptažodį arba kreipkis į serverio administratorių (-ę), jei tavo paskyra užrakinta.
+        subject: 'Mastodon: el. paštas pakeistas'
+        title: Naujas el. pašto adresas
+      password_change:
+        explanation: Pakeistas tavo paskyros slaptažodis.
+        extra: Jei slaptažodio nepakeitei, tikėtina, kad kažkas įgijo prieigą prie tavo paskyros. Nedelsiant pakeisk slaptažodį arba kreipkis į serverio administratorių (-ę), jei tavo paskyra užrakinta.
+        subject: 'Mastodon: slaptažodis pakeistas'
+        title: Pakeistas slaptažodis
+      reconfirmation_instructions:
+        explanation: Patvirtink naująjį adresą, kad pakeistum savo el. paštą.
+        extra: Jei šį pakeitimą pradėjai ne tu, ignoruok šį el. laišką. Mastodon paskyros el. pašto adresas nepasikeis, kol nepasinaudosi aukščiau pateikta nuoroda.
+        subject: 'Mastodon: patvirtinti el. paštą %{instance}'
+        title: Patvirtinti el. pašto adresą
+      reset_password_instructions:
+        action: Keisti slaptažodį
+        explanation: Paprašei naujo paskyros slaptažodžio.
+        extra: Jei to neprašei, ignoruok šį el. laišką. Tavo slaptažodis nepasikeis, kol nepasinaudosi aukščiau esančia nuoroda ir nesusikursi naują.
+        subject: 'Mastodon: slaptažodžio keitimo instrukcijos'
+        title: Slaptažodžio keitimas
+      two_factor_disabled:
+        explanation: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas. Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
+        subject: 'Mastodon: dviejų tapatybės patikrinimas išjungtas'
+        title: 2FA išjungta
+      two_factor_enabled:
+        explanation: Tavo paskyrai įgalintas dvejų tapatybės patikrinimas. Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
+        subject: 'Mastodon: dviejų tapatybės patikrinimas įgalintas'
+        title: 2FA įgalinta
+      two_factor_recovery_codes_changed:
+        explanation: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
+        subject: 'Mastodon: dviejų tapatybės atkūrimo kodai iš naujo sugeneruoti'
+        title: Pakeisti 2FA atkūrimo kodai
+      unlock_instructions:
+        subject: 'Mastodon: atrakinimo instrukcijos'
+      webauthn_credential:
+        added:
+          explanation: Į tavo paskyrą buvo pridėtas šis saugumo raktas
+          subject: 'Mastodon: naujas saugumo raktas'
+          title: Pridėtas naujas saugumo raktas
+        deleted:
+          explanation: Iš tavo paskyros buvo ištrintas šis saugumo raktas
+          subject: 'Mastodon: saugumo raktas ištrintas'
+          title: Vienas iš tavo saugumo raktų buvo ištrintas
+      webauthn_disabled:
+        explanation: Tavo paskyrai buvo išjungtas tapatybės nustatymas naudojant saugumo raktus. Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
+        subject: 'Mastodon: tapatybės nustatymas naudojant saugumo raktai išjungta'
+        title: Saugumo raktai išjungti
+      webauthn_enabled:
+        explanation: Saugumo rakto tapatybės nustatymas tavo paskyrai įgalintas. Dabar prisijungimui galima naudoti saugumo raktą.
+        subject: 'Mastodon: saugumo rakto tapatybės nustatymas įgalintas'
+        title: Saugumo raktai įgalinti
+    omniauth_callbacks:
+      failure: Nepavyko nustatyti tapatybės iš %{kind}, nes „%{reason}“.
+      success: Sėkmingai nustatyta tapatybė iš %{kind} paskyros.
+    passwords:
+      no_token: Į šį puslapį gali patekti tik gavęs (-usi) slaptažodžio keitimo el. laišką. Jei atėjai iš slaptažodžio keitimo el. laiško, įsitikink, kad naudojai visą pateiktą URL adresą.
+      send_instructions: Jei tavo el. pašto adresas egzistuoja mūsų duomenų bazėje, po kelių minučių į savo el. pašto adresą gausi slaptažodžio atkūrimo nuorodą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      send_paranoid_instructions: Jei tavo el. pašto adresas egzistuoja mūsų duomenų bazėje, po kelių minučių į savo el. pašto adresą gausi slaptažodžio atkūrimo nuorodą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      updated: Tavo slaptažodis buvo sėkmingai pakeistas. Dabar esi prisijungęs (-usi).
+      updated_not_active: Tavo slaptažodis buvo sėkmingai pakeistas.
+    registrations:
+      destroyed: Iki pasimatymo! Tavo paskyra sėkmingai atšaukta. Tikimės, kad netrukus vėl pamatysime tave.
+      signed_up: Sveiki! Tu sėkmingai užsiregistravai.
+      signed_up_but_inactive: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar nėra aktyvuota.
+      signed_up_but_locked: Sėkmingai užsiregistravai. Tačiau negalėjome tavęs prijungti, nes tavo paskyra dar užrakinta.
+      signed_up_but_pending: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspaudęs (-usi) nuorodą, peržiūrėsime tavo paraišką. Tau bus pranešta, jei ji patvirtinta.
+      signed_up_but_unconfirmed: Į tavo el. pašto adresą buvo išsiųstas laiškas su patvirtinimo nuoroda. Paspausk nuorodą, kad aktyvuotum savo paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      update_needs_confirmation: Sėkmingai atnaujinai savo paskyrą, bet mums reikia patvirtinti naująjį el. pašto adresą. Patikrink savo el. paštą ir paspausk patvirtinimo nuorodą, kad patvirtintum savo naują el. pašto adresą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      updated: Tavo paskyra buvo sėkmingai atnaujinta.
+    sessions:
+      already_signed_out: Atsijungta sėkmingai.
+      signed_in: Prisijungta sėkmingai.
+      signed_out: Atjungta sėkmingai.
+    unlocks:
+      send_instructions: Po kelių minučių gausi el. laišką su instrukcijomis, kaip atrakinti paskyrą. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      send_paranoid_instructions: Jei paskyra egzistuoja, po kelių minučių gausi el. laišką su instrukcijomis, kaip ją atrakinti. Jei negavai šio el. laiško, patikrink šlamšto aplanką.
+      unlocked: Tavo paskyra sėkmingai atrakinta. Norėdamas (-a) tęsti, prisijunk.
+  errors:
+    messages:
+      already_confirmed: jau buvo patvirtintas, pabandyk prisijungti.
+      confirmation_period_expired: turi būti patvirtintas per %{period}, paprašyk naujo.
+      expired: nustojo galioti, paprašyk naujos.
+      not_found: nerasta.
+      not_locked: nebuvo užrakintas.
+      not_saved:
+        few: "%{count} klaidos neleido išsaugoti šio %{resource}:"
+        many: "%{count} klaido neleido išsaugoti šio %{resource}:"
+        one: '1 klaida neleido išsaugoti šio %{resource}:'
+        other: "%{count} klaidų neleido išsaugoti šio %{resource}:"
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index c01beb796b..de977426f2 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -9,7 +9,7 @@ zh-TW:
       already_authenticated: 您已登入。
       inactive: 您的帳號尚未啟用。
       invalid: 無效的 %{authentication_keys} 或密碼。
-      last_attempt: 在帳號鎖定前，您還有最後一次嘗試機會。
+      last_attempt: 帳號鎖定前，您還有最後一次嘗試機會。
       locked: 已鎖定您的帳號。
       not_found_in_database: 無效的 %{authentication_keys} 或密碼。
       pending: 您的帳號仍在審核中。
@@ -20,8 +20,8 @@ zh-TW:
       confirmation_instructions:
         action: 驗證電子郵件地址
         action_with_app: 確認並返回 %{app}
-        explanation: 您已經在 %{host} 上以此電子郵件地址建立了一支帳號。您距離啟用它只剩一點之遙了。若這不是您，請忽略此信件。
-        explanation_when_pending: 您使用此電子郵件地址申請了 %{host} 的邀請。當您確認電子郵件地址後我們將審核您的申請。您可以在登入後變更詳細資訊或刪除您的帳號，但直到您的帳號被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您本人，請忽略此郵件。
+        explanation: 您已於 %{host} 上以此電子郵件地址建立了一支帳號。您距離啟用它只剩一點之遙了。若這不是您，請忽略此信件。
+        explanation_when_pending: 您使用此電子郵件地址申請了 %{host} 的邀請。當您確認電子郵件地址後我們將審核您的申請。您能於登入後變更詳細資訊或刪除您的帳號，但直到您的帳號被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您本人，請忽略此郵件。
         extra_html: 同時也請看看<a href="%{terms_path}">伺服器規則</a>與<a href="%{policy_path}">服務條款</a>。
         subject: Mastodon：%{instance} 確認說明
         title: 驗證電子郵件地址
@@ -37,7 +37,7 @@ zh-TW:
         title: 密碼已變更
       reconfirmation_instructions:
         explanation: 請確認新的電子郵件地址以變更。
-        extra: 若此次變更不是由您起始的，請忽略此信件。Mastodon 帳號的電子郵件地址在您存取上面的連結前不會變更。
+        extra: 若此次變更不是由您起始的，請忽略此信件。Mastodon 帳號的電子郵件地址於您存取上面的連結前不會變更。
         subject: Mastodon：確認 %{instance} 的電子郵件地址
         title: 驗證電子郵件地址
       reset_password_instructions:
@@ -106,7 +106,7 @@ zh-TW:
   errors:
     messages:
       already_confirmed: 已經確認，請嘗試登入
-      confirmation_period_expired: 需要在 %{period} 內完成驗證。請重新申請
+      confirmation_period_expired: 您需要於 %{period} 內完成驗證。請重新申請
       expired: 已經過期，請重新請求
       not_found: 找不到
       not_locked: 並未鎖定
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index cc7b88a282..552dfeba37 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -125,7 +125,7 @@ de:
         all: Voller Zugriff auf dein Mastodon-Konto
         blocks: Blockierungen
         bookmarks: Lesezeichen
-        conversations: Unterhaltungen
+        conversations: Private Erwähnungen
         crypto: Ende-zu-Ende-Verschlüsselung
         favourites: Favoriten
         filters: Filter
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 8e6e4b8aaa..4721e3acdb 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -27,7 +27,7 @@ ko:
       confirmations:
         destroy: 확실합니까?
       edit:
-        title: 애플리케이션 수정
+        title: 애플리케이션 편집
       form:
         error: 이런! 오류를 확인하세요
       help:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 6073096c31..c0d42ec7b3 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -72,7 +72,7 @@ zh-TW:
         revoke: 您確定嗎？
       index:
         authorized_at: 於 %{date} 授權
-        description_html: 這些應用程式能透過 API 存取您的帳號。若有您不認得之應用程式，或應用程式行為異常，您可以於此註銷其存取權限。
+        description_html: 這些應用程式能透過 API 存取您的帳號。若有您不認得之應用程式，或應用程式行為異常，您能於此註銷其存取權限。
         last_used_at: 上次使用時間 %{date}
         never_used: 從未使用
         scopes: 權限
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c4c3d39397..4c58bfda0a 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -938,8 +938,6 @@ el:
       new_trending_statuses:
         title: Αναρτήσεις σε τάση
       new_trending_tags:
-        no_approved_tags: Προς το παρόν δεν υπάρχουν εγκεκριμένες ετικέτεςσε τάση.
-        requirements: 'Οποιοσδήποτε από αυτούς τους υποψηφίους θα μπορούσε να ξεπεράσει την #%{rank} εγκεκριμένη ετικέτα σε τάση, που επί του παρόντος είναι #%{lowest_tag_name} με βαθμολογία %{lowest_tag_score}.'
         title: Ετικέτες σε τάση
       subject: Νέες τάσεις προς αξιολόγηση στο %{instance}
   aliases:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 98a40c45cf..987788a7ad 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -995,8 +995,6 @@ en-GB:
       new_trending_statuses:
         title: Trending posts
       new_trending_tags:
-        no_approved_tags: There are currently no approved trending hashtags.
-        requirements: 'Any of these candidates could surpass the #%{rank} approved trending hashtag, which is currently #%{lowest_tag_name} with a score of %{lowest_tag_score}.'
         title: Trending hashtags
       subject: New trends up for review on %{instance}
   aliases:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7319de53db..15d682d173 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -611,6 +611,7 @@ en:
       created_at: Reported
       delete_and_resolve: Delete posts
       forwarded: Forwarded
+      forwarded_replies_explanation: This report is from a remote user and about remote content. It has been forwarded to you because the reported content is in reply to one of your users.
       forwarded_to: Forwarded to %{domain}
       mark_as_resolved: Mark as resolved
       mark_as_sensitive: Mark as sensitive
@@ -996,8 +997,6 @@ en:
       new_trending_statuses:
         title: Trending posts
       new_trending_tags:
-        no_approved_tags: There are currently no approved trending hashtags.
-        requirements: 'Any of these candidates could surpass the #%{rank} approved trending hashtag, which is currently #%{lowest_tag_name} with a score of %{lowest_tag_score}.'
         title: Trending hashtags
       subject: New trends up for review on %{instance}
   aliases:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 066899995f..9ae5953943 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -773,6 +773,8 @@ eo:
     site_uploads:
       delete: Forigi elŝutitan dosieron
       destroyed_msg: Reteja alŝuto sukcese forigita!
+    software_updates:
+      documentation_link: Lerni pli
     statuses:
       account: Skribanto
       application: Aplikaĵo
@@ -950,8 +952,6 @@ eo:
       new_trending_statuses:
         title: Popularaĝaj mesaĝoj
       new_trending_tags:
-        no_approved_tags: Nun ne havas aprobitajn popularajn kradvortojn.
-        requirements: Ajn ĉi tiu eroj povas superi la %{rank}an kradvorton kiu estas %{lowest_tag_name} kun %{lowest_tag_score} puentoj.
         title: Tendencantaj kradvortoj
       subject: Novaj popularaĵoj bezonas kontrolitis ĉe %{instance}
   aliases:
@@ -994,6 +994,8 @@ eo:
       help_html: Se vi havas problemojn solvi la CAPTCHA, vi povas kontakti nin per %{email} kaj ni povas helpi vin.
       title: Sekureckontrolo
     confirmations:
+      login_link: ensaluti
+      welcome_title: Bonvenon, %{name}!
       wrong_email_hint: Se tiu retpoŝtadreso ne estas ĝusta, vi povas ŝanĝi ĝin en la agordoj pri la konto.
     delete_account: Forigi konton
     delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton.
@@ -1720,6 +1722,10 @@ eo:
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
     signed_in_as: 'Salutinta kiel:'
   verification:
+    extra_instructions_html: <strong>Konsilo:</strong> La ligilo en via retejo povas esti nevidebla. La grava parto estas <code>rel="me"</code>, kiu evitas identoŝtelon en retejoj kun enhavo generita de uzantoj. Vi povas eĉ uzi <code>link</code>-etikedon en la <code>header</code> de la paĝo anstataŭ <code>a</code>, sed la HTML devas esti atingebla sen plenumado de JavaScript.
+    here_is_how: Jen gvidilo
+    hint_html: "<strong>Ĉiu ajn povas aŭtentigi sian identecon en Mastodon.</strong> Bazinte sur malfermitaj interretaj normoj, nun kaj ĉiame senkoste. Vi nur bezonas personan retejon, per kiu homoj rekonas vin. Kiam vi ligos tiun retejon de via profilo, ni kontrolos, ĉu la retejo responde ligiĝas kun via profilo, kaj montros videblan indikilon tie."
+    instructions_html: Kopiu kaj algluu la jenan kodon en la HTML de via retejo. Poste aldonu la adreson de via retejo en unu el la kromaj kampoj de via profilo en la langeto "Redakti profilon" kaj konservu la ŝanĝojn.
     verification: Kontrolo
     verified_links: Via kontrolitaj ligiloj
   webauthn_credentials:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 9175a1fc1a..0000c297ad 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -611,6 +611,7 @@ es-AR:
       created_at: Denunciado
       delete_and_resolve: Eliminar mensajes
       forwarded: Reenviado
+      forwarded_replies_explanation: Esta denuncia es de un usuario remoto y sobre contenido remoto. Se te reenvió porque el contenido denunciado es en respuesta a uno de tus usuarios.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelta
       mark_as_sensitive: Marcar como sensible
@@ -996,8 +997,6 @@ es-AR:
       new_trending_statuses:
         title: Mensajes en tendencia
       new_trending_tags:
-        no_approved_tags: Actualmente no hay etiquetas en tendencia aprobadas.
-        requirements: 'Cualquiera de estos candidatos podría superar la etiqueta en tendencia aprobada de #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
         title: Etiquetas en tendencia
       subject: Nuevas tendencias para revisar en %{instance}
   aliases:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 75d329b0ae..424262ca19 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -611,6 +611,7 @@ es-MX:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicaciones
       forwarded: Reenviado
+      forwarded_replies_explanation: Este reporte es de un usuario remoto y sobre contenido remoto. Se le ha enviado porque el contenido reportado es en respuesta a uno de sus usuarios.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
       mark_as_sensitive: Marcar como sensible
@@ -996,8 +997,6 @@ es-MX:
       new_trending_statuses:
         title: Publicaciones en tendencia
       new_trending_tags:
-        no_approved_tags: Actualmente no hay ninguna etiqueta en tendencia aprobada.
-        requirements: 'Cualquiera de estos candidatos podría superar el hashtag en tendencia aprobado por #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
         title: Etiquetas en tendencia
       subject: Nuevas tendencias esperando ser revisadas en %{instance}
   aliases:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 34d1c85dc0..f4a70e5e57 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -611,6 +611,7 @@ es:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicaciones
       forwarded: Reenviado
+      forwarded_replies_explanation: Este informe es de un usuario remoto y sobre contenido remoto. Se le ha enviado porque el contenido reportado es en respuesta a uno de sus usuarios.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
       mark_as_sensitive: Marcar como sensible
@@ -996,8 +997,6 @@ es:
       new_trending_statuses:
         title: Publicaciones en tendencia
       new_trending_tags:
-        no_approved_tags: Actualmente no hay ninguna etiqueta en tendencia aprobada.
-        requirements: 'Cualquiera de estos candidatos podría superar el hashtag en tendencia aprobado por #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
         title: Etiquetas en tendencia
       subject: Nuevas tendencias esperando ser revisadas en %{instance}
   aliases:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 4f5a83624e..fb0fdc3a3e 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -981,8 +981,6 @@ et:
       new_trending_statuses:
         title: Trendikad postitused
       new_trending_tags:
-        no_approved_tags: Hetkel ei ole ühtegi heaks kiidetud populaarset silti.
-        requirements: 'Need on siltide kandidaadid mille hulgast ükskõik milline võib järjekorras mööda jõuda #%{rank} kohal olevast heaks kiidetud sildist. See on hetkel #%{lowest_tag_name} mille seis on %{lowest_tag_score}.'
         title: Trendikad sildid
       subject: Uued %{instance} trendid ülevaatuseks
   aliases:
@@ -1806,7 +1804,7 @@ et:
         Kui mõni asi arusaamatuks jääb, siis võib vaadata juhendvideot: https://youtu.be/J4ItbTOAw7Q
       explanation: Siin on mõned nõuanded, mis aitavad alustada
       final_action: Alusta postitamist
-      final_step: 'Nüüd tee oma esimene postitus. Hea tava on uues kohas ennast tutvustada ning kindlasti kasuta selles postituses ka teemaviidet #tutvustus. Isegi kui sul ei ole veel jälgijaid, siis su postitusi näevad kohalikul ajajoonel ka kõik teised serveri kasutajad.'
+      final_step: 'Nüüd tee oma esimene postitus. Hea tava on uues kohas ennast tutvustada ning kindlasti kasuta selles postituses ka silti #tutvustus. Isegi kui sul ei ole veel jälgijaid, siis su postitusi näevad kohalikul ajajoonel ka kõik teised serveri kasutajad.'
       full_handle: Kasutajanimi Mastodon võrgustikus
       full_handle_hint: Kui jagad kasutajanime väljaspool serverit, siis kasuta kindlasti pikka nime. Erinevates serverites võib olla sama kasutajanimega liikmeid.
       subject: Tere tulemast Mastodoni
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index dd7575c57a..e3062d9dff 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -613,6 +613,7 @@ eu:
       created_at: Salatua
       delete_and_resolve: Ezabatu bidalketak
       forwarded: Birbidalia
+      forwarded_replies_explanation: Salaketa hau beste instantzia bateko erabiltzaile baten edukiari buruzkoa da, eta zure instantziako erabiltzaile bati egidako erantzuna delako bidali dizugu mezu hau.
       forwarded_to: 'Hona birbidalia: %{domain}'
       mark_as_resolved: Markatu konpondutako gisa
       mark_as_sensitive: Markatu hunkigarri gisa
@@ -993,8 +994,6 @@ eu:
       new_trending_statuses:
         title: Bidalketen joerak
       new_trending_tags:
-        no_approved_tags: Ez dago onartutako traolen joerarik une honetan.
-        requirements: 'Hautagai hauek joeretan onartutako %{rank}. traola gainditu dezakete: une honetan #%{lowest_tag_name} da, %{lowest_tag_score} puntuazioarekin.'
         title: Traolak joeran
       subject: Joera berriak daude berrikusteko %{instance} instantzian
   aliases:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 04fb52e757..f93aac6031 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -848,7 +848,6 @@ fa:
       new_trending_statuses:
         title: فرسته‌های داغ
       new_trending_tags:
-        no_approved_tags: در حال حاضر هیچ برچسب پرطرفداری پذیرفته نشده است.
         title: برچسب‌های داغ
       subject: موضوغ داغ تازه‌ای در %{instance} نیازمند بررسی است
   aliases:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4fe0179dfe..d48653edcc 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -611,6 +611,7 @@ fi:
       created_at: Raportoitu
       delete_and_resolve: Poista julkaisut
       forwarded: Välitetty
+      forwarded_replies_explanation: Tämä raportti on etäkäyttäjältä ja koskee etäsisältöä. Se on välitetty sinulle, koska raportoitu sisältö on vastaus jollekin käyttäjällesi.
       forwarded_to: Välitetty %{domain}
       mark_as_resolved: Merkitse ratkaistuksi
       mark_as_sensitive: Merkitse arkaluonteiseksi
@@ -996,8 +997,6 @@ fi:
       new_trending_statuses:
         title: Suositut julkaisut
       new_trending_tags:
-        no_approved_tags: Tällä hetkellä ei ole hyväksyttyjä suosittuja aihetunnisteita.
-        requirements: 'Mikä tahansa näistä ehdokkaista voisi ylittää #%{rank} hyväksytyn suositun aihetunnisteen, joka on tällä hetkellä #%{lowest_tag_name} %{lowest_tag_score} pisteellä.'
         title: Suositut aihetunnisteet
       subject: Uusia trendejä tarkistettavaksi instanssissa %{instance}
   aliases:
@@ -1368,6 +1367,7 @@ fi:
       '86400': 1 vuorokausi
     expires_in_prompt: Ei koskaan
     generate: Luo
+    invalid: Tämä kutsu ei ole kelvollinen
     invited_by: 'Sinut kutsui:'
     max_uses:
       one: kertakäyttöinen
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index ffa54f588e..726c9607e2 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -996,8 +996,6 @@ fo:
       new_trending_statuses:
         title: Vælumtóktir postar
       new_trending_tags:
-        no_approved_tags: Í løtuni eru eingi góðkend vælumtókt frámerki.
-        requirements: 'Einhvør av hesum kandidatum kunnu fara framum #%{rank} góðkenda vælumtókta frámerki, sum í løtuni er #%{lowest_tag_name} við stigatali %{lowest_tag_score}.'
         title: Vælumtókt frámerki
       subject: Nýggj rák til gjøgnumgongd á %{instance}
   aliases:
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
index f7425ea320..3aba8713f6 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@@ -996,8 +996,6 @@ fr-QC:
       new_trending_statuses:
         title: Messages tendance
       new_trending_tags:
-        no_approved_tags: Il n'y a pas de hashtag tendance approuvé actuellement.
-        requirements: 'N''importe quel élément de la sélection pourrait surpasser le hashtag tendance approuvé n°%{rank}, qui est actuellement #%{lowest_tag_name} avec un résultat de %{lowest_tag_score}.'
         title: Hashtags tendance
       subject: Nouvelles tendances à examiner sur %{instance}
   aliases:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 289afb2268..a69a5b535d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -996,8 +996,6 @@ fr:
       new_trending_statuses:
         title: Messages tendance
       new_trending_tags:
-        no_approved_tags: Il n'y a pas de hashtag tendance approuvé actuellement.
-        requirements: 'N''importe quel élément de la sélection pourrait surpasser le hashtag tendance approuvé n°%{rank}, qui est actuellement #%{lowest_tag_name} avec un résultat de %{lowest_tag_score}.'
         title: Hashtags tendance
       subject: Nouvelles tendances à examiner sur %{instance}
   aliases:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index de609a14dd..a08b3a401e 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -611,6 +611,7 @@ fy:
       created_at: Rapportearre op
       delete_and_resolve: Berjocht fuortsmite
       forwarded: Trochstjoerd
+      forwarded_replies_explanation: Dit rapport komt fan in eksterne brûker en giet oer eksterne ynhâld. It is nei jo trochstjoerd, omdat de rapportearre ynhâld in reaksje is op ien fan jo brûkers.
       forwarded_to: Trochstjoerd nei %{domain}
       mark_as_resolved: As oplost markearje
       mark_as_sensitive: As gefoelich markearje
@@ -996,8 +997,6 @@ fy:
       new_trending_statuses:
         title: Trending berjochten
       new_trending_tags:
-        no_approved_tags: Op dit stuit binne der gjin goedkarre hashtags.
-        requirements: 'Elk fan dizze kandidaten kin de #%{rank} goedkarre trending hashtag oertreffe, dy’t op dit stuit #%{lowest_tag_name} is mei in skoare fan %{lowest_tag_score}.'
         title: Trending hashtags
       subject: Nije trends te beoardielen op %{instance}
   aliases:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b2ccdd4d9d..965447d4f9 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1032,8 +1032,6 @@ gd:
       new_trending_statuses:
         title: Postaichean a’ treandadh
       new_trending_tags:
-        no_approved_tags: Chan eil taga hais a’ treandadh le aontachadh ann.
-        requirements: "’S urrainn do ghin dhe na tagraichean seo dol thairis air #%{rank} a tha aig an taga hais #%{lowest_tag_name} a’ treandadh as ìsle le aontachadh agus sgòr de %{lowest_tag_score} air."
         title: Tagaichean hais a’ treandadh
       subject: Tha treandaichean ùra a’ feitheamh air lèirmheas air %{instance}
   aliases:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0075c65920..c0e76842f7 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -384,7 +384,7 @@ gl:
     domain_blocks:
       add_new: Engadir novo bloqueo de dominio
       confirm_suspension:
-        cancel: Cancelar
+        cancel: Desbotar
         confirm: Suspender
         permanent_action: Ao retirar a suspensión non restableces os datos ou a relación.
         preamble_html: Vas suspender a <strong>%{domain}</strong> e os seus subdominios.
@@ -611,6 +611,7 @@ gl:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicacións
       forwarded: Reenviado
+      forwarded_replies_explanation: Esta denuncia procede dunha usuaria remota e acerca de contido remoto. Enviouseche unha copia porque o contido denunciado é unha resposta a unha das túas usuarias.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
       mark_as_sensitive: Marcar como sensible
@@ -783,7 +784,7 @@ gl:
       destroyed_msg: Eliminado correctamente o subido!
     software_updates:
       critical_update: Crítica - actualiza axiña
-      description: Recomendamos manter actualizado o teu servidor Mastodon para beneficiarte dos últimos arranxos e características. A maiores, de cando en vez hai actualizacións para evitar problemas importantes de seguridade. Debido a isto, Mastodon comproba cada 30 minutos se hai actualizacións e avisarate seguindo as túas preferencias de notificación por correo electrónico.
+      description: Aconsellamos manter actualizado o teu servidor Mastodon para beneficiarte dos últimos arranxos e características. A maiores, de cando en vez hai actualizacións para evitar problemas importantes de seguridade. Debido a isto, Mastodon comproba cada 30 minutos se hai actualizacións e avisarate seguindo as túas preferencias de notificación por correo electrónico.
       documentation_link: Saber máis
       release_notes: Notas da versión
       title: Actualizacións dispoñibles
@@ -996,8 +997,6 @@ gl:
       new_trending_statuses:
         title: Publicacións en voga
       new_trending_tags:
-        no_approved_tags: Non hai etiquetas en voga aprobadas.
-        requirements: 'Calquera destos candidatos podería superar o #%{rank} dos cancelos en voga aprobados, que actualmente é #%{lowest_tag_name} cunha puntuación de %{lowest_tag_score}.'
         title: Cancelos en voga
       subject: Novas tendencias para revisar en %{instance}
   aliases:
@@ -1790,7 +1789,7 @@ gl:
       change_password: cambia o teu contrasinal
       details: 'Estos son os detalles do acceso:'
       explanation: Detectamos que accedeches á conta desde un novo enderezo IP.
-      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente e activa o segundo factor de autenticación para manter conta segura.
+      further_actions_html: Se non foches ti, aconsellámosche %{action} inmediatamente e activar o segundo factor de autenticación para manter conta segura.
       subject: Accedeuse á túa conta desde novos enderezos IP
       title: Novo acceso
     warning:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 11e5db4539..f2cc882141 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -76,7 +76,7 @@ he:
       enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
       follows: נעקבים
-      header: כותרת
+      header: תמונת נושא
       inbox_url: כתובת תיבת דואר נכנס
       invite_request_text: סיבות להצטרפות
       invited_by: הוזמן על ידי
@@ -128,7 +128,7 @@ he:
       remove_avatar: הסרת תמונת פרופיל
       remove_header: הסרת כותרת
       removed_avatar_msg: תמונת הפרופיל של %{username} הוסרה בהצלחה
-      removed_header_msg: תמונת הראשה של %{username} הוסרה בהצלחה
+      removed_header_msg: תמונת הנושא של %{username} הוסרה בהצלחה
       resend_confirmation:
         already_confirmed: משתמש זה כבר אושר
         send: שלח מחדש קישור לאימות
@@ -635,6 +635,7 @@ he:
       created_at: מדווח
       delete_and_resolve: מחיקת הודעות
       forwarded: קודם
+      forwarded_replies_explanation: דווח זה הגיע מחשבון משתמש חיצוני על תוכן חיצוני. הוא הועבר אליך כיוון שהתוכן שדווח הוא בתשובה למשתמש.ת שלך.
       forwarded_to: קודם ל-%{domain}
       mark_as_resolved: סימון כפתור
       mark_as_sensitive: סימון כרגיש
@@ -786,7 +787,7 @@ he:
         public_timelines: פידים פומביים
         publish_discovered_servers: פרסום שרתים שנתגלו
         publish_statistics: פרסום הסטטיסטיקות בפומבי
-        title: גילוי
+        title: תגליות
         trends: נושאים חמים
       domain_blocks:
         all: לכולם
@@ -1032,8 +1033,6 @@ he:
       new_trending_statuses:
         title: הודעות חמות
       new_trending_tags:
-        no_approved_tags: אין כרגע שום תגיות חמות מאושרות.
-        requirements: כל אחת מהמועמדות האלו עשויה לעבור את התגית החמה המאושרת מדרגה %{rank}, שהיא כרגע %{lowest_tag_name} עם ציון של %{lowest_tag_score}.
         title: תגיות חמות
       subject: נושאים חמים חדשים מוכנים לסקירה ב-%{instance}
   aliases:
@@ -1048,7 +1047,7 @@ he:
     advanced_web_interface_hint: 'אם ברצונך לעשות שימוש במלוא רוחב המסך, ממשק הווב המתקדם מאפשר לך להגדיר עמודות רבות ושונות כדי לראות בו זמנית כמה מידע שתרצה/י: פיד הבית, התראות, פרהסיה ומספר כלשהו של רשימות ותגיות.'
     animations_and_accessibility: הנפשות ונגישות
     confirmation_dialogs: חלונות אישור
-    discovery: גילוי
+    discovery: תגליות
     localization:
       body: מסטודון מתורגם על ידי מתנדבים.
       guide_link: https://crowdin.com/project/mastodon
@@ -1280,7 +1279,7 @@ he:
       keywords: מילות מפתח
       statuses: הודעות מסויימות
       statuses_hint_html: הסנן פועל על בחירה ידנית של הודעות בין אם הן מתאימות למילות המפתח להלן ואם לאו. posts regardless of whether they match the keywords below. <a href="%{path}">בחינה או הסרה של ההודעות מהסנן</a>.
-      title: ערוך מסנן
+      title: לערוך מסנן
     errors:
       deprecated_api_multiple_keywords: לא ניתן לשנות פרמטרים אלו מהיישומון הזה בגלל שהם חלים על יותר ממילת מפתח אחת. ניתן להשתמש ביישומון מעודכן יותר או בממשק הוובי.
       invalid_context: לא סופק הקשר או הקשר לא תקין
@@ -1336,7 +1335,7 @@ he:
     deselect: בטל בחירה של הכל
     none: כלום
     order_by: מיין לפי
-    save_changes: שמור שינויים
+    save_changes: לשמור שינויים
     select_all_matching_items:
       many: בחר.י %{count} פריטים שתאמו לחיפוש שלך.
       one: בחר.י פריט %{count} שתאם לחיפוש שלך.
@@ -1477,7 +1476,7 @@ he:
       not_found: לא נמצאו
       on_cooldown: את/ה בתקופת צינון
     followers_count: עוקבים בזמן המעבר
-    incoming_migrations: מעבר לחשבון אחר
+    incoming_migrations: מעבר מחשבון אחר
     incoming_migrations_html: כדי לעבור מחשבון אחר לחשבון זה, עליך ראשית <a href="%{path}">ליצור שם נרדף לחשבון</a>.
     moved_msg: חשבונך מופנה עתה ל-%{acct} וכל עוקביך מועברים לשם.
     not_redirecting: חשבונכם לא מפנה לשום חשבון אחר כעת.
@@ -1515,8 +1514,8 @@ he:
       subject: הודעתך חובבה על ידי %{name}
       title: חיבוב חדש
     follow:
-      body: "%{name} עכשיו במעקב אחריך!"
-      subject: "%{name} עכשיו במעקב אחריך"
+      body: "%{name} עכשיו עוקב.ת אחריך!"
+      subject: "%{name} עכשיו עוקב.ת אחריך"
       title: עוקב/ת חדש/ה
     follow_request:
       action: ניהול בקשות מעקב
@@ -1780,7 +1779,7 @@ he:
     keep_media_hint: לא מוחק את הודעותיך שמצורפים אליהן קבצי מדיה
     keep_pinned: שמור הודעות מוצמדות
     keep_pinned_hint: לא מוחק אף אחד מההודעות המוצמדות שלך
-    keep_polls: שמור סקרים
+    keep_polls: לשמור סקרים
     keep_polls_hint: לא מוחר אף אחד מהסקרים שלך
     keep_self_bookmark: שמור הודעות שסימנת
     keep_self_bookmark_hint: לא מוחק הודעות שסימנת
@@ -1868,7 +1867,7 @@ he:
         disable: אינך יכול/ה יותר להשתמש בחשבונך, אבל הפרופיל ושאר המידע נשארו על עומדם. ניתן לבקש גיבוי של המידע, לשנות את הגדרות החשבון או למחוק אותו.
         mark_statuses_as_sensitive: כמה מהודעותיך סומנו כרגישות על ידי מנחי הקהילה של %{instance}. זה אומר שאנשים יצטרכו להקיש על המדיה בהודעות לפני שתופיע תצוגה מקדימה. ניתן לסמן את המידע כרגיש בעצמך בהודעותיך העתידיות.
         sensitive: מעתה ואילך כל קבצי המדיה שיועלו על ידך יסומנו כרגישים ויוסתרו מאחורי אזהרה.
-        silence: ניתן עדיין להשתמש בחשבונך אבל רק אנשים שכבר עוקבים אחריך יראו את הודעותיך בשרת זה, וייתכן שתוחרג/י מאמצעי גילוי משתמשים. עם זאת, אחרים יוכלו עדיין לעקוב אחריך.
+        silence: ניתן עדיין להשתמש בחשבונך אבל רק אנשים שכבר עוקבים אחריך יראו את הודעותיך בשרת זה, וייתכן שתוחרג/י ממסכי התגליות. עם זאת, אחרים יוכלו עדיין לעקוב אחריך.
         suspend: לא ניתן יותר להשתמש בחשבונך, ופרופילך וכל מידע אחר לא נגישים יותר. ניתן עדיין להתחבר על מנת לבקש גיבוי של המידע שלך עד שיוסר סופית בעוד כ-30 יום, אבל מידע מסויים ישמר על מנת לוודא שלא תחמוק/י מההשעיה.
       reason: 'סיבה:'
       statuses: 'הודעות מצוטטות:'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 28bd830158..4f6cdf480f 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -65,6 +65,25 @@ hr:
       empty: Nema pronađenih izvješća.
       filter_by_action: Filtriraj prema radnji
       filter_by_user: Filtriraj prema korisniku
+    email_domain_blocks:
+      add_new: Dodaj novi
+    ip_blocks:
+      add_new: Stvori pravilo
+    roles:
+      privileges:
+        invite_users_description: Dopusti korisnicima da pozovu nove ljude na server
+    settings:
+      about:
+        title: O aplikaciji
+    warning_presets:
+      add_new: Dodaj novi
+  aliases:
+    add_new: Stvori alias
+  appearance:
+    advanced_web_interface: Napredno web sučelje
+    localization:
+      body: Mastodon prevode dobrovoljci.
+      guide_link_text: Svi mogu doprinjeti.
   application_mailer:
     settings: 'Promijeni postavke e-pošte: %{link}'
     view: 'Vidi:'
@@ -85,14 +104,19 @@ hr:
       less_than_x_seconds: Upravo sada
       over_x_years: "%{count}god"
       x_months: "%{count}mj"
+  edit_profile:
+    basic_information: Osnovne informacije
   exports:
     archive_takeout:
       date: Datum
       download: Preuzmite svoju arhivu
+      request: Zatraži svoju arhivu
       size: Veličina
     blocks: Blokirali ste
     lists: Liste
     storage: Pohrana medijskih sadržaja
+  featured_tags:
+    add_new: Dodaj novi
   filters:
     contexts:
       notifications: Obavijesti
@@ -130,6 +154,7 @@ hr:
       few: "%{count} korištenja"
       one: 1 korištenje
       other: "%{count} korištenja"
+    title: Pozovi ljude
   notification_mailer:
     favourite:
       body: "%{name} je označio/la Vaš status favoritom:"
@@ -167,6 +192,8 @@ hr:
   remote_follow:
     missing_resource: Nije moguće pronaći traženi URL preusmjeravanja za Vaš račun
   sessions:
+    browsers:
+      ie: Internet Explorer
     revoke: Opozovi
     revoke_success: Sesija je uspješno opozvana
     title: Sesije
@@ -183,9 +210,11 @@ hr:
     export: Izvoz podataka
     featured_tags: Istaknuti hashtagovi
     import: Uvezi
+    import_and_export: Uvezi i izvezi
     notifications: Obavijesti
     preferences: Postavke
     profile: Profil
+    statuses_cleanup: Automatsko brisanje postova
     two_factor_authentication: Dvofaktorska autentifikacija
   statuses:
     open_in_web: Otvori na webu
@@ -205,7 +234,11 @@ hr:
     visibilities:
       private: Samo pratitelji
       public: Javno
+      public_long: Svi mogu vidjeti
       unlisted: Neprikazano
+      unlisted_long: Svi mogu vidjeti, ali nije izlistano u javnim timelineovima
+  statuses_cleanup:
+    enabled: Automatski obriši strare postove
   stream_entries:
     sensitive_content: Osjetljivi sadržaj
   two_factor_authentication:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 48f9d5b9d1..7057883e18 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -611,6 +611,7 @@ hu:
       created_at: Jelentve
       delete_and_resolve: Bejegyzések törlése
       forwarded: Továbbítva
+      forwarded_replies_explanation: Ez a jelentés egy távoli flehasználótól származik, és távoli tartalomról szól. Azért lett neked továbbítva, mert a jelentett tartalom az egyik felhasználódnak küldött válasz.
       forwarded_to: 'Továbbítva ide: %{domain}'
       mark_as_resolved: Megjelölés megoldottként
       mark_as_sensitive: Érzékenynek jelölés
@@ -996,8 +997,6 @@ hu:
       new_trending_statuses:
         title: Felkapott bejegyzések
       new_trending_tags:
-        no_approved_tags: Jelenleg nincsenek jóváhagyott felkapott hashtagek.
-        requirements: 'Ezek közül bármelyik jelölt lehagyná a %{rank}. jóváhagyott felkapott hashtaget, amely jelenleg a(z) #%{lowest_tag_name} ezzel a pontszámmal: %{lowest_tag_score}.'
         title: Felkapott hashtagek
       subject: 'Új jóváhagyandó trendek ezen: %{instance}'
   aliases:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0e8f2b9b05..c231fea576 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -878,8 +878,6 @@ id:
       new_trending_statuses:
         title: Kiriman yang sedang tren
       new_trending_tags:
-        no_approved_tags: Saat ini tidak ada tagar tren yang disetujui.
-        requirements: 'Kandidat yang ada di sini bisa saja melewati peringkat #%{rank} tagar sedang tren yang disetujui, yang kini #%{lowest_tag_name} memiliki nilai %{lowest_tag_score}.'
         title: Tagar sedang tren
       subject: Tren baru yang perlu ditinjau di %{instance}
   aliases:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index d09dfed70b..c9a0dcd736 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -857,8 +857,6 @@ io:
       new_trending_statuses:
         title: Tendencoza posti
       new_trending_tags:
-        no_approved_tags: Nun ne existas aprobita tendencoza hashtagi.
-        requirements: 'Irga ca probanti povas ecesar la #%{rank} aprobita tendencoligilo, quale nun esas %{lowest_tag_name} kun punto %{lowest_tag_score}.'
         title: Tendencoza hashtagi
       subject: Nova tendenci bezonas kontrolesar che %{instance}
   aliases:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 390ce0ac03..bf16d877db 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -611,6 +611,7 @@ is:
       created_at: Tilkynnt
       delete_and_resolve: Eyða færslum
       forwarded: Áframsent
+      forwarded_replies_explanation: Þessi kæra er frá fjartengdum notanda og er um fjartengt efni. Hún hefur verið framsend til þín þar sem kærða efnið er í svari til eins af notendunum þínum.
       forwarded_to: Áframsent á %{domain}
       mark_as_resolved: Merkja sem leyst
       mark_as_sensitive: Merkja sem viðkvæmt
@@ -998,8 +999,6 @@ is:
       new_trending_statuses:
         title: Vinsælar færslur
       new_trending_tags:
-        no_approved_tags: Það eru í augnablikinu engin samþykkt vinsæl myllumerki.
-        requirements: 'Hver af þessum tillögum gætu farið yfir samþykkta vinsæla myllumerkið númer #%{rank}, sem í augnablikinu er %{lowest_tag_name} með %{lowest_tag_score} stig'
         title: Vinsæl myllumerki
       subject: Nýtt vinsælt til yfirferðar á %{instance}
   aliases:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f35e9e42b1..3637313c0d 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -611,6 +611,7 @@ it:
       created_at: Segnalato
       delete_and_resolve: Cancella post
       forwarded: Inoltrato
+      forwarded_replies_explanation: Questa segnalazione proviene da un utente remoto e tratta di contenuti remoti. È stato inoltrato a voi perché il contenuto riportato è in risposta a uno dei vostri utenti.
       forwarded_to: Inoltrato a %{domain}
       mark_as_resolved: Segna come risolto
       mark_as_sensitive: Segna come sensibile
@@ -996,8 +997,6 @@ it:
       new_trending_statuses:
         title: Post di tendenza
       new_trending_tags:
-        no_approved_tags: Attualmente non ci sono hashtag di tendenza approvati.
-        requirements: 'Ognuno di questi candidati potrebbe superare il #%{rank} hashtag di tendenza approvato, che è attualmente "%{lowest_tag_name}" con un punteggio di %{lowest_tag_score}.'
         title: Hashtag di tendenza
       subject: Nuove tendenze in attesa di controllo su %{instance}
   aliases:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3318b690a0..f7a2c28179 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -599,6 +599,7 @@ ja:
       created_at: 通報日時
       delete_and_resolve: 投稿を削除
       forwarded: 転送済み
+      forwarded_replies_explanation: この報告はリモートユーザーからのものであり、またリモートコンテンツに関するものです。報告されたコンテンツがあなたのユーザーの内の一人に対するリプライの中にあるため、あなたに転送されました。
       forwarded_to: "%{domain}に転送されました"
       mark_as_resolved: 解決済みとしてマーク
       mark_as_sensitive: 閲覧注意にする
@@ -978,8 +979,6 @@ ja:
       new_trending_statuses:
         title: トレンド投稿
       new_trending_tags:
-        no_approved_tags: 承認されたトレンドハッシュタグはありません。
-        requirements: 'これらの候補はいずれも %{rank} 位の承認済みトレンドハッシュタグのスコアを上回ります。現在 #%{lowest_tag_name} のスコアは %{lowest_tag_score} です。'
         title: トレンドハッシュタグ
       subject: "%{instance}で新しいトレンドが審査待ちです"
   aliases:
@@ -1343,6 +1342,7 @@ ja:
       '86400': 1日
     expires_in_prompt: 無期限
     generate: 招待リンクを作成
+    invalid: この招待は無効です
     invited_by: '次の人に招待されました:'
     max_uses:
       other: "%{count}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index fb193c75f6..e6187f4d83 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -32,7 +32,7 @@ ko:
       add_email_domain_block: 이 이메일 도메인을 차단하기
       approve: 허가
       approved_msg: 성공적으로 %{username}의 가입 신청서를 승인했습니다
-      are_you_sure: 정말로 실행하시겠습니까?
+      are_you_sure: 확실합니까?
       avatar: 아바타
       by_domain: 도메인
       change_email:
@@ -55,16 +55,16 @@ ko:
       deleted: 삭제됨
       demote: 강등
       destroyed_msg: "%{username}의 데이터는 곧 삭제되도록 대기열에 들어갔습니다"
-      disable: 비활성화
+      disable: 동결
       disable_sign_in_token_auth: 이메일 토큰 인증 비활성화
       disable_two_factor_authentication: 2단계 인증을 비활성화
-      disabled: 비활성화됨
+      disabled: 동결됨
       display_name: 표시되는 이름
       domain: 도메인
       edit: 수정
       email: 이메일
       email_status: 이메일 상태
-      enable: 활성화
+      enable: 동결 해제
       enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
       enabled_msg: "%{username}의 계정을 성공적으로 얼리기 해제하였습니다"
@@ -292,7 +292,7 @@ ko:
     announcements:
       destroyed_msg: 공지가 성공적으로 삭제되었습니다!
       edit:
-        title: 공지사항 수정
+        title: 공지사항 편집
       empty: 공지를 찾을 수 없습니다.
       live: 진행 중
       new:
@@ -586,7 +586,7 @@ ko:
       actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
-      are_you_sure: 정말로 실행하시겠습니까?
+      are_you_sure: 확실합니까?
       assign_to_self: 나에게 할당하기
       assigned: 할당된 중재자
       by_target_domain: 신고된 계정의 도메인
@@ -601,6 +601,7 @@ ko:
       created_at: 신고 시각
       delete_and_resolve: 게시물 삭제
       forwarded: 전달됨
+      forwarded_replies_explanation: 이 신고는 리모트 사용자가 리모트 컨텐츠에 대해 신고한 것입니다. 이것은 신고된 내용이 로컬 사용자에 대한 답글이기 때문에 첨부되었습니다.
       forwarded_to: "%{domain}에게 전달됨"
       mark_as_resolved: 해결로 표시
       mark_as_sensitive: 민감함으로 설정
@@ -762,7 +763,7 @@ ko:
           open: 누구나 가입 할 수 있음
       security:
         authorized_fetch: 연합된 서버들에게서 인증 필수
-        authorized_fetch_hint: 연합된 서버들에게서 인증을 요구하는 것은 사용자 레벨과 서버 레벨의 차단은 좀 더 확실하게 해줍니다. 한편으로는 성능적인 페널티, 답글의 전달 범위 감소, 몇몇 연합된 서비스들과의 호환성 문제가 있을 가능성이 있습니다. 추가적으로 이 기능은 전용 액터가 공개돤 게시물이나 계정을 페치하는 것은 막지 않습니다.
+        authorized_fetch_hint: 연합된 서버들에게서 인증을 요구하는 것은 사용자 레벨과 서버 레벨의 차단을 좀 더 확실하게 해줍니다. 한편으로는 성능적인 페널티, 답글의 전달 범위 감소, 몇몇 연합된 서비스들과의 호환성 문제가 있을 가능성이 있습니다. 추가적으로 이 기능은 전용 액터가 공개된 게시물이나 계정을 페치하는 것은 막지 않습니다.
         authorized_fetch_overridden_hint: 현재 이 값은 환경변수에 의해 설정되어 있기에 설정을 변경할 수 없습니다.
         federation_authentication: 연합 인증 필수
       title: 서버 설정
@@ -925,7 +926,7 @@ ko:
     warning_presets:
       add_new: 새로 추가
       delete: 삭제
-      edit_preset: 경고 틀 수정
+      edit_preset: 경고 프리셋 편집
       empty: 아직 어떤 경고 틀도 정의되지 않았습니다.
       title: 경고 틀 관리
     webhooks:
@@ -980,8 +981,6 @@ ko:
       new_trending_statuses:
         title: 유행하는 게시물
       new_trending_tags:
-        no_approved_tags: 현재 승인된 유행 중인 해시태그가 없습니다.
-        requirements: '이 후보들 중 어떤 것이라도 #%{rank}위의 승인된 유행 중인 해시태그를 앞지를 수 있으며, 이것은 현재 #%{lowest_tag_name}이고 %{lowest_tag_score}점을 기록하고 있습니다.'
         title: 유행하는 해시태그
       subject: 새 트렌드가 %{instance}에서 심사 대기 중입니다
   aliases:
@@ -1176,7 +1175,7 @@ ko:
     invalid_domain: 올바른 도메인 네임이 아닙니다
   edit_profile:
     basic_information: 기본 정보
-    hint_html: "<strong>내 공개 프로필과 게시물 옆에 보이는 부분을 꾸미세요.</strong> 다른 사람들은 프로필 내용과 사진이 채워진 계정과 더 상호작용하고 팔로우를 하고 싶어합니다."
+    hint_html: "<strong>사람들이 공개 프로필을 보고서 게시물을 볼 때를 위한 프로필을 꾸밉니다.</strong> 프로필과 프로필 사진을 채우면 다른 사람들이 나를 팔로우하고 나와 교류할 기회가 더 많아집니다."
     other: 기타
   errors:
     '400': 제출한 요청이 올바르지 않습니다.
@@ -1228,7 +1227,7 @@ ko:
       keywords: 키워드
       statuses: 개별 게시물
       statuses_hint_html: 이 필터는 아래의 키워드에 매칭되는지 여부와 관계 없이 몇몇개의 게시물들에 별개로 적용되었습니다. <a href="%{path}">검토하거나 필터에서 삭제하세요</a>
-      title: 필터 수정
+      title: 필터 편집
     errors:
       deprecated_api_multiple_keywords: 이 파라미터들은 하나를 초과하는 필터 키워드에 적용되기 때문에 이 응용프로그램에서 수정될 수 없습니다. 더 최신의 응용프로그램이나 웹 인터페이스를 사용하세요.
       invalid_context: 컨텍스트가 없거나 올바르지 않습니다
@@ -1614,7 +1613,7 @@ ko:
     back: 마스토돈으로 돌아가기
     delete: 계정 삭제
     development: 개발
-    edit_profile: 프로필 수정
+    edit_profile: 프로필 편집
     export: 데이터 내보내기
     featured_tags: 추천 해시태그
     import: 데이터 가져오기
@@ -1780,7 +1779,7 @@ ko:
       statuses: '인용된 게시물:'
       subject:
         delete_statuses: 당신의 계정 %{acct}에서 작성한 게시물이 삭제되었습니다
-        disable: 당신의 계정 %{acct}가 동결 되었습니다
+        disable: "%{acct} 계정은 동결되었습니다."
         mark_statuses_as_sensitive: "%{acct}로 작성한 당신의 게시물은 민감한 것으로 표시되었습니다"
         none: "%{acct}에게의 경고"
         sensitive: "%{acct}로 작성되는 당신의 게시물은 이제부터 민감한 것으로 표시됩니다"
@@ -1788,7 +1787,7 @@ ko:
         suspend: 당신의 계정 %{acct}가 정지 되었습니다
       title:
         delete_statuses: 게시물 삭제됨
-        disable: 계정 동결 됨
+        disable: 계정 동결됨
         mark_statuses_as_sensitive: 게시물이 민감함으로 표시됨
         none: 경고
         sensitive: 계정이 민감함으로 표시됨
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 58c1885dfe..b9cc5fe77e 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -897,8 +897,6 @@ ku:
       new_trending_statuses:
         title: Şandiyên rojevê
       new_trending_tags:
-        no_approved_tags: Niha hashtagên rojevê pejirandî tune ne.
-        requirements: 'Yek ji namzedên li jêr dikare ji #%{rank} hashtagaa diyarkirî ya pejirandî derbas bibe, niha ku #%{lowest_tag_name} bi %{lowest_tag_score} puan e.'
         title: Hashtagên rojevê
       subject: Rojevên nû ji bo nirxandinê li ser %{instance} derdikevin
   aliases:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 529eb5a44c..1111277494 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1,37 +1,44 @@
 ---
 lt:
   about:
-    about_mastodon_html: Mastodon, tai socialinis tinklas pagrįstas atviro kodo programavimu, ir atvirais web protokolais. Visiškai nemokamas. Ši sistema decantrilizuota kaip jūsų elektroninis paštas.
+    about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija. Turėk savo duomenis su Mastodon!'
     contact_missing: Nenustatyta
-    contact_unavailable: Nėra duomenų
-    hosted_on: Mastodon palaikomas naudojantis %{domain} talpinimu
+    contact_unavailable: Nėra
+    hosted_on: Mastodon talpinamas %{domain}
     title: Apie
   accounts:
     follow: Sekti
     followers:
       few: Sekėjai
-      many: Sekėjai
+      many: Sekėjo
       one: Sekėjas
-      other: Sekėjai
-    following: Sekami
-    last_active: paskutinį kartą aktyvus
-    link_verified_on: Nuorodos nuosavybė paskutinį kartą tikrinta %{date}
-    nothing_here: Čia nieko nėra!
+      other: Sekėjų
+    following: Seka
+    instance_actor_flash: Ši paskyra yra virtualus veikėjas (-a), naudojamas atstovauti pačiam serveriui, o ne atskiram naudotojui. Tai naudojama federacijos tikslais ir neturėtų būti pristabdyta.
+    last_active: paskutinis aktyumas
+    link_verified_on: Šios nuorodos nuosavybė buvo patikrinta %{date}
+    nothing_here: Nieko čia nėra!
     pin_errors:
-      following: Privalai sekti žmogų kurį nori pagerbti
-    posts_tab_heading: Tootai
+      following: Privalai sekti asmenį, kurį nori patvirtinti.
+    posts:
+      few: Įrašai
+      many: Įrašo
+      one: Įrašas
+      other: Įrašų
+    posts_tab_heading: Įrašai
   admin:
     account_actions:
-      action: Veiksmas
-      title: Moderuoti %{acct}
+      action: Atlikti veiksmą
+      title: Atlikti prižiūrėjimo veiksmą %{acct}
     account_moderation_notes:
-      create: Palikti žinutę
-      created_msg: Moderavimo žinutė sėkimngai sukurta!
-      destroyed_msg: Moderacijos žinutė sėkmingai ištrinta!
+      create: Palikti pastabą
+      created_msg: Prižiūrėjimo pastaba sėkmingai sukurta!
+      destroyed_msg: Prižiūrėjimo pastaba sėkmingai sunaikinta!
     accounts:
+      add_email_domain_block: Blokuoti el. pašto domeną
       approve: Patvirtinti
-      are_you_sure: Ar esate įsitikinęs?
-      avatar: Profilio nuotrauka
+      are_you_sure: Ar esi įsitikinęs (-usi)?
+      avatar: Avataras
       by_domain: Domenas
       change_email:
         current_email: Dabartinis el paštas
@@ -208,12 +215,13 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
-      are_you_sure: Ar tu įsitikinęs?
+      are_you_sure: Ar esi įsitikinęs (-usi)?
       assign_to_self: Paskirti man
       assigned: Paskirtas moderatorius
       comment:
         none: Nėra
       created_at: Reportuotas
+      forwarded_replies_explanation: Šis ataskaita yra iš nuotolinio naudotojo ir susijusi su nuotoliniu turiniu. Jis buvo persiųstas tau, nes turinys, apie kurį pranešta, yra atsakymas vienam iš tavo naudotojų.
       mark_as_resolved: Pažymėti kaip išsprestą
       mark_as_unresolved: Pažymėti kaip neišsprestą
       notes:
@@ -222,6 +230,7 @@ lt:
         create_and_unresolve: Atidaryti su rašteliu
         delete: Ištrinti
         placeholder: Apibūdink, kokių veiksmų imtasi arba kitokie atnaujinimai..
+      notes_description_html: Peržiūrėk ir palik pastabas kitiems prižiūrėtojams ir savo būsimam aš
       reopen: Atidaryti skundą
       report: 'Skundas #%{id}'
       reported_account: Reportuota paskyra
@@ -241,6 +250,8 @@ lt:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
       domain_blocks:
         all: Visiems
+    software_updates:
+      description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
     statuses:
       back_to_account: Atgal į paskyros puslapį
       media:
@@ -248,6 +259,13 @@ lt:
       no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
       title: Paskyros statusai
       with_media: Su medija
+    system_checks:
+      elasticsearch_health_yellow:
+        message_html: Elasticsearch klasteris yra nesveikas (geltona būsena), galbūt norėsi išsiaiškinti priežastį
+      elasticsearch_preset:
+        message_html: Tavo Elasticsearch klasteris turi daugiau nei vieną mazgą, bet Mastodon nėra sukonfigūruotas juos naudoti.
+      elasticsearch_preset_single_node:
+        message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
     title: Administracija
     warning_presets:
       add_new: Pridėti naują
@@ -275,10 +293,11 @@ lt:
     regenerate_token: Regeneruoti prieigos žetoną
     token_regenerated: Prieigos žetonas sėkmingai sugeneruotas
     warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
-    your_token: Jūsų prieigos žetonas
+    your_token: Tavo prieigos raktas
   auth:
     delete_account: Ištrinti paskyrą
     delete_account_html: Jeigu norite ištrinti savo paskyrą, galite eiti <a href="%{path}">čia</a>. Jūsų prašys patvirtinti pasirinkimą.
+    dont_have_your_security_key: Neturi saugumo rakto?
     forgot_password: Pamiršote slaptažodį?
     invalid_reset_password_token: Slaptažodžio atkūrimo žetonas netinkamas arba jo galiojimo laikas pasibaigęs. Prašykite naujo žetono.
     login: Prisijungti
@@ -293,6 +312,12 @@ lt:
       preamble_invited: Prieš tęsiant, atsižvelk į pagrindines taisykles, kurias nustatė %{domain} prižiūrėtojai.
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
+    status:
+      redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
+      self_destruct: Kadangi %{domain} uždaromas, turėsi tik ribotą prieigą prie savo paskyros.
+      view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
+  challenge:
+    hint_html: "<strong>Patarimas:</strong> artimiausią valandą daugiau neprašysime tavo slaptažodžio."
   datetime:
     distance_in_words:
       about_x_hours: "%{count} val"
@@ -308,9 +333,16 @@ lt:
       x_months: "%{count}mėn"
       x_seconds: "%{count}sek"
   deletes:
-    confirm_password: Kad patvirtintumėte savo tapatybę, įveskite dabartini slaptažodį
+    challenge_not_passed: Įvesta informacija buvo neteisinga
+    confirm_password: Įvesk dabartinį slaptažodį, kad patvirtintum savo tapatybę
+    confirm_username: Procedūros patvirtinimui įvesk savo naudotojo vardą
     proceed: Ištrinti paskyrą
-    success_msg: Jūsų paskyra sėkmingai ištrinta
+    success_msg: Tavo paskyra buvo sėkmingai ištrinta
+  disputes:
+    strikes:
+      your_appeal_approved: Tavo apeliacija buvo patvirtinta
+      your_appeal_pending: Pateikei apeliaciją
+      your_appeal_rejected: Tavo apeliacija buvo atmesta
   errors:
     '403': Jūs neturie prieigos matyti šiam puslapiui.
     '404': Puslapis nerastas.
@@ -411,21 +443,21 @@ lt:
       title: Naujas mėgstamas
     follow:
       body: "%{name} pradėjo jus sekti!"
-      subject: "%{name} pradėjo jus sekti"
+      subject: "%{name} dabar seka tave"
       title: Naujas sekėjas
     follow_request:
       action: Tvarkyti prašymus sekti
-      body: "%{name} nori tapti Jūsų sekėju"
+      body: "%{name} paprašė tave sekti"
       subject: 'Laukiantis sprendimo sekėjas:  %{name}'
       title: Naujas prašymas sekti
     mention:
       action: Atsakyti
-      body: 'Jus paminėjo %{name} pranešime:'
-      subject: Jus paminėjo %{name}
+      body: 'Tave %{name} paminėjo:'
+      subject: Tave paminėjo %{name}
       title: Naujas paminėjimas
     reblog:
-      body: 'Jūsų statusą pakėlė %{name}:'
-      subject: "%{name} pakėlė Jūsų statusą"
+      body: 'Tavo įrašą pakėlė %{name}:'
+      subject: "%{name} pakėlė tavo įrašą"
       title: Naujas pakėlimas
   pagination:
     newer: Naujesnis
@@ -516,8 +548,9 @@ lt:
         suspend: Paskyra užrakinta
     welcome:
       edit_profile_action: Nustatyti profilį
-      explanation: Štai keletas patarimų Jums
+      explanation: Štai keletas patarimų, kaip pradėti
       final_action: Pradėti kelti įrašus
+      final_step: 'Pradėk skelbti! Net jei ir neturi sekėjų, tavo viešus įrašus gali matyti kiti, pavyzdžiui, vietinėje laiko skalėje arba saitažodžiuose. Galbūt norėsi prisistatyti saitažodyje #introductions.'
       full_handle: Jūsų pilnas slapyvardis
       full_handle_hint: Štai ką jūs sakytumėte savo draugams, kad jie galėtų jums siųsti žinutes arba just sekti iš kitų serverių.
       subject: Sveiki atvykę į Mastodon
@@ -525,9 +558,15 @@ lt:
   users:
     follow_limit_reached: Negalite sekti daugiau nei %{limit} žmonių
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
-    otp_lost_help_html: Jeigu praradote prieiga prie abiejų, susisiekite su mumis per %{email}
+    otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
     seamless_external_login: Jūs esate prisijungę per išorini įrenginį, todėl slaptąžodis ir el pašto nustatymai neprieinami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
     hint_html: "<strong>Savo tapatybės patvirtinimas Mastodon skirtas visiems.</strong> Remiantis atviraisiais žiniatinklio standartais, dabar ir visam laikui nemokamas. Viskas, ko tau reikia, yra asmeninė svetainė, pagal kurią žmonės tave atpažįsta. Kai iš savo profilio pateiksi nuorodą į šią svetainę, patikrinsime, ar svetainėje yra nuoroda į tavo profilį, ir parodysime vizualinį indikatorių."
     verification: Patvirtinimas
+    verified_links: Tavo patikrintos nuorodos
+  webauthn_credentials:
+    create:
+      error: Kilo problema pridedant saugumo raktą. Bandyk dar kartą.
+    nickname_hint: Įvesk naujojo saugumo rakto slapyvardį
+    not_enabled: Dar neįjungei WebAuthn
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 4bcf23de4d..c532b84e27 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1014,8 +1014,6 @@ lv:
       new_trending_statuses:
         title: Populārākās ziņas
       new_trending_tags:
-        no_approved_tags: Pašlaik nav apstiprinātu tendenču tēmturu.
-        requirements: 'Jebkurš no šiem kandidātiem varētu pārspēt #%{rank} apstiprināto populāro tēmturi, kas pašlaik ir #%{lowest_tag_name} ar rezultātu %{lowest_tag_score}.'
         title: Populārākie tēmturi
       subject: Tiek pārskatītas jaunas tendences %{instance}
   aliases:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 951b04194e..74acf87552 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -977,8 +977,6 @@ ms:
       new_trending_statuses:
         title: Pos sohor kini
       new_trending_tags:
-        no_approved_tags: Pada masa ini tiada hashtag sohor kini yang diluluskan.
-        requirements: 'Mana-mana calon ini boleh melepasi hashtag arah aliran #%{rank} yang diluluskan, yang pada masa ini ialah #%{lowest_tag_name} dengan markah %{lowest_tag_score}.'
         title: Hashtag sohor kini
       subject: Trend baharu untuk kesemakan pada %{instance}
   aliases:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index d8e83543c6..03ed771a42 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -962,8 +962,6 @@ my:
       new_trending_statuses:
         title: လက်ရှိခေတ်စားနေသော ပို့စ်များ
       new_trending_tags:
-        no_approved_tags: လက်ရှိတွင် အတည်ပြုထားသော ခေတ်စားနေသည့် hashtag များမရှိပါ။
-        requirements: 'ဤလူများမှာ %{lowest_tag_score} ရမှတ်ဖြင့် လက်ရှိ #%{lowest_tag_name} ဖြစ်သည့် ခေတ်စားနေသော hashtag #%{rank} ကို ကျော်သွားနိုင်သည်။'
         title: လက်ရှိခေတ်စားနေသော hashtag များ
       subject: "%{instance} တွင် ပြန်လည်သုံးသပ်ရမည့် ခေတ်စားနေသောပို့စ်အသစ်များ"
   aliases:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 94a1f29f7f..44843b2198 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -611,6 +611,7 @@ nl:
       created_at: Gerapporteerd op
       delete_and_resolve: Bericht verwijderen
       forwarded: Doorgestuurd
+      forwarded_replies_explanation: Dit rapport komt van een externe gebruiker en gaat over externe inhoud. Het is naar je doorgestuurd omdat de gerapporteerde inhoud een reactie is op een van jouw gebruikers.
       forwarded_to: Doorgestuurd naar %{domain}
       mark_as_resolved: Markeer als opgelost
       mark_as_sensitive: Als gevoelig markeren
@@ -996,8 +997,6 @@ nl:
       new_trending_statuses:
         title: Trending berichten
       new_trending_tags:
-        no_approved_tags: Op dit moment zijn er geen goedgekeurde hashtags.
-        requirements: 'Elk van deze kandidaten kan de #%{rank} goedgekeurde trending hashtag overtreffen, die momenteel #%{lowest_tag_name} is met een score van %{lowest_tag_score}.'
         title: Trending hashtags
       subject: Nieuwe trends te beoordelen op %{instance}
   aliases:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 4925d44632..3ee02863db 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -534,7 +534,7 @@ nn:
       total_reported: Rapportar om dei
       total_storage: Medievedlegg
       totals_time_period_hint_html: Totalsum vist nedanfor gjeld data for alle tidsperiodar.
-      unknown_instance: Dette domenet er ukjent for denne serveren.
+      unknown_instance: Domenet er ukjent for denne tenaren.
     invites:
       deactivate_all: Slå av alle
       filter:
@@ -611,6 +611,7 @@ nn:
       created_at: Rapportert
       delete_and_resolve: Slett innlegg
       forwarded: Videresendt
+      forwarded_replies_explanation: Denne rapporten gjeld innhald på ein annan nettstad. Rapporten er vidaresend til deg fordi det rapporterte innhaldet er eit svar på noko ein av brukarane på nettstaden din har skrive.
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Merk som løyst
       mark_as_sensitive: Marker som ømtolig
@@ -996,8 +997,6 @@ nn:
       new_trending_statuses:
         title: Populære innlegg
       new_trending_tags:
-        no_approved_tags: Det er ingen godkjende populære emneknaggar no.
-        requirements: 'Alle desse kandidatane kan stiga høgare enn den godkjende populære emneknaggen #%{rank}, som er #%{lowest_tag_name} med ei plassering på %{lowest_tag_score}.'
         title: Populære emneknaggar
       subject: Nye trendar å sjå gjennom på %{instance}
   aliases:
@@ -1041,14 +1040,14 @@ nn:
       hint_html: Berre ein ting til! Vi må bekrefte at du er et menneske (så vi kan halde spam ute!). Løys CAPTCHA-en nedanfor og klikk "Fortsett".
       title: Sikkerheitssjekk
     confirmations:
-      awaiting_review: Din e-post adresse er bekreftet! %{domain} ansatte gjennomgår nå registreringen din. Du vil motta en e-post hvis de godkjenner din konto!
-      awaiting_review_title: Din registrering blir vurdert
-      clicking_this_link: klikke på denne lenken
-      login_link: logg inn
-      proceed_to_login_html: Du kan nå fortsette til %{login_link}.
-      redirect_to_app_html: Du burde bli omdirigert til <strong>%{app_name}</strong> -appen. Hvis det ikke skjedde, kan du prøve %{clicking_this_link} eller manuelt gå tilbake til appen.
-      registration_complete: Registreringen på %{domain} er nå fullført!
-      welcome_title: Velkommen, %{name}!
+      awaiting_review: Epostadressa di er stadfesta! Styrarane på %{domain} ser gjennom registreringa di. Du får ein epost frå dei om dei godkjenner brukarkontoen din.
+      awaiting_review_title: Me går gjennom registreringa di
+      clicking_this_link: klikka på denne lenka
+      login_link: logga inn
+      proceed_to_login_html: No kan du %{login_link}.
+      redirect_to_app_html: Du skulle vorte vidaresend til <strong>%{app_name}</strong>-appen. Viss det ikkje skjedde, kan du prøva å %{clicking_this_link} eller manuelt gå tilbake til appen.
+      registration_complete: Du har registrert deg som brukar på %{domain}.
+      welcome_title: Velkomen, %{name}!
       wrong_email_hint: Viss epostadressa er feil, kan du endra ho i kontoinnstillingane.
     delete_account: Slett konto
     delete_account_html: Om du vil sletta kontoen din, kan du <a href="%{path}">gå hit</a>. Du vert spurd etter stadfesting.
@@ -1110,7 +1109,7 @@ nn:
       functional: Kontoen din er fullt operativt.
       pending: Søknaden din ventar på gjennomgang frå personalet vårt. Dette kan taka litt tid. Du får ein e-post om søknaden din vert godkjend.
       redirecting_to: Kontoen din er inaktiv fordi den for øyeblikket omdirigerer til %{acct}.
-      self_destruct: Siden %{domain} stenger, vil du kun ha begrenset tilgang til kontoen din.
+      self_destruct: Av di %{domain} er i ferd med å stenga, vil du berre få avgrensa tilgang til brukarkontoen din.
       view_strikes: Vis tidligere advarsler mot kontoen din
     too_fast: Skjemaet ble sendt inn for raskt, prøv på nytt.
     use_security_key: Bruk sikkerhetsnøkkel
@@ -1582,8 +1581,8 @@ nn:
     over_total_limit: Du har overskredet grensen på %{limit} planlagte tuter
     too_soon: Den planlagte datoen må være i fremtiden
   self_destruct:
-    lead_html: Dessverre stenger <strong>%{domain}</strong> for alltid. Hvis du hadde en konto der vil du ikke kunne fortsette å bruke den, men du kan fremdeles be om en sikkerhetskopi av dataene dine.
-    title: Denne serveren stenger
+    lead_html: Diverre stengjer <strong>%{domain}</strong> dørene for godt. Viss du hadde ein brukarkonto der, vil du ikkje kunna halda fram å bruka han, men du kan få ut ein tryggingskopi av dataa dine.
+    title: Denne tenaren stengjer
   sessions:
     activity: Siste aktivitet
     browser: Nettlesar
diff --git a/config/locales/no.yml b/config/locales/no.yml
index a1058bf9f2..f791c7151e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -611,6 +611,7 @@
       created_at: Rapportert
       delete_and_resolve: Slettede innlegg
       forwarded: Videresendt
+      forwarded_replies_explanation: Denne rapporten er fra en ekstern bruker og handler om eksternt innhold. Den er videresendt til deg fordi det rapporterte innholdet svarer til en av brukerne dine.
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Merk som løst
       mark_as_sensitive: Merk som følsomt
@@ -996,8 +997,6 @@
       new_trending_statuses:
         title: Populære innlegg
       new_trending_tags:
-        no_approved_tags: Det er for øyeblikket ingen godkjente populære emneknagger.
-        requirements: 'Enhver av disse kandidatene kan overgå #%{rank} godkjent populære emneknagger, som for øyeblikket er #%{lowest_tag_name} med en poengsum på %{lowest_tag_score}.'
         title: Populære emneknagger
       subject: Ny trender for gjennomsyn av %{instance}
   aliases:
@@ -1532,7 +1531,7 @@
     posting_defaults: Innleggsstandarder
     public_timelines: Offentlige tidslinjer
   privacy:
-    hint_html: "<strong>Tilpass hvordan du vil at din profil og dine innlegg skal bli funnet.</strong> En rekke funksjoner i Mastodon kan hjelpe deg med å nå et bredere publikum når de aktiverte. Ta deg et øyeblikk til å vurdere disse innstillingene for å forsikre deg om at de passer deg og ditt bruk."
+    hint_html: "<strong>Tilpass hvordan du vil at din profil og dine innlegg skal bli funnet.</strong> En rekke funksjoner i Mastodon kan hjelpe deg med å nå et bredere publikum når det er aktivert. Ta deg et øyeblikk til å vurdere disse innstillingene for å forsikre deg om at de passer deg og ditt bruk."
     privacy: Personvern
     privacy_hint_html: Kontrollér hvor mye du ønsker å dele til fordel for andre. Folk oppdager interessante profiler og kule app'er ved å bla gjennom andres følgere og ved å se hvilke app'er de bruker, men du kan velge å holde det skjult.
     reach: Rekkevidde
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6085997248..79de3b5196 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -419,8 +419,8 @@ pl:
         hint: Blokada domen nie zabroni tworzenia wpisów kont w bazie danych, ale pozwoli na automatyczną moderację kont do nich należących.
         severity:
           desc_html: "<strong>Wyciszenie</strong> uczyni wpisy użytkowników z tej domeny widoczne tylko dla osób, które go obserwują. <strong>Zawieszenie</strong> spowoduje usunięcie całej zawartości dodanej przez użytkownika. Użyj <strong>Żadne</strong>, jeżeli chcesz jedynie odrzucać zawartość multimedialną."
-          noop: Nic nie rób
-          silence: Limit
+          noop: Żadne
+          silence: Wycisz
           suspend: Zawieś
         title: Nowa blokada domen
       no_domain_block_selected: Nie zmieniono żadnych bloków domen, gdyż żadna nie została wybrana
@@ -635,6 +635,7 @@ pl:
       created_at: Zgłoszono
       delete_and_resolve: Usuń posty
       forwarded: Przekazano
+      forwarded_replies_explanation: Ten raport nadszedł od zdalnego użytkownika i dotyczy zdalnej treści. Został ci przekazany, bo raportowana treść jest odpowiedzią na jednego z twoich użytkowników.
       forwarded_to: Przekazano do %{domain}
       mark_as_resolved: Oznacz jako rozwiązane
       mark_as_sensitive: Oznacz jako wrażliwe
@@ -1032,8 +1033,6 @@ pl:
       new_trending_statuses:
         title: Popularne teraz
       new_trending_tags:
-        no_approved_tags: Obecnie nie ma żadnych zatwierdzonych popularnych hasztagów.
-        requirements: 'Każdy z tych kandydatów może przekroczyć #%{rank} zatwierdzonych popularnych teraz hasztagów, który wynosi obecnie %{lowest_tag_name} z wynikiem %{lowest_tag_score}.'
         title: Popularne hasztagi
       subject: Nowe popularne do przeglądu na %{instance}
   aliases:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 3eb2950bd6..c8060ad803 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -611,6 +611,7 @@ pt-BR:
       created_at: Denunciado
       delete_and_resolve: Excluir publicações
       forwarded: Encaminhados
+      forwarded_replies_explanation: Este relatório é de um usuário remoto e é sobre um conteúdo remoto. Ele foi encaminhado para você porque o conteúdo denunciado está em resposta a um de seus usuários.
       forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
       mark_as_sensitive: Marcar como sensível
@@ -996,8 +997,6 @@ pt-BR:
       new_trending_statuses:
         title: Publicações em alta
       new_trending_tags:
-        no_approved_tags: No momento, não há hashtags de tendências aprovadas.
-        requirements: 'Qualquer um desses candidatos poderia ultrapassar a hashtag de tendência aprovada #%{rank} , que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.'
         title: Hashtags em alta
       subject: Novas tendências para revisão em %{instance}
   aliases:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ce7479aa86..89da6b480e 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -611,6 +611,7 @@ pt-PT:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicações
       forwarded: Encaminhado
+      forwarded_replies_explanation: Esta denúncia é de um utilizador remoto e sobre conteúdo remoto. Foi encaminhada para si porque o conteúdo denunciado é em resposta a um dos seus utilizadores.
       forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
       mark_as_sensitive: Marcar como problemático
@@ -996,8 +997,6 @@ pt-PT:
       new_trending_statuses:
         title: Publicações em alta
       new_trending_tags:
-        no_approved_tags: 'Neste momento, não existem #etiquetas aprovadas para destaque.'
-        requirements: 'Qualquer um destes candidatos pode ultrapassar a #%{rank} etiqueta aprovada em destaque, que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.'
         title: Etiquetas em alta
       subject: Novas tendências para revisão em %{instance}
   aliases:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7bfccb9a0f..b1c86494c7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -635,6 +635,7 @@ ru:
       created_at: Создана
       delete_and_resolve: Удалить посты
       forwarded: Переслано
+      forwarded_replies_explanation: Этот отчёт получен от удаленного пользователя и касается удаленного содержимого. Он был направлен вам, так как содержимое сообщения является ответом одному из ваших пользователей.
       forwarded_to: Переслано на %{domain}
       mark_as_resolved: Отметить как решённую
       mark_as_sensitive: Отметить как деликатное
@@ -1032,8 +1033,6 @@ ru:
       new_trending_statuses:
         title: Популярные посты
       new_trending_tags:
-        no_approved_tags: На данный момент популярные подтвержденные хэштеги отсутствуют.
-        requirements: 'Каждый из этих кандидатов может превысить #%{rank} одобренных популярных хештегов. Сейчас это #%{lowest_tag_name} с числом %{lowest_tag_score}.'
         title: Популярные хэштеги
       subject: Новые тренды для проверки на %{instance}
   aliases:
@@ -1082,6 +1081,7 @@ ru:
       clicking_this_link: нажатие на эту ссылку
       login_link: войти
       proceed_to_login_html: Теперь вы можете перейти к %{login_link}.
+      redirect_to_app_html: Вы должны были перенаправлены на приложение <strong>%{app_name}</strong>. Если этого не произошло, попробуйте %{clicking_this_link} или вернитесь к приложению вручную.
       registration_complete: Ваша регистрация на %{domain} завершена!
       welcome_title: Добро пожаловать, %{name}!
       wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
@@ -1417,6 +1417,7 @@ ru:
       '86400': 1 день
     expires_in_prompt: Никогда
     generate: Сгенерировать
+    invalid: Это приглашение недействительно
     invited_by: 'Вас пригласил(а):'
     max_uses:
       few: "%{count} раза"
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 2199c5dbfd..f77c4c7978 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -890,8 +890,6 @@ sco:
       new_trending_statuses:
         title: Trendin posts
       new_trending_tags:
-        no_approved_tags: There nae approved trendin hashtags the noo.
-        requirements: 'Onie o thir candidates cuid surpass the #%{rank} approved trendin hashtag, thit''s #%{lowest_tag_name} the noo, wi a score o %{lowest_tag_score}.'
         title: Trendin hashtags
       subject: New trends up fir luikin ower on %{instance}
   aliases:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 2c2a8ae824..70aefafc11 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -768,8 +768,6 @@ si:
       new_trending_statuses:
         title: නැගී එන ලිපි
       new_trending_tags:
-        no_approved_tags: දැනට අනුමත ප්‍රවණතා හැෂ් ටැග් නොමැත.
-        requirements: 'මෙම ඕනෑම අපේක්ෂකයෙකුට #%{rank} අනුමත ප්‍රවණතා හැෂ් ටැගය අභිබවා යා හැකිය, එය දැනට ලකුණු %{lowest_tag_score}ක් සමඟ #%{lowest_tag_name} වේ.'
         title: ප්‍රවණතා හැෂ් ටැග්
       subject: "%{instance}හි සමාලෝචනය සඳහා නව ප්‍රවණතා"
   aliases:
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 3504b39537..d25412561b 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -8,6 +8,8 @@ eo:
         fields: Via retpaĝo, pronomoj, aĝo, ĉio, kion vi volas.
         indexable: Viaj publikaj afiŝoj povas aperi en serĉrezultoj ĉe Mastodon. Homoj, kiuj interagis kun viaj afiŝoj, eble povos serĉi ilin sendepende.
         note: 'Vi povas @mencii aliajn homojn aŭ #haŝetikedoj.'
+        show_collections: Homoj povos foliumi viajn sekvatojn kaj sekvantojn. Homoj, kiujn vi sekvas, vidos, ke vi sekvas ilin ĉiaokaze.
+        unlocked: Homoj povos sekvi vin sen peto de aprobo. Malelektu se vi volas kontroli petojn de sekvado kaj elekti, ĉu akcepti aŭ malakcepti novajn sekvantojn.
       account_alias:
         acct: Specifu la uzantnomon@domajnon de la konto el kiu vi volas translokiĝi
       account_migration:
@@ -118,6 +120,9 @@ eo:
       sessions:
         otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:'
         webauthn: Se ĝi estas USB-ŝlosilo, certu enmeti ĝin kaj, se necese, frapi ĝin.
+      settings:
+        indexable: Via profila paĝo povas aperi en serĉrezultoj en Google, Bing kaj aliaj.
+        show_application: Vi ĉiam povos vidi kiu aplikaĵo publikigis vian afiŝon ĉiaokaze.
       tag:
         name: Vi povas ŝanĝi nur la majuskladon de la literoj, ekzemple, por igi ĝin pli legebla
       user:
@@ -135,9 +140,13 @@ eo:
         url: Kien eventoj sendotas
     labels:
       account:
+        discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj
         fields:
           name: Etikedo
           value: Enhavo
+        indexable: Inkludi publikajn afiŝojn en serĉrezultoj
+        show_collections: Montri sekvatojn kaj sekvantojn en la profilo
+        unlocked: Aŭtomate akcepti novajn sekvantojn
       account_alias:
         acct: Tenilo de la malnovan konton
       account_migration:
@@ -221,7 +230,7 @@ eo:
         username_or_email: Uzantnomo aŭ Retadreso
         whole_word: Tuta vorto
       email_domain_block:
-        with_dns_records: Inkluzu MX-rekordojn kaj IP de la domajno
+        with_dns_records: Inkludi MX-rekordojn kaj IP-jn de la domajno
       featured_tag:
         name: Kradvorto
       filters:
@@ -282,9 +291,18 @@ eo:
         pending_account: Sendi retmesaĝon kiam nova konto bezonas kontrolon
         reblog: Sendi retmesaĝon kiam iu diskonigas vian mesaĝon
         report: Nova raporto estas proponita
+        software_updates:
+          all: Sciigi pri ĉiuj ĝisdatigoj
+          critical: Sciigi nur pri gravaj ĝisdatigoj
+          label: Nova Mastodon-versio disponeblas
+          none: Neniam sciigi pri ĝisdatigoj (malrekomendita)
+          patch: Sciigi pri cimoriparaj ĝisdatigoj
         trending_tag: Nova furoro bezonas kontrolon
       rule:
         text: Regulo
+      settings:
+        indexable: Inkludi profilan paĝon en serĉiloj
+        show_application: Montri el kiu aplikaĵo vi sendis afiŝon
       tag:
         listable: Permesi ĉi tiun kradvorton aperi en serĉoj kaj sugestoj
         name: Kradvorto
@@ -305,6 +323,7 @@ eo:
         url: Finpunkto-URL
     'no': Ne
     not_recommended: Nerekomendita
+    overridden: Anstataŭigita
     recommended: Rekomendita
     required:
       mark: "*"
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index b5a80da981..501e1f333e 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -69,7 +69,7 @@ et:
         domain: See võib olla e-postiaadressis näha olev domeen või MX-kirje, mida aadress kasutab. Kontroll toimub liitumise käigus.
         with_dns_records: Püütakse lahendada selle domeeni DNS-kirjed ja ühtlasi blokeerida ka selle tulemused
       featured_tag:
-        name: 'Siin on mõned nendest siltidest mida sa oled kõige hiljutisemalt kasutanud:'
+        name: 'Siin on mõned nendest siltidest, mida oled viimati kasutanud:'
       filters:
         action: Tegevuse valik, kui postitus vastab filtrile
         actions:
@@ -98,7 +98,7 @@ et:
         thumbnail: Umbes 2:1 mõõdus pilt serveri informatsiooni kõrval.
         timeline_preview: Sisenemata külastajatel on võimalik sirvida viimaseid avalikke postitusi serveril.
         trendable_by_default: Populaarse sisu ülevaatuse vahele jätmine. Pärast seda on siiski võimalik üksikuid üksusi trendidest eemaldada.
-        trends: Populaarsuse suunad näitavad millised postitused, sildid ja uudislood koguvad sinu serveris tähelepanu.
+        trends: Trendid näitavad, millised postitused, sildid ja uudislood koguvad sinu serveris tähelepanu.
         trends_as_landing_page: Näitab välja logitud kasutajatele ja külalistele serveri kirjelduse asemel populaarset sisu. Populaarne sisu (trendid) peab selleks olema sisse lülitatud.
       form_challenge:
         current_password: Turvalisse alasse sisenemine
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index bada4c3d0f..29f2398a90 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -188,7 +188,7 @@ fi:
         email: Sähköpostiosoite
         expires_in: Vanhenee
         fields: Lisäkentät
-        header: Otsikkokuva
+        header: Otsakekuva
         honeypot: "%{label} (älä täytä)"
         inbox_url: Välittäjän postilaatikon URL-osoite
         irreversible: Pudota piilottamisen sijaan
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index b917f551c7..7bafca6b71 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -108,7 +108,7 @@ gl:
         text: Esto axudaranos a revisar a tua solicitude
       ip_block:
         comment: Opcional. Lembrar a razón para engadir esta regra.
-        expires_in: Os enderezos IP son un recurso finito, a veces son compartidos e cambian de mans con frecuencia. Por esta razón, non se recomendan os bloqueos indefinidos de IPs.
+        expires_in: Os enderezos IP son un recurso finito, a veces son compartidos e cambian de mans con frecuencia. Por esta razón, non se aconsellan os bloqueos indefinidos de IPs.
         ip: Escribe un enderezo IPv4 ou IPv6. Podes bloquear rangos completos usando a sintaxe CIDR. Ten coidado e non te bloquees a ti mesma!
         severities:
           no_access: Bloquear acceso a tódolos recursos
@@ -295,7 +295,7 @@ gl:
           all: Notificar todas as actualizacións
           critical: Notificar só as actualizacións críticas
           label: Hai unha nova versión de Mastodon dispoñible
-          none: Non notificar nunca as actualizacións (non se recomenda)
+          none: Non notificar nunca as actualizacións (non se aconsella)
           patch: Notificar as actualizacións de arranxos
         trending_tag: Hai que revisar unha nova tendencia
       rule:
@@ -322,9 +322,9 @@ gl:
         template: Modelo de carga
         url: URL do extremo
     'no': Non
-    not_recommended: Non é recomendable
+    not_recommended: Non se aconsella
     overridden: Sobreescrita
-    recommended: Recomendado
+    recommended: Aconsellable
     required:
       mark: "*"
       text: requerido
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 13ea8a0c4f..0a8a57c347 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -85,7 +85,7 @@ he:
         mascot: בחירת ציור למנשק הווב המתקדם.
         media_cache_retention_period: קבצי מדיה שהורדו ימחקו אחרי מספר הימים שיצוינו אם נבחר מספר חיובי, או-אז יורדו שוב מחדש בהתאם לצורך.
         peers_api_enabled: רשימת השרתים ששרת זה פגש בפדיוורס. לא כולל מידע לגבי קשר ישיר עם שרת נתון, אלא רק שידוע לשרת זה על קיומו. מידע זה משמש שירותים האוספים סטטיסטיקות כלליות על הפדרציה.
-        profile_directory: מדריך הפרופילים מפרט את כל המשתמשים שביקשו להיות ניתנים לגילוי.
+        profile_directory: ספריית הפרופילים מציגה ברשימה את כל המשתמשים שביקשו להיות ניתנים לגילוי.
         require_invite_text: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
         site_contact_email: מה היא הדרך ליצור איתך קשר לצורך תמיכה או לצורך תאימות עם החוק.
         site_contact_username: כיצד יכולים אחרים ליצור איתך קשר על רשת מסטודון.
@@ -140,7 +140,7 @@ he:
         url: היעד שאליו יישלחו אירועים
     labels:
       account:
-        discoverable: חשיפת פרופיל משתמש והודעות לאלגוריתם של האתר
+        discoverable: הצג משתמש ופוסטים בעמוד התגליות
         fields:
           name: תווית
           value: תוכן
@@ -188,7 +188,7 @@ he:
         email: כתובת דוא"ל
         expires_in: תפוגה לאחר
         fields: מטא-נתונים על הפרופיל
-        header: כותרת
+        header: תמונת נושא
         honeypot: "%{label} (לא למלא)"
         inbox_url: קישורית לתיבת ממסר
         irreversible: הסרה במקום הסתרה
@@ -268,7 +268,7 @@ he:
       interactions:
         must_be_follower: חסימת התראות משאינם עוקבים
         must_be_following: חסימת התראות משאינם נעקבים
-        must_be_following_dm: חסימת הודעות ישירות מכותבים שאינם במעקב
+        must_be_following_dm: חסימת הודעות ישירות מחשבונות שאתם לא עוקבים אחריהם
       invite:
         comment: הערה
       invite_request:
@@ -286,7 +286,7 @@ he:
         digest: שליחת הודעות דוא"ל מסכמות
         favourite: שליחת דוא"ל כשמחבבים הודעה
         follow: שליחת דוא"ל כשנוספות עוקבות
-        follow_request: שליחת דוא"ל כשמבקשים לעקוב
+        follow_request: מישהו.י ביקש.ה לעקוב אחריך
         mention: שליחת דוא"ל כשפונים אלייך
         pending_account: נדרשת סקירה של חשבון חדש
         reblog: שליחת דוא"ל כשמהדהדים הודעה שלך
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 8f0178c7b2..3db4fd3b4a 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -7,6 +7,7 @@ hr:
       account_warning_preset:
         title: Proizvoljno. Nije vidljivo primatelju
       defaults:
+        autofollow: Ljudi koji se registriraju kroz pozivnicu će te automatski slijediti
         avatar: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
         header: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
         password: Mora biti najmanje 8 znakova
@@ -22,6 +23,7 @@ hr:
       admin_account_action:
         type: Radnja
       defaults:
+        avatar: Profilna slika
         confirm_new_password: Potvrdi novu lozinku
         confirm_password: Potvrdi lozinku
         current_password: Trenutna lozinka
@@ -38,8 +40,10 @@ hr:
         setting_display_media_default: Zadano
         setting_display_media_hide_all: Sakrij sve
         setting_display_media_show_all: Prikaži sve
+        setting_reduce_motion: Smanji kretanje u animacijama
         setting_system_font_ui: Koristi zadani font sustava
         setting_theme: Tema stranice
+        setting_trends: Prikaži današnje trendove
         type: Tip uvoza
         username: Korisničko ime
       interactions:
@@ -53,6 +57,8 @@ hr:
         mention: Netko Vas spomene
         reblog: Netko boosta Vaš status
     'no': Ne
+    not_recommended: Nije preporučeno
+    recommended: Preporučeno
     required:
       text: obavezno
     'yes': Da
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 7b26561553..4da58e6c64 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -4,7 +4,7 @@ ko:
     hints:
       account:
         discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다
-        display_name: 실명 혹은 별명.
+        display_name: 진짜 이름 또는 재미난 이름.
         fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들.
         indexable: 내 공개 게시물이 마스토돈의 검색 결과에 나타날 수 있습니다. 내 게시물과 상호작용했던 사람들은 이 설정과 관계 없이 그 게시물을 검색할 수 있습니다.
         note: '남을 @mention 하거나 #hashtag 태그를 달 수 있습니다.'
@@ -188,14 +188,14 @@ ko:
         email: 이메일 주소
         expires_in: 만기
         fields: 부가 필드
-        header: 헤더
+        header: 헤더 사진
         honeypot: "%{label} (채우지 마시오)"
         inbox_url: 릴레이 서버의 inbox URL
         irreversible: 숨기는 대신 삭제
         locale: 인터페이스 언어
         max_uses: 사용 횟수 제한
         new_password: 새로운 암호 입력
-        note: 소개
+        note: 자기소개
         otp_attempt: 이중 인증 코드
         password: 암호
         phrase: 키워드 또는 문장
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 69a6b86dd1..39caaf6baf 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -10,17 +10,36 @@ lt:
         note: 'Gali @paminėti kitus žmones arba #saitažodžius.'
         show_collections: Žmonės galės peržiūrėti tavo sekimus ir sekėjus. Žmonės, kuriuos seki, matys, kad juos seki, nepaisant to.
         unlocked: Žmonės galės tave sekti nepaprašę patvirtinimo. Panaikink žymėjimą, jei nori peržiūrėti sekimo prašymus ir pasirinkti, ar priimti, ar atmesti naujus sekėjus.
+      account_alias:
+        acct: Nurodyk paskyros, iš kurios nori perkelti, naudotojo vardą@domeną
+      account_migration:
+        acct: Nurodyk paskyros, į kurią nori perkelti, naudotojo vardą@domeną
       account_warning_preset:
-        text: Gali naudoti įrašų sintaksę, pavyzdžiui, URL adresus, saitažodus ir paminėjimus
+        text: Gali naudoti įrašų sintaksę, pavyzdžiui, URL adresus, saitažodžius ir paminėjimus
+        title: Pasirinktinai. Gavėjui nematomas
+      admin_account_action:
+        include_statuses: Naudotojas (-a) matys, dėl kurių įrašų buvo atliktas prižiūrimo arba įspėjimo veiksmas
+        send_email_notification: Naudotojas (-a) gaus paaiškinimą, kas nutiko su jo (-s) paskyra
+        text_html: Pasirinktinai. Gali naudoti įrašo sintaksę. Taupydamas (-a) laiką gali <a href="%{path}">pridėti įspėjimo išankstinius nustatymus</a>
+        type_html: Pasirink, ką daryti su <strong>%{acct}</strong>
+        types:
+          disable: Neleisk naudotojui naudotis savo paskyra, bet nepanaikink ir nepaslėpk jos turinio.
+          none: Naudok šią parinktį norėdamas (-a) išsiųsti įspėjimą naudotojui, nesukeldamas (-a) jokio kito veiksmo.
+          sensitive: Priversk visus šio naudotojo medijos priedus pažymėti kaip jautrius.
+          silence: Neleisk naudotojui skelbti viešai matomų įrašų, paslėpk jų įrašus ir pranešimus nuo žmonių, kurie neseka jo. Uždaro visus su šia paskyra susijusius ataskaitas.
       defaults:
+        avatar: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         header: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions}tšk.
         inbox_url: Nukopijuok URL adresą iš pradinio puslapio perdavėjo, kurį nori naudoti
         irreversible: Filtruoti įrašai išnyks negrįžtamai, net jei vėliau filtras bus pašalintas
         locale: Naudotojo sąsajos kalba, el. laiškai ir stumiamieji pranešimai
         password: Naudok bent 8 simbolius
         phrase: Bus suderinta, neatsižvelgiant į teksto korpusą arba įrašo turinio įspėjimą
-        setting_display_media_hide_all: Visada slėpti žiniasklaidą
-        setting_display_media_show_all: Visada rodyti žiniasklaidą
+        setting_always_send_emails: Paprastai pranešimai el. paštu nebus siunčiami, kai aktyviai naudoji Mastodon
+        setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista paspaudus
+        setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
+        setting_display_media_hide_all: Visada slėpti mediją
+        setting_display_media_show_all: Visada rodyti mediją
         setting_use_blurhash: Gradientai pagrįsti paslėptų vaizdų spalvomis, tačiau užgožia bet kokias detales
         setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio kanalo slinkimo
       featured_tag:
@@ -43,3 +62,23 @@ lt:
         name: Saitažodis
         trendable: Leisti šį saitažodį rodyti pagal trendus
         usable: Leisti įrašams naudoti šį saitažodį
+      user:
+        role: Vaidmuo
+      user_role:
+        permissions_as_keys: Leidimai
+        position: Prioritetas
+      webhook:
+        events: Įgalinti įvykiai
+        template: Naudingosios apkrovos šablonas
+        url: Galutinio taško URL
+    'no': Ne
+    not_recommended: Nerekomenduojama
+    overridden: Pakeista
+    recommended: Rekomenduojama
+    required:
+      mark: "*"
+      text: privalomas
+    title:
+      sessions:
+        webauthn: Prisijungimui naudoti vieną iš saugumo raktų
+    'yes': Taip
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index be21f862f3..13b2ad30af 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -15,25 +15,25 @@ zh-TW:
       account_migration:
         acct: 指定要移動至的帳號的「使用者名稱@網域名稱」
       account_warning_preset:
-        text: 您可使用嘟文語法，例如網址、「#」標籤和提及功能
-        title: 可選。不會向收件者顯示
+        text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
+        title: 可選的。不會向收件者顯示
       admin_account_action:
         include_statuses: 使用者可看到導致檢舉或警告的嘟文
         send_email_notification: 使用者將收到帳號發生之事情的解釋
-        text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
+        text_html: 可選的。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         types:
           disable: 禁止該使用者使用他們的帳號，但是不刪除或隱藏他們的內容。
           none: 使用這個寄送警告給該使用者，而不進行其他動作。
           sensitive: 強制標記此使用者所有多媒體附加檔案為敏感內容。
-          silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文和通知。關閉所有對此帳號之檢舉報告。
+          silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文與通知。關閉所有對此帳號之檢舉報告。
           suspend: 禁止所有對該帳號任何互動，並且刪除其內容。三十天內可以撤銷此動作。關閉所有對此帳號之檢舉報告。
-        warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
+        warning_preset_id: 可選的。您仍可於預設的結尾新增自訂文字
       announcement:
         all_day: 當選取時，僅顯示出時間範圍中的日期部分
-        ends_at: 可選的，公告會於該時間點自動取消發布
+        ends_at: 可選的。公告會於該時間點自動取消發布
         scheduled_at: 空白則立即發布公告
-        starts_at: 可選的，讓公告在特定時間範圍內顯示
+        starts_at: 可選的。讓公告於特定時間範圍內顯示
         text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
       appeal:
         text: 您只能對警示提出一次申訴
@@ -44,12 +44,12 @@ zh-TW:
         context: 此過濾器應套用於以下一項或多項情境
         current_password: 因安全因素，請輸入目前帳號的密碼
         current_username: 請輸入目前帳號的使用者名稱以確認
-        digest: 僅在您長時間未登入且在未登入期間收到私訊時傳送
+        digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
         header: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
         inbox_url: 從您想要使用的中繼首頁複製網址
         irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
-        locale: 使用者介面、電子郵件和推播通知的語言
+        locale: 使用者介面、電子郵件與推播通知的語言
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
@@ -62,12 +62,12 @@ zh-TW:
         setting_use_blurhash: 彩色漸層圖樣是基於隱藏媒體內容顏色產生，所有細節將變得模糊
         setting_use_pending_items: 關閉自動捲動更新，時間軸僅於點擊後更新
         username: 您可以使用字幕、數字與底線
-        whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
+        whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只於符合整個單字時才會套用
       domain_allow:
-        domain: 此網域將能夠攫取本站資料，而自該網域發出的資料也會於本站處理和留存。
+        domain: 此網域將能夠攫取本站資料，而自該網域發出的資料也會於本站處理及留存。
       email_domain_block:
-        domain: 這可以是顯示在電子郵件中的網域名稱，或是其使用的 MX 紀錄。其將於註冊時檢查。
-        with_dns_records: Mastodon 會嘗試解析所給網域的 DNS 記錄，解析結果一致者將一併封鎖
+        domain: 這可以是顯示於電子郵件中的網域名稱，或是其使用的 MX 紀錄。其將於註冊時檢查。
+        with_dns_records: Mastodon 會嘗試解析所提供之網域的 DNS 記錄，解析結果一致者將一併封鎖
       featured_tag:
         name: 這些是您最近使用的一些主題標籤：
       filters:
@@ -97,7 +97,7 @@ zh-TW:
         theme: 未登入之訪客或新使用者所見之佈景主題。
         thumbnail: 大約 2:1 圖片會顯示於您伺服器資訊之旁。
         timeline_preview: 未登入之訪客能夠瀏覽此伺服器上最新的公開嘟文。
-        trendable_by_default: 跳過手動審核熱門內容。仍能在登上熱門趨勢後移除個別內容。
+        trendable_by_default: 跳過手動審核熱門內容。仍能於登上熱門趨勢後移除個別內容。
         trends: 熱門趨勢將顯示於您伺服器上正在吸引大量注意力的嘟文、主題標籤、或者新聞。
         trends_as_landing_page: 顯示熱門趨勢內容給未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
       form_challenge:
@@ -107,9 +107,9 @@ zh-TW:
       invite_request:
         text: 這會協助我們審核您的申請
       ip_block:
-        comment: 可選的，但請記得您為何添加這項規則。
+        comment: 可選的。但請記得您為何添加這項規則。
         expires_in: IP 位址是經常共用或轉手的有限資源，不建議無限期地封鎖特定 IP 位址。
-        ip: 請輸入 IPv4 或 IPv6 位址，亦可以用 CIDR 語法以封鎖整個 IP 區段。小心不要將自己給一併封鎖掉囉！
+        ip: 請輸入 IPv4 或 IPv6 位址，亦可以用 CIDR 語法以封鎖整個 IP 區段。小心不要將自己一併封鎖掉囉！
         severities:
           no_access: 封鎖對所有資源存取
           sign_up_block: 無法註冊新帳號
@@ -129,11 +129,11 @@ zh-TW:
         chosen_languages: 當選取時，只有選取語言之嘟文會於公開時間軸中顯示
         role: 角色控制使用者有哪些權限
       user_role:
-        color: 在整個使用者介面中用於角色的顏色，十六進位格式的 RGB
+        color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
         highlighted: 這會讓角色公開可見
         name: 角色的公開名稱，如果角色設定為顯示為徽章
-        permissions_as_keys: 有此角色的使用者將有權存取……
-        position: 在某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
+        permissions_as_keys: 有此角色的使用者將有權存取...
+        position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
       webhook:
         events: 請選擇要傳送的事件
         template: 使用變數代換組合您自己的 JSON payload。留白以使用預設 JSON 。
@@ -155,7 +155,7 @@ zh-TW:
         text: 預設文字
         title: 標題
       admin_account_action:
-        include_statuses: 在電子郵件中加入檢舉的嘟文
+        include_statuses: 於電子郵件中加入檢舉之嘟文內容
         send_email_notification: 透過電子郵件通知使用者
         text: 自訂警告
         type: 動作
@@ -230,7 +230,7 @@ zh-TW:
         username_or_email: 使用者名稱或電子郵件地址
         whole_word: 整個詞彙
       email_domain_block:
-        with_dns_records: 包括網域的 MX 記錄和 IP 位址
+        with_dns_records: 包括網域的 MX 記錄與 IP 位址
       featured_tag:
         name: "「#」主題標籤"
       filters:
@@ -287,7 +287,7 @@ zh-TW:
         favourite: 當有使用者將您的嘟文加入最愛時，傳送電子郵件通知
         follow: 當有使用者跟隨您時，傳送電子郵件通知
         follow_request: 當有使用者請求跟隨您時，傳送電子郵件通知
-        mention: 當有使用者在嘟文提及您時，傳送電子郵件通知
+        mention: 當有使用者於嘟文提及您時，傳送電子郵件通知
         pending_account: 有新的帳號需要審核
         reblog: 當有使用者轉嘟您的嘟文時，傳送電子郵件通知
         report: 新回報已遞交
@@ -304,16 +304,16 @@ zh-TW:
         indexable: 於搜尋引擎中包含個人檔案頁面
         show_application: 顯示您發嘟文之應用程式
       tag:
-        listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
+        listable: 允許此主題標籤於搜尋及個人檔案目錄中顯示
         name: 主題標籤
-        trendable: 允許此主題標籤在熱門趨勢下顯示
+        trendable: 允許此主題標籤於熱門趨勢下顯示
         usable: 允許嘟文使用此主題標籤
       user:
         role: 角色
         time_zone: 時區
       user_role:
         color: 識別顏色
-        highlighted: 在使用者個人檔案上將角色顯示為徽章
+        highlighted: 於使用者個人檔案中顯示角色徽章
         name: 名稱
         permissions_as_keys: 權限
         position: 優先權
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b31fe118a1..ecff5a6672 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -635,6 +635,7 @@ sl:
       created_at: Prijavljeno
       delete_and_resolve: Izbriši objave
       forwarded: Posredovano
+      forwarded_replies_explanation: To poročilo je od oddaljenega uporabnika in se nanaša na oddaljeno vsebino. Posredovano vam je bilo, ker je vsebina, o kateri poroča, odgovor enemu od vaših uporabnikov.
       forwarded_to: Posredovano na %{domain}
       mark_as_resolved: Označi kot rešeno
       mark_as_sensitive: Označi, kot občutljivo
@@ -1032,8 +1033,6 @@ sl:
       new_trending_statuses:
         title: Trendne objave
       new_trending_tags:
-        no_approved_tags: Trenutno ni odobrenih ključnikov v trendu.
-        requirements: Vsak od teh kandidatov bi lahko presegel odobreni ključnik v trendu št. %{rank}, ki je trenutno %{lowest_tag_name} z rezultatom %{lowest_tag_score}.
         title: Ključniki v trendu
       subject: Novi trendi za pregled na %{instance}
   aliases:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index bd01a80890..af1bb4644d 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1,18 +1,18 @@
 ---
 sq:
   about:
-    about_mastodon_html: 'Rrjeti shoqëror i së ardhmes: Pa reklama, pa survejim nga korporata, konceptim etik dhe decentralizim! Jini zot i të dhënave tuaja, me Mastodon-in!'
-    contact_missing: I parregulluar
+    about_mastodon_html: 'Rrjeti social i së ardhmes: Pa reklama, pa sy vëzhguese nga korporata, etik dhe i decentralizuar! Merrni sërisht zotësinë e të dhënave tuaja, me Mastodon!'
+    contact_missing: E pacaktuar
     contact_unavailable: N/A
-    hosted_on: Mastodon i strehuar në %{domain}
+    hosted_on: Server Mastodon i strehuar në %{domain}
     title: Mbi
   accounts:
     follow: Ndiqeni
     followers:
       one: Ndjekës
       other: Ndjekës
-    following: Ndjekje
-    instance_actor_flash: Kjo llogari është një aktor virtual, i përdorur për të përfaqësuar vetë shërbyesin dhe jo ndonjë përdorues individual. Përdoret për qëllime federimi dhe s’duhet pezulluar.
+    following: Po ndjek
+    instance_actor_flash: Kjo llogari është një aktor virtual, i përdorur për të përfaqësuar vetë serverin dhe jo ndonjë përdorues. Përdoret për qëllime federimi dhe s’duhet pezulluar.
     last_active: aktiv së fundi
     link_verified_on: Pronësia e kësaj lidhjeje qe kontrolluar më %{date}
     nothing_here: S’ka gjë këtu!
@@ -610,6 +610,7 @@ sq:
       created_at: Raportuar më
       delete_and_resolve: Fshiji postimet
       forwarded: U përcoll
+      forwarded_replies_explanation: Ky raportim është nga një përdorues i largët dhe rreth lënde të largët. Ju është përcjellë ngaqë lënda e raportuar gjendet në përgjigje ndaj njërit prej përdoruesve tuaj.
       forwarded_to: U përcoll te %{domain}
       mark_as_resolved: Vëri shenjë si i zgjidhur
       mark_as_sensitive: Vëri shenjë si rezervat
@@ -925,6 +926,7 @@ sq:
         peaked_on_and_decaying: Kulmoi më %{date}, tani në rënie
         title: Hashtag-ë në modë
         trendable: Mund të shfaqet nën të modës
+        trending_rank: 'Trending #%{rank}'
         usable: Mund të përdoret
         usage_comparison: Përdorur %{today} herë sot, krahasuar me %{yesterday} dje
         used_by_over_week:
@@ -991,7 +993,6 @@ sq:
       new_trending_statuses:
         title: Postime në modë
       new_trending_tags:
-        no_approved_tags: Aktualisht s’ka hashtag-ë në modë të miratuar.
         title: Hashtag-ë në modë
       subject: Gjëra të reja në modë për shqyrtim te %{instance}
   aliases:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 6ccec7fd9a..e8760697e2 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -623,6 +623,7 @@ sr-Latn:
       created_at: Prijavljena
       delete_and_resolve: Obriši objave
       forwarded: Prosleđeno
+      forwarded_replies_explanation: Ovaj izveštaj je od udaljenog korisnika i o udaljenom sadržaju. Prosleđen vam je jer je prijavljeni sadržaj u odgovoru jednom od vaših korisnika.
       forwarded_to: Prosleđeno ka %{domain}
       mark_as_resolved: Označi kao rešenu
       mark_as_sensitive: Obeleži kao osetljivo
@@ -1014,8 +1015,6 @@ sr-Latn:
       new_trending_statuses:
         title: Objave u trendu
       new_trending_tags:
-        no_approved_tags: Trenutno nema odobrenih heš oznaka u trendu.
-        requirements: 'Bilo koji od sledećih kandidata bi mogao prevazići #%{rank} odobrenu heš oznaku u trendu, koja je trenutno #%{lowest_tag_name} sa vrednošću %{lowest_tag_score}.'
         title: Heš oznake u trendu
       subject: Novi trendovi za pregled na %{instance}
   aliases:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 407908517b..b32d86f652 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -623,6 +623,7 @@ sr:
       created_at: Пријављена
       delete_and_resolve: Обриши објаве
       forwarded: Прослеђено
+      forwarded_replies_explanation: Овај извештај је од удаљеног корисника и о удаљеном садржају. Прослеђен вам је јер је пријављени садржај у одговору једном од ваших корисника.
       forwarded_to: Прослеђено ка %{domain}
       mark_as_resolved: Означи као решену
       mark_as_sensitive: Обележи као осетљиво
@@ -1014,8 +1015,6 @@ sr:
       new_trending_statuses:
         title: Објаве у тренду
       new_trending_tags:
-        no_approved_tags: Тренутно нема одобрених хеш ознака у тренду.
-        requirements: 'Било који од следећих кандидата би могао превазићи #%{rank} одобрену хеш ознаку у тренду, која је тренутно #%{lowest_tag_name} са вредношћу %{lowest_tag_score}.'
         title: Хеш ознаке у тренду
       subject: Нови трендови за преглед на %{instance}
   aliases:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8126455f4c..f7a6f33a08 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -996,8 +996,6 @@ sv:
       new_trending_statuses:
         title: Trendande inlägg
       new_trending_tags:
-        no_approved_tags: Det finns för närvarande inga godkända trendande hashtaggar.
-        requirements: 'Någon av dessa kandidater skulle kunna överträffa #%{rank} godkända trendande hashtaggar, som för närvarande är #%{lowest_tag_name} med en poäng på %{lowest_tag_score}.'
         title: Trendande hashtaggar
       subject: Nya trender tillgängliga för granskning på %{instance}
   aliases:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 6618998962..59a6b2c4fb 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -560,7 +560,7 @@ th:
       enabled: เปิดใช้งานอยู่
       inbox_url: URL ของรีเลย์
       pending: กำลังรอการอนุมัติของรีเลย์
-      save_and_enable: บันทึกแล้วเปิดใช้งาน
+      save_and_enable: บันทึกและเปิดใช้งาน
       setup: ตั้งค่าการเชื่อมต่อรีเลย์
       signatures_not_enabled: รีเลย์อาจทำงานไม่ถูกต้องขณะที่มีการเปิดใช้งานโหมดปลอดภัยหรือโหมดการติดต่อกับภายนอกแบบจำกัด
       status: สถานะ
@@ -599,6 +599,7 @@ th:
       created_at: รายงานเมื่อ
       delete_and_resolve: ลบโพสต์
       forwarded: ส่งต่อแล้ว
+      forwarded_replies_explanation: รายงานนี้มาจากผู้ใช้ระยะไกลและเกี่ยวกับเนื้อหาระยะไกล มีการส่งต่อรายงานไปยังคุณเนื่องจากเนื้อหาที่รายงานอยู่ในการตอบกลับหนึ่งในผู้ใช้ของคุณ
       forwarded_to: ส่งต่อไปยัง %{domain} แล้ว
       mark_as_resolved: ทำเครื่องหมายว่าแก้ปัญหาแล้ว
       mark_as_sensitive: ทำเครื่องหมายว่าละเอียดอ่อน
@@ -978,8 +979,6 @@ th:
       new_trending_statuses:
         title: โพสต์ที่กำลังนิยม
       new_trending_tags:
-        no_approved_tags: ไม่มีแฮชแท็กที่กำลังนิยมที่ได้รับอนุมัติในปัจจุบัน
-        requirements: 'ตัวเลือกใดก็ตามนี้สามารถแซงหน้าแฮชแท็กที่กำลังนิยมที่ได้รับอนุมัติ #%{rank} ซึ่งคือ #%{lowest_tag_name} ในปัจจุบันด้วยคะแนน %{lowest_tag_score}'
         title: แฮชแท็กที่กำลังนิยม
       subject: แนวโน้มใหม่สำหรับตรวจทานใน %{instance}
   aliases:
@@ -1556,7 +1555,7 @@ th:
     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/tr.yml b/config/locales/tr.yml
index 9d4d95a838..098719eb7a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -611,6 +611,7 @@ tr:
       created_at: Şikayet edildi
       delete_and_resolve: Gönderileri sil
       forwarded: İletildi
+      forwarded_replies_explanation: Bu bildirim başka bir sunucudaki kullanıcı ve içerik ile ilgili. Bildirilen içerik kullanıcılarınızdan birine yanıt şeklinde olduğu için size yönlendirildi.
       forwarded_to: "%{domain}'e iletildi"
       mark_as_resolved: Giderildi olarak işaretle
       mark_as_sensitive: Hassas olarak işaretle
@@ -996,8 +997,6 @@ tr:
       new_trending_statuses:
         title: Öne çıkan gönderiler
       new_trending_tags:
-        no_approved_tags: Şu anda onaylanmış öne çıkan etiket yok.
-        requirements: 'Aşağıdaki adaylardan herhangi biri, şu anda %{lowest_tag_score} skoruna sahip "%{lowest_tag_name}" olan #%{rank} onaylanmış öne çıkan etiketi geçebilir.'
         title: Öne çıkan etiketler
       subject: "%{instance}, inceleme bekleyen yeni öne çıkan öğelere sahip"
   aliases:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2261c647ba..139b8be30d 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -635,6 +635,7 @@ uk:
       created_at: Створено
       delete_and_resolve: Видалити дописи
       forwarded: Переслано
+      forwarded_replies_explanation: Цей звіт належить віддаленому користувачеві і про віддалений вміст. Контент був пересланий вам, тому що він містить повідомлення у відповідь одному з ваших користувачів.
       forwarded_to: Переслано до %{domain}
       mark_as_resolved: Позначити вирішеним
       mark_as_sensitive: Позначити делікатним
@@ -1032,8 +1033,6 @@ uk:
       new_trending_statuses:
         title: Популярні дописи
       new_trending_tags:
-        no_approved_tags: На цей час немає схвалених популярних хештегів.
-        requirements: 'Кожен з цих кандидатів може перевершити #%{rank} затвердженого популярного хештеґу, який зараз на #%{lowest_tag_name} з рейтингом %{lowest_tag_score}.'
         title: Популярні хештеги
       subject: Нове популярне до розгляду на %{instance}
   aliases:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index ec8f6c1395..c06a84b973 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -599,6 +599,7 @@ vi:
       created_at: Báo cáo lúc
       delete_and_resolve: Xóa tút
       forwarded: Chuyển tiếp
+      forwarded_replies_explanation: Báo cáo này từ người dùng ở một máy chủ khác và về nội dung ở một máy chủ khác. Nó được chuyển tiếp tới bạn vì nội dung bị báo cáo là lượt trả lời cho một trong những người dùng của bạn.
       forwarded_to: Chuyển tiếp tới %{domain}
       mark_as_resolved: Xử lý xong
       mark_as_sensitive: Đánh dấu nhạy cảm
@@ -978,8 +979,6 @@ vi:
       new_trending_statuses:
         title: Tút nổi bật
       new_trending_tags:
-        no_approved_tags: Hiện tại không có hashtag nổi bật nào được duyệt.
-        requirements: 'Bất kỳ ứng cử viên nào vượt qua #%{rank} duyệt hashtag nổi bật, với hiện tại là "%{lowest_tag_name}" với điểm số %{lowest_tag_score}.'
         title: Hashtag nổi bật
       subject: Nội dung nổi bật chờ duyệt trên %{instance}
   aliases:
@@ -1343,6 +1342,7 @@ vi:
       '86400': 1 ngày
     expires_in_prompt: Không giới hạn
     generate: Tạo lời mời
+    invalid: Lời mời không hợp lệ
     invited_by: 'Bạn đã được mời bởi:'
     max_uses:
       other: "%{count} lần dùng"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index b98193065b..ec4d714233 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -599,6 +599,7 @@ zh-CN:
       created_at: 举报时间
       delete_and_resolve: 删除嘟文
       forwarded: 已转发
+      forwarded_replies_explanation: 该举报来自外站用户，涉及外站内容。之所以转发给您，是因为被举报的内容是对您站点一位用户的回复。
       forwarded_to: 转发举报至 %{domain}
       mark_as_resolved: 标记为已处理
       mark_as_sensitive: 标记为敏感内容
@@ -978,8 +979,6 @@ zh-CN:
       new_trending_statuses:
         title: 热门嘟文
       new_trending_tags:
-        no_approved_tags: 目前没有经批准的热门标签。
-        requirements: '这些候选人都可能会超过#%{rank} 批准的热门标签，目前是 #%{lowest_tag_name} ，分数为 %{lowest_tag_score}。'
         title: 热门标签
       subject: "%{instance} 上有新热门等待审核"
   aliases:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index f13cedad6e..01a0a026a7 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -599,6 +599,7 @@ zh-HK:
       created_at: 日期
       delete_and_resolve: 刪除帖文
       forwarded: 已轉寄
+      forwarded_replies_explanation: 這份檢舉來自一位遠端使用者，並涉及遠端內容。之所以轉交給你，是因為被檢舉的內容是回覆你其中一位使用者。
       forwarded_to: 已轉寄到 %{domain}
       mark_as_resolved: 標示為「已處理」
       mark_as_sensitive: 標記為敏感內容
@@ -978,8 +979,6 @@ zh-HK:
       new_trending_statuses:
         title: 熱門帖文
       new_trending_tags:
-        no_approved_tags: 目前沒有經核准的熱門標籤。
-        requirements: '任何一個候選都可能超過 #%{rank} 被核准的標籤。目前是 %{lowest_tag_name} 標籤，得分為 %{lowest_tag_score}。'
         title: 熱門標籤
       subject: "%{instance} 上有待審核的新熱門"
   aliases:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3063b7afd1..755ac34038 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,10 +1,10 @@
 ---
 zh-TW:
   about:
-    about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，在上面建立帳號，然後您就可以和任一 Mastodon 站點上的使用者互通，享受無縫的<em>社群網路</em>交流。
+    about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，於其建立帳號，您就能與任一 Mastodon 站點上的使用者互通，享受無縫的<em>社群網路</em>交流。
     contact_missing: 未設定
     contact_unavailable: 未公開
-    hosted_on: 在 %{domain} 運作的 Mastodon 站點
+    hosted_on: 於 %{domain} 託管之 Mastodon 站點
     title: 關於本站
   accounts:
     follow: 跟隨
@@ -13,7 +13,7 @@ zh-TW:
     following: 正在跟隨
     instance_actor_flash: 此帳號是用來代表此伺服器的虛擬執行者，而非個別使用者。它的用途為維繫聯邦宇宙，且不應被停權。
     last_active: 上次活躍時間
-    link_verified_on: 此連結的所有權已在 %{date} 檢查過
+    link_verified_on: 此連結之所有權已於 %{date} 檢查過
     nothing_here: 暫時沒有內容可供顯示！
     pin_errors:
       following: 您只能推薦您正在跟隨的使用者。
@@ -70,7 +70,7 @@ zh-TW:
       enabled_msg: 成功解除 %{username} 帳號的凍結
       followers: 跟隨者
       follows: 正在跟隨
-      header: 開頭
+      header: 封面圖片
       inbox_url: 收件匣 (Inbox) URL
       invite_request_text: 加入原因
       invited_by: 邀請者
@@ -115,9 +115,9 @@ zh-TW:
       reject: 拒絕
       rejected_msg: 已成功婉拒 %{username} 的新帳號申請
       remote_suspension_irreversible: 此帳號之資料已被不可逆地刪除。
-      remote_suspension_reversible_hint_html: 這個帳號已於此伺服器被停權，所有資料將會於 %{date} 被刪除。在此之前，遠端伺服器可以完全回復此的帳號。如果您想即時刪除這個帳號的資料，您可以在下面進行操作。
+      remote_suspension_reversible_hint_html: 這個帳號已於此伺服器被停權，所有資料將會於 %{date} 被刪除。於此之前，遠端伺服器可以完全回復此的帳號。如果您想即時刪除這個帳號的資料，您能於下面進行操作。
       remove_avatar: 取消大頭貼
-      remove_header: 移除開頭
+      remove_header: 移除封面圖片
       removed_avatar_msg: 已成功刪除 %{username} 的大頭貼
       removed_header_msg: 已成功刪除 %{username} 的封面圖片
       resend_confirmation:
@@ -149,7 +149,7 @@ zh-TW:
       suspend: 停權
       suspended: 已停權
       suspension_irreversible: 已永久刪除此帳號的資料。您可以取消這個帳號的停權狀態，但無法還原已刪除的資料。
-      suspension_reversible_hint_html: 這個帳號已被暫停，所有數據將於 %{date} 被刪除。在此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的數據，您可以在下面進行操作。
+      suspension_reversible_hint_html: 這個帳號已被暫停，所有數據將於 %{date} 被刪除。於此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的數據，您能於下面進行操作。
       title: 帳號
       unblock_email: 解除封鎖電子郵件地址
       unblocked_email_msg: 成功解除封鎖 %{username} 的電子郵件地址
@@ -333,7 +333,7 @@ zh-TW:
       not_permitted: 您無權執行此操作
       overwrite: 覆蓋
       shortcode: 短代碼
-      shortcode_hint: 至少 2 個字元，只能使用字母、數字和下劃線
+      shortcode_hint: 至少 2 個字元，只能使用字母、數字與下劃線
       title: 自訂表情符號
       uncategorized: 未分類
       unlist: 不公開
@@ -370,10 +370,10 @@ zh-TW:
     domain_allows:
       add_new: 將網域加入聯邦宇宙白名單
       created_msg: 網域已成功加入聯邦宇宙白名單
-      destroyed_msg: 網域已成功從聯邦宇宙白名單移除
+      destroyed_msg: 網域已成功自聯邦宇宙白名單移除
       export: 匯出
       import: 匯入
-      undo: 從聯邦宇宙白名單移除
+      undo: 自聯邦宇宙白名單移除
     domain_blocks:
       add_new: 新增網域黑名單
       confirm_suspension:
@@ -397,7 +397,7 @@ zh-TW:
         create: 新增封鎖
         hint: 站點封鎖動作並不會阻止帳號紀錄被新增至資料庫，但會自動回溯性地對那些帳號套用特定管理設定。
         severity:
-          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案和個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
+          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
           noop: 無
           silence: 靜音
           suspend: 停權
@@ -451,7 +451,7 @@ zh-TW:
         title: 匯入網域黑名單
       no_file: 尚未選擇檔案
     follow_recommendations:
-      description_html: "<strong>跟隨建議幫助新使用者們快速找到有趣的內容</strong>。當使用者沒有與其他帳號有足夠多的互動以建立個人化跟隨建議時，這些帳號將會被推薦。這些帳號將基於某選定語言之高互動和高本地跟隨者數量帳號而每日重新更新。"
+      description_html: "<strong>跟隨建議幫助新使用者們快速找到有趣的內容</strong>。當使用者沒有與其他帳號有足夠多的互動以建立個人化跟隨建議時，這些帳號將會被推薦。這些帳號將基於某選定語言之高互動與高本地跟隨者數量帳號而每日重新更新。"
       language: 對於語言
       status: 狀態
       suppress: 取消跟隨建議
@@ -461,7 +461,7 @@ zh-TW:
     instances:
       availability:
         description_html:
-          other: 若在<strong>%{count}天</strong>向某個網域遞送失敗，除非收到某個網域的遞送<em>表單</em>，否則不會繼續嘗試遞送。
+          other: 若於 <strong>%{count} 天</strong>向某個網域遞送失敗，除非收到某個網域的遞送<em>表單</em>，否則不會繼續嘗試遞送。
         failure_threshold_reached: 錯誤門檻於 %{date}。
         failures_recorded:
           other: 錯誤嘗試於 %{count} 天。
@@ -590,7 +590,7 @@ zh-TW:
       by_target_domain: 檢舉帳號之網域
       cancel: 取消
       category: 分類
-      category_description_html: 此帳號及/或被檢舉內容之原因會被引用在檢舉帳號通知中
+      category_description_html: 此帳號及/或被檢舉內容之原因將被引用於檢舉帳號通知中
       comment:
         none: 無
       comment_description_html: 提供更多資訊，%{name} 寫道：
@@ -599,6 +599,7 @@ zh-TW:
       created_at: 日期
       delete_and_resolve: 刪除嘟文
       forwarded: 已轉寄
+      forwarded_replies_explanation: 此報告來自聯邦宇宙中非本伺服器帳號，關於非本伺服器內容。此報告轉發給您，因為報告之內容是回覆給您的伺服器上某位使用者。
       forwarded_to: 轉寄到 %{domain}
       mark_as_resolved: 標記為「已解決」
       mark_as_sensitive: 標記為敏感內容
@@ -611,7 +612,7 @@ zh-TW:
         delete: 刪除
         placeholder: 記錄已執行的動作，或其他相關的更新...
         title: 備註
-      notes_description_html: 檢視及留下些給其他管理員和未來的自己的備註
+      notes_description_html: 檢視及留下些給其他管理員與未來的自己的備註
       processed_msg: '檢舉報告 #%{id} 已被成功處理'
       quick_actions_description_html: 採取一個快速行動，或者下捲以檢視檢舉內容：
       remote_user_placeholder: 來自 %{instance} 之遠端使用者
@@ -624,7 +625,7 @@ zh-TW:
       skip_to_actions: 跳過行動
       status: 嘟文
       statuses: 被檢舉的內容
-      statuses_description_html: 侵犯性違規內容會被引用在檢舉帳號通知中
+      statuses_description_html: 侵犯性違規內容將被引用於檢舉帳號通知中
       summary:
         action_preambles:
           delete_html: 您將要 <strong>移除</strong> 某些 <strong>@%{acct}</strong> 之嘟文。此將會：
@@ -677,7 +678,7 @@ zh-TW:
         manage_announcements: 管理公告
         manage_announcements_description: 允許使用者管理伺服器上的公告
         manage_appeals: 管理解封申訴系統
-        manage_appeals_description: 允許使用者審閱針對站務動作的申訴
+        manage_appeals_description: 允許使用者審閱針對站務動作之申訴
         manage_blocks: 管理封鎖
         manage_blocks_description: 允許使用者封鎖電子郵件提供者與 IP 位置
         manage_custom_emojis: 管理自訂表情符號
@@ -741,7 +742,7 @@ zh-TW:
         title: 預設將使用者排除於搜尋引擎索引
       discovery:
         follow_recommendations: 跟隨建議
-        preamble: 呈現有趣的內容有助於 Mastodon 上一人不識的新手上路。控制各種不同的分類在您伺服器上如何被探索到。
+        preamble: 呈現有趣的內容有助於 Mastodon 上一人不識的新手上路。控制各種不同的分類於您伺服器上如何被探索到。
         profile_directory: 個人檔案目錄
         public_timelines: 公開時間軸
         publish_discovered_servers: 公開已知伺服器列表
@@ -784,7 +785,7 @@ zh-TW:
     statuses:
       account: 作者
       application: 應用程式
-      back_to_account: 返回帳號訊息頁
+      back_to_account: 返回帳號資訊頁面
       back_to_report: 回到檢舉報告頁面
       batch:
         remove_from_report: 從檢舉報告中移除
@@ -980,8 +981,6 @@ zh-TW:
       new_trending_statuses:
         title: 熱門嘟文
       new_trending_tags:
-        no_approved_tags: 這些是目前仍未被審核之熱門主題標籤。
-        requirements: '這些候選中的任何一個都可能超過 #%{rank} 已批准的熱門主題標籤，該主題標籤目前是 #%{lowest_tag_name}，得分為 %{lowest_tag_score}。'
         title: 熱門主題標籤
       subject: "%{instance} 有待審核之新熱門"
   aliases:
@@ -989,11 +988,11 @@ zh-TW:
     created_msg: 成功建立別名。您可以自舊帳號開始轉移。
     deleted_msg: 成功移除別名。您將無法再由舊帳號轉移至目前的帳號。
     empty: 您目前沒有任何別名。
-    hint_html: 如果想由其他帳號轉移至此帳號，您可以於此處新增別名，稍後系統將容許您將跟隨者由舊帳號轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳號的遷移程序需要在舊帳號啟動</strong>。
+    hint_html: 如果想由其他帳號轉移至此帳號，您能於此處新增別名，稍後系統將容許您將跟隨者由舊帳號轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳號的遷移程序需要於舊帳號啟動</strong>。
     remove: 取消連結別名
   appearance:
     advanced_web_interface: 進階網頁介面
-    advanced_web_interface_hint: 進階網頁介面可讓您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表和主題標籤。
+    advanced_web_interface_hint: 進階網頁介面可讓您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表與主題標籤。
     animations_and_accessibility: 動畫與無障礙設定
     confirmation_dialogs: 確認對話框
     discovery: 探索
@@ -1033,13 +1032,13 @@ zh-TW:
       redirect_to_app_html: 您應被重新導向至 <strong>%{app_name}</strong> 應用程式。如尚未重新導向，請嘗試 %{clicking_this_link} 或手動回到應用程式。
       registration_complete: 您於 %{domain} 之註冊申請已完成！
       welcome_title: 歡迎，%{name}！
-      wrong_email_hint: 若電子郵件地址不正確，您可以於帳號設定中更改。
+      wrong_email_hint: 若電子郵件地址不正確，您能於帳號設定中更改。
     delete_account: 刪除帳號
     delete_account_html: 如果您欲刪除您的帳號，請<a href="%{path}">點擊這裡繼續</a>。您需要再三確認您的操作。
     description:
       prefix_invited_by_user: "@%{name} 邀請您加入這個 Mastodon 伺服器！"
       prefix_sign_up: 馬上註冊 Mastodon 帳號吧！
-      suffix: 有了帳號，就可以從任何 Mastodon 伺服器跟隨任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
+      suffix: 有了帳號，就可以自任何 Mastodon 伺服器跟隨任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
     didnt_get_confirmation: 沒有收到確認連結嗎？
     dont_have_your_security_key: 找不到您的安全金鑰？
     forgot_password: 忘記密碼？
@@ -1085,7 +1084,7 @@ zh-TW:
       preamble_html: 請使用您於 <strong>%{domain}</strong> 的帳號密碼登入。若您的帳號託管於其他伺服器，您將無法於此登入。
       title: 登入 %{domain}
     sign_up:
-      manual_review: "%{domain} 上的註冊由我們的管理員進行人工審核。為協助我們處理您的註冊，請寫一些關於您自己的資訊以及您想要在 %{domain} 上註冊帳號的原因。"
+      manual_review: "%{domain} 上的註冊由我們的管理員進行人工審核。為協助我們處理您的註冊，請寫一些關於您自己的資訊以及您欲於 %{domain} 上註冊帳號之原因。"
       preamble: 於此 Mastodon 伺服器擁有帳號的話，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
       title: 讓我們一起設定 %{domain} 吧！
     status:
@@ -1100,7 +1099,7 @@ zh-TW:
     use_security_key: 使用安全金鑰
   challenge:
     confirm: 繼續
-    hint_html: "<strong>温馨小提醒：</strong> 我們在接下來一小時內不會再要求您輸入密碼。"
+    hint_html: "<strong>温馨小提醒：</strong> 我們於接下來一小時內不會再要求您輸入密碼。"
     invalid_password: 密碼錯誤
     prompt: 輸入密碼以繼續
   crypto:
@@ -1134,8 +1133,8 @@ zh-TW:
     warning:
       before: 在進行下一步驟之前，請詳細閱讀以下説明：
       caches: 已被其他節點快取的內容可能會殘留其中
-      data_removal: 您的嘟文和其他資料將會被永久刪除
-      email_change_html: 您可以在不刪除帳號的情況下<a href="%{path}">變更您的電子郵件地址</a>
+      data_removal: 您的嘟文與其他資料將被永久刪除
+      email_change_html: 您能於不刪除帳號的情況下<a href="%{path}">變更您的電子郵件地址</a>
       email_contact_html: 如果您仍然沒有收到郵件，請寄信至 <a href="mailto:%{email}">%{email}</a> 以獲得協助
       email_reconfirmation_html: 如果您沒有收到確認郵件，可以<a href="%{path}">請求再次發送</a>
       irreversible: 您將無法復原或重新啟用您的帳號
@@ -1176,7 +1175,7 @@ zh-TW:
     invalid_domain: 並非一個有效網域
   edit_profile:
     basic_information: 基本資訊
-    hint_html: "<strong>自訂人們可以於您個人檔案及嘟文內容。</strong>當您完成填寫個人檔案以及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
+    hint_html: "<strong>自訂人們能於您個人檔案及嘟文旁所見之內容。</strong>當您完成填寫個人檔案以及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
     other: 其他
   errors:
     '400': 您所送出的請求無效或格式不正確。
@@ -1194,13 +1193,13 @@ zh-TW:
     '503': 此頁面因伺服器暫時發生錯誤而無法提供。
     noscript_html: 使用 Mastodon 網頁版應用需要啟用 JavaScript。您也可以選擇適用於您的平台的 <a href="%{apps_path}">Mastodon 應用</a>。
   existing_username_validator:
-    not_found: 無法在本站找到這個名稱的使用者
+    not_found: 無法於本伺服器找到此使用者帳號
     not_found_multiple: 揣嘸 %{usernames}
   exports:
     archive_takeout:
       date: 日期
       download: 下載檔案
-      hint_html: 您可以下載包含您的<strong>文章和媒體</strong>的檔案。資料以 ActivityPub 格式儲存，可用於相容的軟體。每次允許存檔的間隔至少 7 天。
+      hint_html: 您可以下載包含您的<strong>嘟文與媒體</strong>的檔案。資料以 ActivityPub 格式儲存，可用於相容之軟體。每次允許存檔的間隔至少 7 天。
       in_progress: 正在準備您的存檔...
       request: 下載存檔
       size: 大小
@@ -1304,7 +1303,7 @@ zh-TW:
       following_html: 您將要 <strong>跟隨</strong> 自 <strong>%{filename}</strong> 中之 <strong>%{total_items} 個帳號</strong>。
       lists_html: 您將自 <strong>%{filename}</strong> 新增 <strong>%{total_items} 個帳號</strong>至您的<strong>列表</strong>。若不存在列表用以新增帳號，則會建立新列表。
       muting_html: 您將要 <strong>靜音</strong> 自 <strong>%{filename}</strong> 中之 <strong>%{total_items} 個帳號</strong>。
-    preface: 您能於此匯入您在其他伺服器所匯出的資料檔，包括跟隨中的使用者、封鎖的使用者名單等。
+    preface: 您能於此匯入您於其他伺服器所匯出的資料檔，包括跟隨中的使用者、封鎖的使用者名單等。
     recent_imports: 最近匯入的
     states:
       finished: 已完成
@@ -1414,12 +1413,12 @@ zh-TW:
     warning:
       backreference_required: 新的帳號必須先設定為反向參照到目前帳號
       before: 在進行下一步驟之前，請詳細閱讀以下説明：
-      cooldown: 在轉移帳號後會有一段等待時間，在等待時間內您將無法再次轉移
+      cooldown: 轉移帳號後會有一段等待時間，等待時間內您將無法再次轉移
       disabled_account: 之後您的目前帳號將完全無法使用。但您可以存取資料匯出與重新啟用。
       followers: 此動作將會將目前帳號的所有跟隨者轉移至新帳號
-      only_redirect_html: 或者，您也可以<a href="%{path}">僅在您的個人檔案中設定重新導向</a>。
+      only_redirect_html: 或者，您也可以<a href="%{path}">僅於您的個人檔案中設定重新導向</a>。
       other_data: 其他資料並不會自動轉移
-      redirect: 您目前的帳號將於個人檔案頁面新增重新導向公告，並會被排除在搜尋結果之外
+      redirect: 您目前的帳號將於個人檔案頁面新增重新導向公告，並會被排除於搜尋結果之外
   moderation:
     title: 站務
   move_handler:
@@ -1449,8 +1448,8 @@ zh-TW:
       title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 在嘟文中提及您:"
-      subject: "%{name} 在嘟文中提及您"
+      body: "%{name} 於嘟文中提及您:"
+      subject: "%{name} 於嘟文中提及您"
       title: 新的提及
     poll:
       subject: 由 %{name} 發起的投票已結束
@@ -1510,7 +1509,7 @@ zh-TW:
   privacy:
     hint_html: "<strong>自訂您希望如何讓您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
     privacy: 隱私權
-    privacy_hint_html: 控制您希望向其他人揭露之內容。人們透過瀏覽其他人的跟隨者與其發嘟之應用程式發現有趣的個人檔案和酷炫的 Mastodon 應用程式，但您能選擇將其隱藏。
+    privacy_hint_html: 控制您希望向其他人揭露之內容。人們透過瀏覽其他人的跟隨者與其發嘟之應用程式發現有趣的個人檔案與酷炫的 Mastodon 應用程式，但您能選擇將其隱藏。
     reach: 觸及
     reach_hint_html: 控制您希望被新使用者探索或跟隨之方式。想讓您的嘟文出現於探索頁面嗎？想讓其他人透過他們的跟隨建議找到您嗎？想自動接受所有新跟隨者嗎？或是想逐一控制跟隨請求嗎？
     search: 搜尋
@@ -1669,7 +1668,7 @@ zh-TW:
       private_long: 只有跟隨您的人能看到
       public: 公開
       public_long: 所有人都能看到
-      unlisted: 不在公開時間軸顯示
+      unlisted: 不於公開時間軸顯示
       unlisted_long: 所有人都能看到，但不會出現在公開時間軸上
   statuses_cleanup:
     enabled: 自動刪除舊嘟文
@@ -1679,7 +1678,7 @@ zh-TW:
     ignore_favs: 忽略最愛數
     ignore_reblogs: 忽略轉嘟數
     interaction_exceptions: 基於互動的例外規則
-    interaction_exceptions_explanation: 請注意嘟文是無法保證被刪除的，如果在一次處理過後嘟文低於最愛或轉嘟的門檻。
+    interaction_exceptions_explanation: 請注意嘟文是無法保證被刪除的，如果於一次處理過後嘟文低於最愛或轉嘟的門檻。
     keep_direct: 保留私訊
     keep_direct_hint: 不會刪除任何您的私訊
     keep_media: 保留包含多媒體附加檔案之嘟文
@@ -1735,7 +1734,7 @@ zh-TW:
     enabled: 兩階段認證已啟用
     enabled_success: 已成功啟用兩階段認證
     generate_recovery_codes: 產生備用驗證碼
-    lost_recovery_codes: 讓您可以在遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
+    lost_recovery_codes: 讓您能於遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
     methods: 兩步驟方式
     otp: 驗證應用程式
     recovery_codes: 備份備用驗證碼
@@ -1745,12 +1744,12 @@ zh-TW:
   user_mailer:
     appeal_approved:
       action: 前往您的帳號
-      explanation: 您在 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示的申訴已獲批准。您的帳號再次享有良好的信譽。
-      subject: 您在 %{date} 提出的申訴已獲批准
+      explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已獲批准。您的帳號再次享有良好的信譽。
+      subject: 您於 %{date} 提出之申訴已獲批准
       title: 申訴已批准
     appeal_rejected:
-      explanation: 您在 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示的申訴已被駁回。
-      subject: 您在 %{date} 提出的申訴已被駁回
+      explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已被駁回。
+      subject: 您於 %{date} 提出之申訴已被駁回
       title: 申訴被駁回
     backup_ready:
       explanation: 您要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載！
@@ -1772,7 +1771,7 @@ zh-TW:
       explanation:
         delete_statuses: 您的某些嘟文被發現已違反一項或多項社群準則，隨後已被 %{instance} 的管理員刪除。
         disable: 您無法繼續使用您的帳號，但您的個人頁面及其他資料內容保持不變。您可以要求一份您的資料備份，帳號異動設定，或是刪除帳號。
-        mark_statuses_as_sensitive: 您的部份嘟文已被 %{instance} 的管理員標記為敏感內容。這代表了人們必須在顯示預覽前點擊嘟文中的媒體。您可以在將來嘟文時自己將媒體標記為敏感內容。
+        mark_statuses_as_sensitive: 您的部份嘟文已被 %{instance} 的管理員標記為敏感內容。這代表了人們必須於顯示預覽前點擊嘟文中的媒體。您能於將來嘟文時自己將媒體標記為敏感內容。
         sensitive: 由此刻起，您所有上傳的媒體檔案將被標記為敏感內容，並且隱藏於點擊警告之後。
         silence: 您仍然能使用您的帳號，但僅有已跟隨您的人才能見到您於此伺服器之嘟文，您也可能會從各式探索功能中被排除。但其他人仍可手動跟隨您。
         suspend: 您將不能使用您的帳號，您的個人檔案頁面及其他資料將不再能被存取。您仍可於約 30 日內資料被完全刪除前要求下載您的資料，但我們仍會保留一部份基本資料，以防止有人規避停權處罰。
@@ -1781,9 +1780,9 @@ zh-TW:
       subject:
         delete_statuses: 您於 %{acct} 之嘟文已被移除
         disable: 您的帳號 %{acct} 已被凍結
-        mark_statuses_as_sensitive: 您在 %{acct} 上的嘟文已被標記為敏感內容
+        mark_statuses_as_sensitive: 您於 %{acct} 上的嘟文已被標記為敏感內容
         none: 對 %{acct} 的警告
-        sensitive: 從現在開始，您在 %{acct} 上的嘟文將會被標記為敏感內容
+        sensitive: 從現在開始，您於 %{acct} 上之嘟文將會被標記為敏感內容
         silence: 您的帳號 %{acct} 已被限制
         suspend: 您的帳號 %{acct} 已被停權
       title:
@@ -1796,10 +1795,10 @@ zh-TW:
         suspend: 帳號己被停權
     welcome:
       edit_profile_action: 設定個人檔案
-      edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇在新的跟隨者跟隨前，先對他們進行審核。
+      edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇於新的跟隨者跟隨前，先對他們進行審核。
       explanation: 下面是幾個小幫助，希望它們能幫到您
       final_action: 開始嘟嘟
-      final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能在本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
+      final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能於本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
       full_handle: 您的完整帳號名稱
       full_handle_hint: 您需要將這告訴您的朋友們，這樣他們就能從另一個伺服器向您發送訊息或跟隨您。
       subject: 歡迎來到 Mastodon
diff --git a/config/routes.rb b/config/routes.rb
index b377906429..6e5fce0c78 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,7 +32,7 @@ Rails.application.routes.draw do
     /favourites
     /bookmarks
     /pinned
-    /start
+    /start/(*any)
     /directory
     /explore/(*any)
     /search
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index ec4cd39bf4..8f2cbeea35 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -9,13 +9,3 @@ if Rake::Task.task_defined?('spec:system')
 
   Rake::Task['spec:system'].enhance ['spec:enable_system_specs']
 end
-
-if Rake::Task.task_defined?('spec:search')
-  namespace :spec do
-    task :enable_search_specs do # rubocop:disable Rails/RakeEnvironment
-      ENV['RUN_SEARCH_SPECS'] = 'true'
-    end
-  end
-
-  Rake::Task['spec:search'].enhance ['spec:enable_search_specs']
-end
diff --git a/package.json b/package.json
index d0669e4123..fd3083f1d9 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,13 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
+  "packageManager": "yarn@4.0.2",
   "engines": {
     "node": ">=18"
   },
   "workspaces": [
-    "."
+    ".",
+    "streaming"
   ],
   "scripts": {
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
@@ -72,11 +74,9 @@
     "css-loader": "^5.2.7",
     "cssnano": "^6.0.1",
     "detect-passive-events": "^2.0.3",
-    "dotenv": "^16.0.3",
     "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
-    "express": "^4.18.2",
     "favico.js": "^0.3.10",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
@@ -88,21 +88,15 @@
     "immutable": "^4.3.0",
     "imports-loader": "^1.2.0",
     "intl-messageformat": "^10.3.5",
-    "ioredis": "^5.3.2",
     "js-yaml": "^4.1.0",
-    "jsdom": "^22.1.0",
     "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
     "mkdirp": "^3.0.1",
-    "npmlog": "^7.0.1",
     "path-complete-extname": "^1.0.0",
-    "pg": "^8.5.0",
-    "pg-connection-string": "^2.6.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
-    "prom-client": "^15.0.0",
     "prop-types": "^15.8.1",
     "punycode": "^2.3.0",
     "react": "^18.2.0",
@@ -142,7 +136,6 @@
     "tesseract.js": "^2.1.5",
     "tiny-queue": "^0.2.1",
     "twitter-text": "3.1.0",
-    "uuid": "^9.0.0",
     "webpack": "^4.47.0",
     "webpack-assets-manifest": "^4.0.6",
     "webpack-bundle-analyzer": "^4.8.0",
@@ -154,8 +147,7 @@
     "workbox-routing": "^7.0.0",
     "workbox-strategies": "^7.0.0",
     "workbox-webpack-plugin": "^7.0.0",
-    "workbox-window": "^7.0.0",
-    "ws": "^8.12.1"
+    "workbox-window": "^7.0.0"
   },
   "devDependencies": {
     "@formatjs/cli": "^6.1.1",
@@ -164,23 +156,20 @@
     "@types/babel__core": "^7.20.1",
     "@types/emoji-mart": "^3.0.9",
     "@types/escape-html": "^1.0.2",
-    "@types/express": "^4.17.17",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/http-link-header": "^1.0.3",
     "@types/intl": "^1.2.0",
     "@types/jest": "^29.5.2",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.195",
-    "@types/npmlog": "^4.1.4",
     "@types/object-assign": "^4.0.30",
-    "@types/pg": "^8.6.6",
     "@types/prop-types": "^15.7.5",
     "@types/punycode": "^2.1.0",
     "@types/react": "^18.2.7",
     "@types/react-dom": "^18.2.4",
     "@types/react-helmet": "^6.1.6",
     "@types/react-immutable-proptypes": "^2.1.0",
-    "@types/react-motion": "^0.0.37",
+    "@types/react-motion": "^0.0.39",
     "@types/react-overlays": "^3.1.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
@@ -192,7 +181,6 @@
     "@types/react-toggle": "^4.0.3",
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
-    "@types/uuid": "^9.0.0",
     "@types/webpack": "^4.41.33",
     "@types/yargs": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
@@ -236,15 +224,10 @@
       "optional": true
     }
   },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.7",
-    "utf-8-validate": "^6.0.3"
-  },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write",
     "Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop --force-exclusion -a",
     "*.{js,jsx,ts,tsx}": "eslint --fix",
     "*.{css,scss}": "stylelint --fix"
-  },
-  "packageManager": "yarn@4.0.2"
+  }
 }
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index ca87417305..c8f566f68b 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -45,7 +45,7 @@ describe Admin::InvitesController do
 
   describe 'POST #deactivate_all' do
     it 'expires all invites, then redirects to admin_invites_path' do
-      invites = Fabricate.times(2, :invite, expires_at: nil)
+      invites = Fabricate.times(1, :invite, expires_at: nil)
 
       post :deactivate_all
 
diff --git a/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb b/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb
index bb075261f3..2261773094 100644
--- a/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb
@@ -19,5 +19,17 @@ describe Api::V1::Accounts::FamiliarFollowersController do
 
       expect(response).to have_http_status(200)
     end
+
+    context 'when there are duplicate account IDs in the params' do
+      let(:account_a) { Fabricate(:account) }
+      let(:account_b) { Fabricate(:account) }
+
+      it 'removes duplicate account IDs from params' do
+        account_ids = [account_a, account_b, account_b, account_a, account_a].map { |a| a.id.to_s }
+        get :index, params: { id: account_ids }
+
+        expect(body_as_json.pluck(:id)).to eq [account_a.id.to_s, account_b.id.to_s]
+      end
+    end
   end
 end
diff --git a/spec/controllers/api/v1/admin/dimensions_controller_spec.rb b/spec/controllers/api/v1/admin/dimensions_controller_spec.rb
deleted file mode 100644
index ea18efe383..0000000000
--- a/spec/controllers/api/v1/admin/dimensions_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Admin::DimensionsController do
-  render_views
-
-  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'admin:read') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    it 'returns http success' do
-      post :create, params: { account_id: account.id, limit: 2 }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/admin/measures_controller_spec.rb b/spec/controllers/api/v1/admin/measures_controller_spec.rb
deleted file mode 100644
index 03727a6329..0000000000
--- a/spec/controllers/api/v1/admin/measures_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Admin::MeasuresController do
-  render_views
-
-  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'admin:read') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    it 'returns http success' do
-      post :create, params: { account_id: account.id, limit: 2 }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/admin/retention_controller_spec.rb b/spec/controllers/api/v1/admin/retention_controller_spec.rb
deleted file mode 100644
index 2381dbcb48..0000000000
--- a/spec/controllers/api/v1/admin/retention_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Admin::RetentionController do
-  render_views
-
-  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'admin:read') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    it 'returns http success' do
-      post :create, params: { account_id: account.id, limit: 2 }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/custom_emojis_controller_spec.rb b/spec/controllers/api/v1/custom_emojis_controller_spec.rb
deleted file mode 100644
index 08af57f405..0000000000
--- a/spec/controllers/api/v1/custom_emojis_controller_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::CustomEmojisController do
-  render_views
-
-  describe 'GET #index' do
-    before do
-      Fabricate(:custom_emoji)
-      get :index
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/endorsements_controller_spec.rb b/spec/controllers/api/v1/endorsements_controller_spec.rb
deleted file mode 100644
index 738804bb7b..0000000000
--- a/spec/controllers/api/v1/endorsements_controller_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::EndorsementsController do
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-
-  describe 'GET #index' do
-    it 'returns 200' do
-      allow(controller).to receive(:doorkeeper_token) { token }
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/activity_controller_spec.rb b/spec/controllers/api/v1/instances/activity_controller_spec.rb
deleted file mode 100644
index b446a521f8..0000000000
--- a/spec/controllers/api/v1/instances/activity_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::Instances::ActivityController do
-  describe 'GET #show' do
-    it 'returns 200' do
-      get :show
-      expect(response).to have_http_status(200)
-    end
-
-    context 'with !Setting.activity_api_enabled' do
-      it 'returns 404' do
-        Setting.activity_api_enabled = false
-
-        get :show
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/instances/domain_blocks_controller_spec.rb
deleted file mode 100644
index 08f505c3d4..0000000000
--- a/spec/controllers/api/v1/instances/domain_blocks_controller_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Instances::DomainBlocksController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      Setting.show_domain_blocks = 'all'
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/extended_descriptions_controller_spec.rb b/spec/controllers/api/v1/instances/extended_descriptions_controller_spec.rb
deleted file mode 100644
index 58c0d4b8f1..0000000000
--- a/spec/controllers/api/v1/instances/extended_descriptions_controller_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Instances::ExtendedDescriptionsController do
-  render_views
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/peers_controller_spec.rb b/spec/controllers/api/v1/instances/peers_controller_spec.rb
deleted file mode 100644
index 92b1019154..0000000000
--- a/spec/controllers/api/v1/instances/peers_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::Instances::PeersController do
-  describe 'GET #index' do
-    it 'returns 200' do
-      get :index
-      expect(response).to have_http_status(200)
-    end
-
-    context 'with !Setting.peers_api_enabled' do
-      it 'returns 404' do
-        Setting.peers_api_enabled = false
-
-        get :index
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/privacy_policies_controller_spec.rb b/spec/controllers/api/v1/instances/privacy_policies_controller_spec.rb
deleted file mode 100644
index ac0bed9dc6..0000000000
--- a/spec/controllers/api/v1/instances/privacy_policies_controller_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Instances::PrivacyPoliciesController do
-  render_views
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/rules_controller_spec.rb b/spec/controllers/api/v1/instances/rules_controller_spec.rb
deleted file mode 100644
index 5af50239b0..0000000000
--- a/spec/controllers/api/v1/instances/rules_controller_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Instances::RulesController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb b/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb
deleted file mode 100644
index f79687df66..0000000000
--- a/spec/controllers/api/v1/instances/translation_languages_controller_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Instances::TranslationLanguagesController do
-  describe 'GET #show' do
-    context 'when no translation service is configured' do
-      it 'returns empty language matrix', :aggregate_failures do
-        get :show
-
-        expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({})
-      end
-    end
-
-    context 'when a translation service is configured' do
-      before do
-        service = instance_double(TranslationService::DeepL, languages: { nil => %w(en de), 'en' => ['de'] })
-        allow(TranslationService).to receive_messages(configured?: true, configured: service)
-      end
-
-      it 'returns language matrix', :aggregate_failures do
-        get :show
-
-        expect(response).to have_http_status(200)
-        expect(body_as_json).to eq({ und: %w(en de), en: ['de'] })
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/instances_controller_spec.rb b/spec/controllers/api/v1/instances_controller_spec.rb
deleted file mode 100644
index fcc2c9288c..0000000000
--- a/spec/controllers/api/v1/instances_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::InstancesController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/preferences_controller_spec.rb b/spec/controllers/api/v1/preferences_controller_spec.rb
deleted file mode 100644
index 79cc3066e1..0000000000
--- a/spec/controllers/api/v1/preferences_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::PreferencesController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/scheduled_statuses_controller_spec.rb b/spec/controllers/api/v1/scheduled_statuses_controller_spec.rb
deleted file mode 100644
index 256c4b272a..0000000000
--- a/spec/controllers/api/v1/scheduled_statuses_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::ScheduledStatusesController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
index 2f2b30b07d..e3a9bdb502 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
@@ -9,13 +9,7 @@ describe Api::V1::Statuses::ReblogsController do
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
 
-  context 'with an oauth token' do
-    around do |example|
-      Sidekiq::Testing.fake! do
-        example.run
-      end
-    end
-
+  context 'with an oauth token', :sidekiq_fake do
     before do
       allow(controller).to receive(:doorkeeper_token) { token }
     end
diff --git a/spec/controllers/api/v2/instances_controller_spec.rb b/spec/controllers/api/v2/instances_controller_spec.rb
deleted file mode 100644
index b7206da0a2..0000000000
--- a/spec/controllers/api/v2/instances_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V2::InstancesController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/controllers/api/web/push_subscriptions_controller_spec.rb b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
index 9f027ede90..58677841ca 100644
--- a/spec/controllers/api/web/push_subscriptions_controller_spec.rb
+++ b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
@@ -37,37 +37,49 @@ describe Api::Web::PushSubscriptionsController do
     }
   end
 
+  before do
+    sign_in(user)
+
+    stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
+  end
+
   describe 'POST #create' do
     it 'saves push subscriptions' do
-      sign_in(user)
-
-      stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
-
       post :create, format: :json, params: create_payload
 
+      expect(response).to have_http_status(200)
+
       user.reload
 
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
+      expect(created_push_subscription).to have_attributes(
+        endpoint: eq(create_payload[:subscription][:endpoint]),
+        key_p256dh: eq(create_payload[:subscription][:keys][:p256dh]),
+        key_auth: eq(create_payload[:subscription][:keys][:auth])
+      )
+      expect(user.session_activations.first.web_push_subscription).to eq(created_push_subscription)
+    end
 
-      expect(push_subscription['endpoint']).to eq(create_payload[:subscription][:endpoint])
-      expect(push_subscription['key_p256dh']).to eq(create_payload[:subscription][:keys][:p256dh])
-      expect(push_subscription['key_auth']).to eq(create_payload[:subscription][:keys][:auth])
+    context 'with a user who has a session with a prior subscription' do
+      let!(:prior_subscription) { Fabricate(:web_push_subscription, session_activation: user.session_activations.last) }
+
+      it 'destroys prior subscription when creating new one' do
+        post :create, format: :json, params: create_payload
+
+        expect(response).to have_http_status(200)
+        expect { prior_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
 
     context 'with initial data' do
       it 'saves alert settings' do
-        sign_in(user)
-
-        stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
-
         post :create, format: :json, params: create_payload.merge(alerts_payload)
 
-        push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
+        expect(response).to have_http_status(200)
 
-        expect(push_subscription.data['policy']).to eq 'all'
+        expect(created_push_subscription.data['policy']).to eq 'all'
 
         %w(follow follow_request favourite reblog mention poll status).each do |type|
-          expect(push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+          expect(created_push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
         end
       end
     end
@@ -75,23 +87,23 @@ describe Api::Web::PushSubscriptionsController do
 
   describe 'PUT #update' do
     it 'changes alert settings' do
-      sign_in(user)
-
-      stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
-
       post :create, format: :json, params: create_payload
 
-      alerts_payload[:id] = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint]).id
+      expect(response).to have_http_status(200)
+
+      alerts_payload[:id] = created_push_subscription.id
 
       put :update, format: :json, params: alerts_payload
 
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
-
-      expect(push_subscription.data['policy']).to eq 'all'
+      expect(created_push_subscription.data['policy']).to eq 'all'
 
       %w(follow follow_request favourite reblog mention poll status).each do |type|
-        expect(push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+        expect(created_push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
       end
     end
   end
+
+  def created_push_subscription
+    Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
+  end
 end
diff --git a/spec/controllers/settings/exports_controller_spec.rb b/spec/controllers/settings/exports_controller_spec.rb
index c8c11c3be3..0bd1e80c3c 100644
--- a/spec/controllers/settings/exports_controller_spec.rb
+++ b/spec/controllers/settings/exports_controller_spec.rb
@@ -38,12 +38,10 @@ describe Settings::ExportsController do
       expect(response).to redirect_to(settings_export_path)
     end
 
-    it 'queues BackupWorker job by 1' do
-      Sidekiq::Testing.fake! do
-        expect do
-          post :create
-        end.to change(BackupWorker.jobs, :size).by(1)
-      end
+    it 'queues BackupWorker job by 1', :sidekiq_fake do
+      expect do
+        post :create
+      end.to change(BackupWorker.jobs, :size).by(1)
     end
   end
 end
diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb
index ee0ded1b91..261c426acb 100644
--- a/spec/controllers/settings/preferences/appearance_controller_spec.rb
+++ b/spec/controllers/settings/preferences/appearance_controller_spec.rb
@@ -28,11 +28,5 @@ describe Settings::Preferences::AppearanceController do
 
       expect(response).to redirect_to(settings_preferences_appearance_path)
     end
-
-    it 'renders show on failure' do
-      put :update, params: { user: { locale: 'fake option' } }
-
-      expect(response).to render_template('preferences/appearance/show')
-    end
   end
 end
diff --git a/spec/controllers/settings/privacy_controller_spec.rb b/spec/controllers/settings/privacy_controller_spec.rb
new file mode 100644
index 0000000000..59fd342199
--- /dev/null
+++ b/spec/controllers/settings/privacy_controller_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Settings::PrivacyController do
+  render_views
+
+  let!(:user) { Fabricate(:user) }
+  let(:account) { user.account }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    before do
+      get :show
+    end
+
+    it 'returns http success with private cache control headers', :aggregate_failures do
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          headers: include(
+            'Cache-Control' => 'private, no-store'
+          )
+        )
+    end
+  end
+
+  describe 'PUT #update' do
+    context 'when update succeeds' do
+      before do
+        allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+      end
+
+      it 'updates the user profile' do
+        put :update, params: { account: { discoverable: '1', settings: { indexable: '1' } } }
+
+        expect(account.reload.discoverable)
+          .to be(true)
+
+        expect(response)
+          .to redirect_to(settings_privacy_path)
+
+        expect(ActivityPub::UpdateDistributionWorker)
+          .to have_received(:perform_async).with(account.id)
+      end
+    end
+
+    context 'when update fails' do
+      before do
+        allow(UpdateAccountService).to receive(:new).and_return(failing_update_service)
+        allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+      end
+
+      it 'updates the user profile' do
+        put :update, params: { account: { discoverable: '1', settings: { indexable: '1' } } }
+
+        expect(response)
+          .to render_template(:show)
+
+        expect(ActivityPub::UpdateDistributionWorker)
+          .to_not have_received(:perform_async)
+      end
+
+      private
+
+      def failing_update_service
+        instance_double(UpdateAccountService, call: false)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/settings/verifications_controller_spec.rb b/spec/controllers/settings/verifications_controller_spec.rb
new file mode 100644
index 0000000000..1a8df485b5
--- /dev/null
+++ b/spec/controllers/settings/verifications_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Settings::VerificationsController do
+  render_views
+
+  let!(:user) { Fabricate(:user) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    before do
+      get :show
+    end
+
+    it 'returns http success with private cache control headers', :aggregate_failures do
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          headers: include(
+            'Cache-Control' => 'private, no-store'
+          )
+        )
+    end
+  end
+end
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 8b715824b8..fe40ee6de1 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -57,11 +57,14 @@ describe StatusesController do
         let(:format) { 'html' }
 
         it 'renders status successfully', :aggregate_failures do
-          expect(response).to have_http_status(200)
-          expect(response.headers['Link'].to_s).to include 'activity+json'
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-          expect(response.headers['Cache-Control']).to include 'public'
-          expect(response).to render_template(:show)
+          expect(response)
+            .to have_http_status(200)
+            .and render_template(:show)
+          expect(response.headers).to include(
+            'Vary' => 'Accept, Accept-Language, Cookie',
+            'Cache-Control' => include('public'),
+            'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+          )
           expect(response.body).to include status.text
         end
       end
@@ -72,12 +75,15 @@ describe StatusesController do
         it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
 
         it 'renders ActivityPub Note object successfully', :aggregate_failures do
-          expect(response).to have_http_status(200)
-          expect(response.headers['Link'].to_s).to include 'activity+json'
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-          expect(response.headers['Content-Type']).to include 'application/activity+json'
-          json = body_as_json
-          expect(json[:content]).to include status.text
+          expect(response)
+            .to have_http_status(200)
+          expect(response.headers).to include(
+            'Vary' => 'Accept, Accept-Language, Cookie',
+            'Content-Type' => include('application/activity+json'),
+            'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+          )
+          expect(body_as_json)
+            .to include(content: include(status.text))
         end
       end
     end
@@ -157,11 +163,14 @@ describe StatusesController do
           let(:format) { 'html' }
 
           it 'renders status successfully', :aggregate_failures do
-            expect(response).to have_http_status(200)
-            expect(response.headers['Link'].to_s).to include 'activity+json'
-            expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-            expect(response.headers['Cache-Control']).to include 'private'
-            expect(response).to render_template(:show)
+            expect(response)
+              .to have_http_status(200)
+              .and render_template(:show)
+            expect(response.headers).to include(
+              'Vary' => 'Accept, Accept-Language, Cookie',
+              'Cache-Control' => include('private'),
+              'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+            )
             expect(response.body).to include status.text
           end
         end
@@ -170,13 +179,16 @@ describe StatusesController do
           let(:format) { 'json' }
 
           it 'renders ActivityPub Note object successfully', :aggregate_failures do
-            expect(response).to have_http_status(200)
-            expect(response.headers['Link'].to_s).to include 'activity+json'
-            expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-            expect(response.headers['Cache-Control']).to include 'private'
-            expect(response.headers['Content-Type']).to include 'application/activity+json'
-            json = body_as_json
-            expect(json[:content]).to include status.text
+            expect(response)
+              .to have_http_status(200)
+            expect(response.headers).to include(
+              'Vary' => 'Accept, Accept-Language, Cookie',
+              'Cache-Control' => include('private'),
+              'Content-Type' => include('application/activity+json'),
+              'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+            )
+            expect(body_as_json)
+              .to include(content: include(status.text))
           end
         end
       end
@@ -194,11 +206,15 @@ describe StatusesController do
             let(:format) { 'html' }
 
             it 'renders status successfully', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response).to render_template(:show)
+              expect(response)
+                .to have_http_status(200)
+                .and render_template(:show)
+
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
               expect(response.body).to include status.text
             end
           end
@@ -207,13 +223,16 @@ describe StatusesController do
             let(:format) { 'json' }
 
             it 'renders ActivityPub Note object successfully', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response.headers['Content-Type']).to include 'application/activity+json'
-              json = body_as_json
-              expect(json[:content]).to include status.text
+              expect(response)
+                .to have_http_status(200)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Content-Type' => include('application/activity+json'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
+              expect(body_as_json)
+                .to include(content: include(status.text))
             end
           end
         end
@@ -254,11 +273,14 @@ describe StatusesController do
             let(:format) { 'html' }
 
             it 'renders status successfully', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response).to render_template(:show)
+              expect(response)
+                .to have_http_status(200)
+                .and render_template(:show)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
               expect(response.body).to include status.text
             end
           end
@@ -267,13 +289,16 @@ describe StatusesController do
             let(:format) { 'json' }
 
             it 'renders ActivityPub Note object successfully' do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response.headers['Content-Type']).to include 'application/activity+json'
-              json = body_as_json
-              expect(json[:content]).to include status.text
+              expect(response)
+                .to have_http_status(200)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Content-Type' => include('application/activity+json'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
+              expect(body_as_json)
+                .to include(content: include(status.text))
             end
           end
         end
@@ -340,11 +365,14 @@ describe StatusesController do
           let(:format) { 'html' }
 
           it 'renders status successfully', :aggregate_failures do
-            expect(response).to have_http_status(200)
-            expect(response.headers['Link'].to_s).to include 'activity+json'
-            expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-            expect(response.headers['Cache-Control']).to include 'private'
-            expect(response).to render_template(:show)
+            expect(response)
+              .to have_http_status(200)
+              .and render_template(:show)
+            expect(response.headers).to include(
+              'Vary' => 'Accept, Accept-Language, Cookie',
+              'Cache-Control' => include('private'),
+              'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+            )
             expect(response.body).to include status.text
           end
         end
@@ -355,12 +383,15 @@ describe StatusesController do
           it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
 
           it 'renders ActivityPub Note object successfully', :aggregate_failures do
-            expect(response).to have_http_status(200)
-            expect(response.headers['Link'].to_s).to include 'activity+json'
-            expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-            expect(response.headers['Content-Type']).to include 'application/activity+json'
-            json = body_as_json
-            expect(json[:content]).to include status.text
+            expect(response)
+              .to have_http_status(200)
+            expect(response.headers).to include(
+              'Vary' => 'Accept, Accept-Language, Cookie',
+              'Content-Type' => include('application/activity+json'),
+              'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+            )
+            expect(body_as_json)
+              .to include(content: include(status.text))
           end
         end
       end
@@ -378,11 +409,14 @@ describe StatusesController do
             let(:format) { 'html' }
 
             it 'renders status successfully', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response).to render_template(:show)
+              expect(response)
+                .to have_http_status(200)
+                .and render_template(:show)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
               expect(response.body).to include status.text
             end
           end
@@ -391,13 +425,17 @@ describe StatusesController do
             let(:format) { 'json' }
 
             it 'renders ActivityPub Note object successfully' do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response.headers['Content-Type']).to include 'application/activity+json'
-              json = body_as_json
-              expect(json[:content]).to include status.text
+              expect(response)
+                .to have_http_status(200)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Content-Type' => include('application/activity+json'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
+
+              expect(body_as_json)
+                .to include(content: include(status.text))
             end
           end
         end
@@ -438,11 +476,14 @@ describe StatusesController do
             let(:format) { 'html' }
 
             it 'renders status successfully', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response).to render_template(:show)
+              expect(response)
+                .to have_http_status(200)
+                .and render_template(:show)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
               expect(response.body).to include status.text
             end
           end
@@ -451,13 +492,16 @@ describe StatusesController do
             let(:format) { 'json' }
 
             it 'renders ActivityPub Note object', :aggregate_failures do
-              expect(response).to have_http_status(200)
-              expect(response.headers['Link'].to_s).to include 'activity+json'
-              expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-              expect(response.headers['Cache-Control']).to include 'private'
-              expect(response.headers['Content-Type']).to include 'application/activity+json'
-              json = body_as_json
-              expect(json[:content]).to include status.text
+              expect(response)
+                .to have_http_status(200)
+              expect(response.headers).to include(
+                'Vary' => 'Accept, Accept-Language, Cookie',
+                'Cache-Control' => include('private'),
+                'Content-Type' => include('application/activity+json'),
+                'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+              )
+              expect(body_as_json)
+                .to include(content: include(status.text))
             end
           end
         end
@@ -732,11 +776,14 @@ describe StatusesController do
       end
 
       it 'renders status successfully', :aggregate_failures do
-        expect(response).to have_http_status(200)
-        expect(response.headers['Link'].to_s).to include 'activity+json'
-        expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-        expect(response.headers['Cache-Control']).to include 'public'
-        expect(response).to render_template(:embed)
+        expect(response)
+          .to have_http_status(200)
+          .and render_template(:embed)
+        expect(response.headers).to include(
+          'Vary' => 'Accept, Accept-Language, Cookie',
+          'Cache-Control' => include('public'),
+          'Link' => satisfy { |header| header.to_s.include?('activity+json') }
+        )
         expect(response.body).to include status.text
       end
     end
diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb
deleted file mode 100644
index 4bd161cd9d..0000000000
--- a/spec/controllers/well_known/host_meta_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe WellKnown::HostMetaController do
-  render_views
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show, format: :xml
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/xrd+xml'
-      expect(response.body).to eq <<~XML
-        <?xml version="1.0" encoding="UTF-8"?>
-        <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-          <Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
-        </XRD>
-      XML
-    end
-  end
-end
diff --git a/spec/controllers/well_known/node_info_controller_spec.rb b/spec/controllers/well_known/node_info_controller_spec.rb
deleted file mode 100644
index 6ec34afd04..0000000000
--- a/spec/controllers/well_known/node_info_controller_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe WellKnown::NodeInfoController do
-  render_views
-
-  describe 'GET #index' do
-    it 'returns json document pointing to node info' do
-      get :index
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/json'
-
-      json = body_as_json
-
-      expect(json[:links]).to be_an Array
-      expect(json[:links][0][:rel]).to eq 'http://nodeinfo.diaspora.software/ns/schema/2.0'
-      expect(json[:links][0][:href]).to include 'nodeinfo/2.0'
-    end
-  end
-
-  describe 'GET #show' do
-    it 'returns json document with node info properties' do
-      get :show
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/json'
-
-      json = body_as_json
-      foo = { 'foo' => 0 }
-
-      expect(foo).to_not match_json_schema('nodeinfo_2.0')
-      expect(json).to match_json_schema('nodeinfo_2.0')
-      expect(json[:version]).to eq '2.0'
-      expect(json[:usage]).to be_a Hash
-      expect(json[:software]).to be_a Hash
-      expect(json[:protocols]).to be_an Array
-    end
-  end
-end
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb
deleted file mode 100644
index 6610f4d138..0000000000
--- a/spec/controllers/well_known/webfinger_controller_spec.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe WellKnown::WebfingerController do
-  include RoutingHelper
-
-  render_views
-
-  describe 'GET #show' do
-    subject(:perform_show!) do
-      get :show, params: { resource: resource }, format: :json
-    end
-
-    let(:alternate_domains) { [] }
-    let(:alice) { Fabricate(:account, username: 'alice') }
-    let(:resource) { nil }
-
-    around do |example|
-      tmp = Rails.configuration.x.alternate_domains
-      Rails.configuration.x.alternate_domains = alternate_domains
-      example.run
-      Rails.configuration.x.alternate_domains = tmp
-    end
-
-    shared_examples 'a successful response' do
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
-      end
-
-      it 'does not set a Vary header' do
-        expect(response.headers['Vary']).to be_nil
-      end
-
-      it 'returns application/jrd+json' do
-        expect(response.media_type).to eq 'application/jrd+json'
-      end
-
-      it 'returns links for the account' do
-        json = body_as_json
-        expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-        expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
-      end
-    end
-
-    context 'when an account exists' do
-      let(:resource) { alice.to_webfinger_s }
-
-      before do
-        perform_show!
-      end
-
-      it_behaves_like 'a successful response'
-    end
-
-    context 'when an account is temporarily suspended' do
-      let(:resource) { alice.to_webfinger_s }
-
-      before do
-        alice.suspend!
-        perform_show!
-      end
-
-      it_behaves_like 'a successful response'
-    end
-
-    context 'when an account is permanently suspended or deleted' do
-      let(:resource) { alice.to_webfinger_s }
-
-      before do
-        alice.suspend!
-        alice.deletion_request.destroy
-        perform_show!
-      end
-
-      it 'returns http gone' do
-        expect(response).to have_http_status(410)
-      end
-    end
-
-    context 'when an account is not found' do
-      let(:resource) { 'acct:not@existing.com' }
-
-      before do
-        perform_show!
-      end
-
-      it 'returns http not found' do
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'with an alternate domain' do
-      let(:alternate_domains) { ['foo.org'] }
-
-      before do
-        perform_show!
-      end
-
-      context 'when an account exists' do
-        let(:resource) do
-          username, = alice.to_webfinger_s.split('@')
-          "#{username}@foo.org"
-        end
-
-        it_behaves_like 'a successful response'
-      end
-
-      context 'when the domain is wrong' do
-        let(:resource) do
-          username, = alice.to_webfinger_s.split('@')
-          "#{username}@bar.org"
-        end
-
-        it 'returns http not found' do
-          expect(response).to have_http_status(404)
-        end
-      end
-    end
-
-    context 'when the old name scheme is used to query the instance actor' do
-      let(:resource) do
-        "#{Rails.configuration.x.local_domain}@#{Rails.configuration.x.local_domain}"
-      end
-
-      before do
-        perform_show!
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(200)
-      end
-
-      it 'does not set a Vary header' do
-        expect(response.headers['Vary']).to be_nil
-      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
-        json = body_as_json
-        expect(json[:subject]).to eq 'acct:mastodon.internal@cb6e6126.ngrok.io'
-        expect(json[:aliases]).to eq ['https://cb6e6126.ngrok.io/actor']
-      end
-    end
-
-    context 'with no resource parameter' do
-      let(:resource) { nil }
-
-      before do
-        perform_show!
-      end
-
-      it 'returns http bad request' do
-        expect(response).to have_http_status(400)
-      end
-    end
-
-    context 'with a nonsense parameter' do
-      let(:resource) { 'df/:dfkj' }
-
-      before do
-        perform_show!
-      end
-
-      it 'returns http bad request' do
-        expect(response).to have_http_status(400)
-      end
-    end
-
-    context 'when an account has an avatar' do
-      let(:alice) { Fabricate(:account, username: 'alice', avatar: attachment_fixture('attachment.jpg')) }
-      let(:resource) { alice.to_webfinger_s }
-
-      it 'returns avatar in response' do
-        perform_show!
-
-        avatar_link = get_avatar_link(body_as_json)
-        expect(avatar_link).to_not be_nil
-        expect(avatar_link[:type]).to eq alice.avatar.content_type
-        expect(avatar_link[:href]).to eq full_asset_url(alice.avatar)
-      end
-
-      context 'with limited federation mode' do
-        before do
-          allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
-        end
-
-        it 'does not return avatar in response' do
-          perform_show!
-
-          avatar_link = get_avatar_link(body_as_json)
-          expect(avatar_link).to be_nil
-        end
-      end
-
-      context 'when enabling DISALLOW_UNAUTHENTICATED_API_ACCESS' do
-        around do |example|
-          ClimateControl.modify DISALLOW_UNAUTHENTICATED_API_ACCESS: 'true' do
-            example.run
-          end
-        end
-
-        it 'does not return avatar in response' do
-          perform_show!
-
-          avatar_link = get_avatar_link(body_as_json)
-          expect(avatar_link).to be_nil
-        end
-      end
-    end
-
-    context 'when an account does not have an avatar' do
-      let(:alice) { Fabricate(:account, username: 'alice', avatar: nil) }
-      let(:resource) { alice.to_webfinger_s }
-
-      before do
-        perform_show!
-      end
-
-      it 'does not return avatar in response' do
-        avatar_link = get_avatar_link(body_as_json)
-        expect(avatar_link).to be_nil
-      end
-    end
-  end
-
-  private
-
-  def get_avatar_link(json)
-    json[:links].find { |link| link[:rel] == 'http://webfinger.net/rel/avatar' }
-  end
-end
diff --git a/spec/fabricators/account_deletion_request_fabricator.rb b/spec/fabricators/account_deletion_request_fabricator.rb
new file mode 100644
index 0000000000..3d3d373988
--- /dev/null
+++ b/spec/fabricators/account_deletion_request_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:account_deletion_request) do
+  account
+end
diff --git a/spec/fabricators/import_fabricator.rb b/spec/fabricators/import_fabricator.rb
new file mode 100644
index 0000000000..4951bb9a4d
--- /dev/null
+++ b/spec/fabricators/import_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:import) do
+  account
+  type :following
+  data { attachment_fixture('imports.txt') }
+end
diff --git a/spec/fabricators/scheduled_status_fabricator.rb b/spec/fabricators/scheduled_status_fabricator.rb
index eed275ab92..d3d4f1bfd8 100644
--- a/spec/fabricators/scheduled_status_fabricator.rb
+++ b/spec/fabricators/scheduled_status_fabricator.rb
@@ -3,4 +3,5 @@
 Fabricator(:scheduled_status) do
   account { Fabricate.build(:account) }
   scheduled_at { 20.hours.from_now }
+  params { {} }
 end
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 5e92cb1d39..4960126035 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe ActivityPub::Activity::Create do
     stub_request(:get, 'http://example.com/emojib.png').to_return(body: attachment_fixture('emojo.png'), headers: { 'Content-Type' => 'application/octet-stream' })
   end
 
-  describe 'processing posts received out of order' do
+  describe 'processing posts received out of order', :sidekiq_fake do
     let(:follower) { Fabricate(:account, username: 'bob') }
 
     let(:object_json) do
@@ -77,13 +77,6 @@ RSpec.describe ActivityPub::Activity::Create do
       follower.follow!(sender)
     end
 
-    around do |example|
-      Sidekiq::Testing.fake! do
-        example.run
-        Sidekiq::Worker.clear_all
-      end
-    end
-
     it 'correctly processes posts and inserts them in timelines', :aggregate_failures do
       # Simulate a temporary failure preventing from fetching the parent post
       stub_request(:get, object_json[:id]).to_return(status: 500)
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 2c8c994712..626cf4778c 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -465,7 +465,7 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#approve' do
-    let(:total_users) { 10 }
+    let(:total_users) { 4 }
 
     before do
       Form::AdminSettings.new(registrations_mode: 'approved').save
@@ -482,7 +482,7 @@ describe Mastodon::CLI::Accounts do
 
     context 'with --number option' do
       context 'when the number is positive' do
-        let(:options) { { number: 3 } }
+        let(:options) { { number: 2 } }
 
         it 'approves the earliest n pending registrations' do
           cli.invoke(:approve, nil, options)
@@ -779,6 +779,8 @@ describe Mastodon::CLI::Accounts do
       let(:arguments)              { [account_example_com_a.acct, account_example_com_b.acct] }
 
       before do
+        # NOTE: `Account.find_remote` is stubbed so that `Account#reset_avatar!`
+        # can be stubbed on the individual accounts.
         allow(Account).to receive(:find_remote).with(account_example_com_a.username, account_example_com_a.domain).and_return(account_example_com_a)
         allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(account_example_com_b)
         allow(Account).to receive(:find_remote).with(account_example_net.username, account_example_net.domain).and_return(account_example_net)
@@ -978,11 +980,10 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'when --all option is provided' do
-      let(:accounts) { Fabricate.times(3, :account) }
-      let(:options)  { { all: true } }
+      let!(:accounts) { Fabricate.times(2, :account) }
+      let(:options)   { { all: true } }
 
       before do
-        allow(Account).to receive(:local).and_return(Account.where(id: accounts.map(&:id)))
         cli.options = { all: true }
       end
 
@@ -1269,7 +1270,7 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'when the given username is found' do
-      let(:total_relationships) { 10 }
+      let(:total_relationships) { 3 }
       let!(:accounts)           { Fabricate.times(total_relationships, :account) }
 
       context 'with --follows option' do
@@ -1324,8 +1325,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { followers: true, follows: true } }
 
         before do
-          accounts.first(6).each { |account| account.follow!(target_account) }
-          accounts.last(4).each  { |account| target_account.follow!(account) }
+          accounts.first(2).each { |account| account.follow!(target_account) }
+          accounts.last(1).each  { |account| target_account.follow!(account) }
         end
 
         it 'resets all "followers" relationships from the target account' do
@@ -1363,7 +1364,7 @@ describe Mastodon::CLI::Accounts do
     let!(:group_account)     { Fabricate(:account, actor_type: 'Group', domain: 'example.com') }
     let!(:mentioned_account) { Fabricate(:account, domain: 'example.com') }
     let!(:prunable_accounts) do
-      Fabricate.times(3, :account, domain: 'example.com', bot: false, suspended_at: nil, silenced_at: nil)
+      Fabricate.times(2, :account, domain: 'example.com', bot: false, suspended_at: nil, silenced_at: nil)
     end
 
     before do
@@ -1581,8 +1582,7 @@ describe Mastodon::CLI::Accounts do
 
       context 'when the specified account is redirecting to a different target account' do
         before do
-          allow(Account).to receive(:find_local).with(source_account.username).and_return(source_account)
-          allow(source_account).to receive(:moved_to_account_id).and_return(-1)
+          source_account.update(moved_to_account: Fabricate(:account))
         end
 
         it 'exits with an error message' do
@@ -1597,9 +1597,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { target: target_account.acct, force: true } }
 
         before do
+          source_account.update(moved_to_account: Fabricate(:account))
           target_account.aliases.create!(acct: source_account.acct)
-          allow(Account).to receive(:find_local).with(source_account.username).and_return(source_account)
-          allow(source_account).to receive(:moved_to_account_id).and_return(-1)
         end
 
         it_behaves_like 'a successful migration'
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 423dce88ab..88ad7aa02b 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -13,14 +13,13 @@ RSpec.describe AdminMailer do
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers' do
-      expect(mail.subject).to eq("New report for cb6e6126.ngrok.io (##{report.id})")
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to eq("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n")
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject("New report for cb6e6126.ngrok.io (##{report.id})"))
+        .and(have_body_text("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n"))
     end
   end
 
@@ -33,14 +32,13 @@ RSpec.describe AdminMailer do
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers' do
-      expect(mail.subject).to eq("#{appeal.account.username} is appealing a moderation decision on cb6e6126.ngrok.io")
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match "#{appeal.account.username} is appealing a moderation decision by #{appeal.strike.account.username}"
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject("#{appeal.account.username} is appealing a moderation decision on cb6e6126.ngrok.io"))
+        .and(have_body_text("#{appeal.account.username} is appealing a moderation decision by #{appeal.strike.account.username}"))
     end
   end
 
@@ -53,36 +51,39 @@ RSpec.describe AdminMailer do
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers' do
-      expect(mail.subject).to eq("New account up for review on cb6e6126.ngrok.io (#{user.account.username})")
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match 'The details of the new account are below. You can approve or reject this application.'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject("New account up for review on cb6e6126.ngrok.io (#{user.account.username})"))
+        .and(have_body_text('The details of the new account are below. You can approve or reject this application.'))
     end
   end
 
   describe '.new_trends' do
     let(:recipient) { Fabricate(:account, username: 'Snurf') }
-    let(:links) { [] }
-    let(:statuses) { [] }
-    let(:tags) { [] }
-    let(:mail) { described_class.with(recipient: recipient).new_trends(links, tags, statuses) }
+    let(:link) { Fabricate(:preview_card, trendable: true, language: 'en') }
+    let(:status) { Fabricate(:status) }
+    let(:tag) { Fabricate(:tag) }
+    let(:mail) { described_class.with(recipient: recipient).new_trends([link], [tag], [status]) }
 
     before do
+      PreviewCardTrend.create!(preview_card: link)
+      StatusTrend.create!(status: status, account: Fabricate(:account))
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers' do
-      expect(mail.subject).to eq('New trends up for review on cb6e6126.ngrok.io')
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match 'The following items need a review before they can be displayed publicly'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject('New trends up for review on cb6e6126.ngrok.io'))
+        .and(have_body_text('The following items need a review before they can be displayed publicly'))
+        .and(have_body_text(ActivityPub::TagManager.instance.url_for(status)))
+        .and(have_body_text(link.title))
+        .and(have_body_text(tag.display_name))
     end
   end
 
@@ -94,14 +95,13 @@ RSpec.describe AdminMailer do
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers' do
-      expect(mail.subject).to eq('New Mastodon versions are available for cb6e6126.ngrok.io!')
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match 'New Mastodon versions have been released, you may want to update!'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject('New Mastodon versions are available for cb6e6126.ngrok.io!'))
+        .and(have_body_text('New Mastodon versions have been released, you may want to update!'))
     end
   end
 
@@ -113,18 +113,16 @@ RSpec.describe AdminMailer do
       recipient.user.update(locale: :en)
     end
 
-    it 'renders the headers', :aggregate_failures do
-      expect(mail.subject).to eq('Critical Mastodon updates are available for cb6e6126.ngrok.io!')
-      expect(mail.to).to eq [recipient.user_email]
-      expect(mail.from).to eq ['notifications@localhost']
-
-      expect(mail['Importance'].value).to eq 'high'
-      expect(mail['Priority'].value).to eq 'urgent'
-      expect(mail['X-Priority'].value).to eq '1'
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match 'New critical versions of Mastodon have been released, you may want to update as soon as possible!'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(deliver_to(recipient.user_email))
+        .and(deliver_from('notifications@localhost'))
+        .and(have_subject('Critical Mastodon updates are available for cb6e6126.ngrok.io!'))
+        .and(have_body_text('New critical versions of Mastodon have been released, you may want to update as soon as possible!'))
+        .and(have_header('Importance', 'high'))
+        .and(have_header('Priority', 'urgent'))
+        .and(have_header('X-Priority', '1'))
     end
   end
 end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 78a497c06b..eab196166d 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -8,24 +8,27 @@ RSpec.describe NotificationMailer do
   let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
   let(:own_status)     { Fabricate(:status, account: receiver.account, text: 'The body of the own status') }
 
-  shared_examples 'headers' do |type, thread|
-    it 'renders the to and from headers' do
-      expect(mail[:to].value).to eq "#{receiver.account.username} <#{receiver.email}>"
-      expect(mail.from).to eq ['notifications@localhost']
+  shared_examples 'standard headers' do |type|
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_header('To', "#{receiver.account.username} <#{receiver.email}>"))
+        .and(have_header('List-ID', "<#{type}.alice.cb6e6126.ngrok.io>"))
+        .and(have_header('List-Unsubscribe', %r{<https://cb6e6126.ngrok.io/unsubscribe\?token=.+>}))
+        .and(have_header('List-Unsubscribe', /&type=#{type}/))
+        .and(have_header('List-Unsubscribe-Post', 'List-Unsubscribe=One-Click'))
+        .and(deliver_to("#{receiver.account.username} <#{receiver.email}>"))
+        .and(deliver_from('notifications@localhost'))
     end
+  end
 
-    it 'renders the list headers' do
-      expect(mail['List-ID'].value).to eq "<#{type}.alice.cb6e6126.ngrok.io>"
-      expect(mail['List-Unsubscribe'].value).to match(%r{<https://cb6e6126.ngrok.io/unsubscribe\?token=.+>})
-      expect(mail['List-Unsubscribe'].value).to match("&type=#{type}")
-      expect(mail['List-Unsubscribe-Post'].value).to eq 'List-Unsubscribe=One-Click'
-    end
-
-    if thread
-      it 'renders the thread headers' do
-        expect(mail['In-Reply-To'].value).to match(/<conversation-\d+.\d\d\d\d-\d\d-\d\d@cb6e6126.ngrok.io>/)
-        expect(mail['References'].value).to match(/<conversation-\d+.\d\d\d\d-\d\d-\d\d@cb6e6126.ngrok.io>/)
-      end
+  shared_examples 'thread headers' do
+    it 'renders the email with conversation thread headers' do
+      conversation_header_regex = /<conversation-\d+.\d\d\d\d-\d\d-\d\d@cb6e6126.ngrok.io>/
+      expect(mail)
+        .to be_present
+        .and(have_header('In-Reply-To', conversation_header_regex))
+        .and(have_header('References', conversation_header_regex))
     end
   end
 
@@ -35,15 +38,15 @@ RSpec.describe NotificationMailer do
     let(:mail) { prepared_mailer_for(receiver.account).mention }
 
     include_examples 'localized subject', 'notification_mailer.mention.subject', name: 'bob'
-    include_examples 'headers', 'mention', true
+    include_examples 'standard headers', 'mention'
+    include_examples 'thread headers'
 
-    it 'renders the subject' do
-      expect(mail.subject).to eq('You were mentioned by bob')
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match('You were mentioned by bob')
-      expect(mail.body.encoded).to include 'The body of the foreign status'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('You were mentioned by bob'))
+        .and(have_body_text('You were mentioned by bob'))
+        .and(have_body_text('The body of the foreign status'))
     end
   end
 
@@ -53,14 +56,13 @@ RSpec.describe NotificationMailer do
     let(:mail) { prepared_mailer_for(receiver.account).follow }
 
     include_examples 'localized subject', 'notification_mailer.follow.subject', name: 'bob'
-    include_examples 'headers', 'follow', false
+    include_examples 'standard headers', 'follow'
 
-    it 'renders the subject' do
-      expect(mail.subject).to eq('bob is now following you')
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match('bob is now following you')
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('bob is now following you'))
+        .and(have_body_text('bob is now following you'))
     end
   end
 
@@ -70,15 +72,15 @@ RSpec.describe NotificationMailer do
     let(:mail) { prepared_mailer_for(own_status.account).favourite }
 
     include_examples 'localized subject', 'notification_mailer.favourite.subject', name: 'bob'
-    include_examples 'headers', 'favourite', true
+    include_examples 'standard headers', 'favourite'
+    include_examples 'thread headers'
 
-    it 'renders the subject' do
-      expect(mail.subject).to eq('bob favorited your post')
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match('Your post was favorited by bob')
-      expect(mail.body.encoded).to include 'The body of the own status'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('bob favorited your post'))
+        .and(have_body_text('Your post was favorited by bob'))
+        .and(have_body_text('The body of the own status'))
     end
   end
 
@@ -88,15 +90,15 @@ RSpec.describe NotificationMailer do
     let(:mail) { prepared_mailer_for(own_status.account).reblog }
 
     include_examples 'localized subject', 'notification_mailer.reblog.subject', name: 'bob'
-    include_examples 'headers', 'reblog', true
+    include_examples 'standard headers', 'reblog'
+    include_examples 'thread headers'
 
-    it 'renders the subject' do
-      expect(mail.subject).to eq('bob boosted your post')
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match('Your post was boosted by bob')
-      expect(mail.body.encoded).to include 'The body of the own status'
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('bob boosted your post'))
+        .and(have_body_text('Your post was boosted by bob'))
+        .and(have_body_text('The body of the own status'))
     end
   end
 
@@ -106,14 +108,13 @@ RSpec.describe NotificationMailer do
     let(:mail) { prepared_mailer_for(receiver.account).follow_request }
 
     include_examples 'localized subject', 'notification_mailer.follow_request.subject', name: 'bob'
-    include_examples 'headers', 'follow_request', false
+    include_examples 'standard headers', 'follow_request'
 
-    it 'renders the subject' do
-      expect(mail.subject).to eq('Pending follower: bob')
-    end
-
-    it 'renders the body' do
-      expect(mail.body.encoded).to match('bob has requested to follow you')
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('Pending follower: bob'))
+        .and(have_body_text('bob has requested to follow you'))
     end
   end
 
diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb
index bc8f0193b9..942d40d568 100644
--- a/spec/mailers/previews/admin_mailer_preview.rb
+++ b/spec/mailers/previews/admin_mailer_preview.rb
@@ -3,6 +3,16 @@
 # Preview all emails at http://localhost:3000/rails/mailers/admin_mailer
 
 class AdminMailerPreview < ActionMailer::Preview
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_report
+  def new_report
+    AdminMailer.with(recipient: Account.first).new_report(Report.first)
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_appeal
+  def new_appeal
+    AdminMailer.with(recipient: Account.first).new_appeal(Appeal.first)
+  end
+
   # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_pending_account
   def new_pending_account
     AdminMailer.with(recipient: Account.first).new_pending_account(User.pending.first)
@@ -13,8 +23,13 @@ class AdminMailerPreview < ActionMailer::Preview
     AdminMailer.with(recipient: Account.first).new_trends(PreviewCard.joins(:trend).limit(3), Tag.limit(3), Status.joins(:trend).where(reblog_of_id: nil).limit(3))
   end
 
-  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_appeal
-  def new_appeal
-    AdminMailer.with(recipient: Account.first).new_appeal(Appeal.first)
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_software_updates
+  def new_software_updates
+    AdminMailer.with(recipient: Account.first).new_software_updates
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_critical_software_updates
+  def new_critical_software_updates
+    AdminMailer.with(recipient: Account.first).new_critical_software_updates
   end
 end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index c661f5bbda..4a43928248 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -10,9 +10,12 @@ describe UserMailer do
 
     it 'renders confirmation instructions' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.confirmation_instructions.title')
-      expect(mail.body.encoded).to include 'spec'
-      expect(mail.body.encoded).to include Rails.configuration.x.local_domain
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.confirmation_instructions.title')))
+        .and(have_body_text('spec'))
+        .and(have_body_text(Rails.configuration.x.local_domain))
     end
 
     include_examples 'localized subject',
@@ -25,13 +28,17 @@ describe UserMailer do
 
     it 'renders reconfirmation instructions' do
       receiver.update!(email: 'new-email@example.com', locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.reconfirmation_instructions.title')
-      expect(mail.body.encoded).to include 'spec'
-      expect(mail.body.encoded).to include Rails.configuration.x.local_domain
-      expect(mail.subject).to eq I18n.t('devise.mailer.reconfirmation_instructions.subject',
-                                        instance: Rails.configuration.x.local_domain,
-                                        locale: I18n.default_locale)
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.reconfirmation_instructions.title')))
+        .and(have_body_text('spec'))
+        .and(have_body_text(Rails.configuration.x.local_domain))
     end
+
+    include_examples 'localized subject',
+                     'devise.mailer.confirmation_instructions.subject',
+                     instance: Rails.configuration.x.local_domain
   end
 
   describe '#reset_password_instructions' do
@@ -39,8 +46,11 @@ describe UserMailer do
 
     it 'renders reset password instructions' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.reset_password_instructions.title')
-      expect(mail.body.encoded).to include 'spec'
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.reset_password_instructions.title')))
+        .and(have_body_text('spec'))
     end
 
     include_examples 'localized subject',
@@ -52,7 +62,10 @@ describe UserMailer do
 
     it 'renders password change notification' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.password_change.title')
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.password_change.title')))
     end
 
     include_examples 'localized subject',
@@ -64,7 +77,10 @@ describe UserMailer do
 
     it 'renders email change notification' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.email_changed.title')
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.email_changed.title')))
     end
 
     include_examples 'localized subject',
@@ -77,8 +93,11 @@ describe UserMailer do
 
     it 'renders warning notification' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('user_mailer.warning.title.suspend', acct: receiver.account.acct)
-      expect(mail.body.encoded).to include strike.text
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('user_mailer.warning.title.suspend', acct: receiver.account.acct)))
+        .and(have_body_text(strike.text))
     end
   end
 
@@ -88,7 +107,10 @@ describe UserMailer do
 
     it 'renders webauthn credential deleted notification' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_credential.deleted.title')
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('devise.mailer.webauthn_credential.deleted.title')))
     end
 
     include_examples 'localized subject',
@@ -103,7 +125,10 @@ describe UserMailer do
 
     it 'renders suspicious sign in notification' do
       receiver.update!(locale: nil)
-      expect(mail.body.encoded).to include I18n.t('user_mailer.suspicious_sign_in.explanation')
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('user_mailer.suspicious_sign_in.explanation')))
     end
 
     include_examples 'localized subject',
@@ -115,8 +140,10 @@ describe UserMailer do
     let(:mail) { described_class.appeal_approved(receiver, appeal) }
 
     it 'renders appeal_approved notification' do
-      expect(mail.subject).to eq I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at))
-      expect(mail.body.encoded).to include I18n.t('user_mailer.appeal_approved.title')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at))))
+        .and(have_body_text(I18n.t('user_mailer.appeal_approved.title')))
     end
   end
 
@@ -125,8 +152,10 @@ describe UserMailer do
     let(:mail) { described_class.appeal_rejected(receiver, appeal) }
 
     it 'renders appeal_rejected notification' do
-      expect(mail.subject).to eq I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at))
-      expect(mail.body.encoded).to include I18n.t('user_mailer.appeal_rejected.title')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at))))
+        .and(have_body_text(I18n.t('user_mailer.appeal_rejected.title')))
     end
   end
 
@@ -134,8 +163,10 @@ describe UserMailer do
     let(:mail) { described_class.two_factor_enabled(receiver) }
 
     it 'renders two_factor_enabled mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.two_factor_enabled.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.two_factor_enabled.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.two_factor_enabled.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.two_factor_enabled.explanation')))
     end
   end
 
@@ -143,8 +174,10 @@ describe UserMailer do
     let(:mail) { described_class.two_factor_disabled(receiver) }
 
     it 'renders two_factor_disabled mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.two_factor_disabled.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.two_factor_disabled.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.two_factor_disabled.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.two_factor_disabled.explanation')))
     end
   end
 
@@ -152,8 +185,10 @@ describe UserMailer do
     let(:mail) { described_class.webauthn_enabled(receiver) }
 
     it 'renders webauthn_enabled mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.webauthn_enabled.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_enabled.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.webauthn_enabled.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.webauthn_enabled.explanation')))
     end
   end
 
@@ -161,8 +196,10 @@ describe UserMailer do
     let(:mail) { described_class.webauthn_disabled(receiver) }
 
     it 'renders webauthn_disabled mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.webauthn_disabled.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_disabled.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.webauthn_disabled.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.webauthn_disabled.explanation')))
     end
   end
 
@@ -170,8 +207,10 @@ describe UserMailer do
     let(:mail) { described_class.two_factor_recovery_codes_changed(receiver) }
 
     it 'renders two_factor_recovery_codes_changed mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.two_factor_recovery_codes_changed.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.two_factor_recovery_codes_changed.explanation')))
     end
   end
 
@@ -180,8 +219,10 @@ describe UserMailer do
     let(:mail) { described_class.webauthn_credential_added(receiver, credential) }
 
     it 'renders webauthn_credential_added mail' do
-      expect(mail.subject).to eq I18n.t('devise.mailer.webauthn_credential.added.subject')
-      expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_credential.added.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('devise.mailer.webauthn_credential.added.subject')))
+        .and(have_body_text(I18n.t('devise.mailer.webauthn_credential.added.explanation')))
     end
   end
 
@@ -189,8 +230,10 @@ describe UserMailer do
     let(:mail) { described_class.welcome(receiver) }
 
     it 'renders welcome mail' do
-      expect(mail.subject).to eq I18n.t('user_mailer.welcome.subject')
-      expect(mail.body.encoded).to include I18n.t('user_mailer.welcome.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('user_mailer.welcome.subject')))
+        .and(have_body_text(I18n.t('user_mailer.welcome.explanation')))
     end
   end
 
@@ -199,8 +242,10 @@ describe UserMailer do
     let(:mail) { described_class.backup_ready(receiver, backup) }
 
     it 'renders backup_ready mail' do
-      expect(mail.subject).to eq I18n.t('user_mailer.backup_ready.subject')
-      expect(mail.body.encoded).to include I18n.t('user_mailer.backup_ready.explanation')
+      expect(mail)
+        .to be_present
+        .and(have_subject(I18n.t('user_mailer.backup_ready.subject')))
+        .and(have_body_text(I18n.t('user_mailer.backup_ready.explanation')))
     end
   end
 end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index f77ecb055a..9652ea1910 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -450,10 +450,11 @@ RSpec.describe Account do
       expect(results).to eq [match]
     end
 
-    it 'limits by 10 by default' do
-      11.times.each { Fabricate(:account, display_name: 'Display Name') }
+    it 'limits via constant by default' do
+      stub_const('AccountSearch::DEFAULT_LIMIT', 1)
+      2.times.each { Fabricate(:account, display_name: 'Display Name') }
       results = described_class.search_for('display')
-      expect(results.size).to eq 10
+      expect(results.size).to eq 1
     end
 
     it 'accepts arbitrary limits' do
@@ -594,9 +595,10 @@ RSpec.describe Account do
     end
 
     it 'limits by 10 by default' do
-      11.times { Fabricate(:account, display_name: 'Display Name') }
+      stub_const('AccountSearch::DEFAULT_LIMIT', 1)
+      2.times { Fabricate(:account, display_name: 'Display Name') }
       results = described_class.advanced_search_for('display', account)
-      expect(results.size).to eq 10
+      expect(results.size).to eq 1
     end
 
     it 'accepts arbitrary limits' do
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index 7405bdfa2d..74fff30c95 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -280,10 +280,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
     let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) }
 
     before do
-      4.times { faved_primary.increment_count!(:favourites_count) }
-      5.times { faved_secondary.increment_count!(:favourites_count) }
-      4.times { reblogged_primary.increment_count!(:reblogs_count) }
-      5.times { reblogged_secondary.increment_count!(:reblogs_count) }
+      faved_primary.status_stat.update(favourites_count: 4)
+      faved_secondary.status_stat.update(favourites_count: 5)
+      reblogged_primary.status_stat.update(reblogs_count: 4)
+      reblogged_secondary.status_stat.update(reblogs_count: 5)
     end
 
     context 'when passed a max_id' do
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 604fe73189..5d64d565fc 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -46,12 +46,10 @@ RSpec.describe Admin::AccountAction do
         expect(target_account).to be_suspended
       end
 
-      it 'queues Admin::SuspensionWorker by 1' do
-        Sidekiq::Testing.fake! do
-          expect do
-            subject
-          end.to change { Admin::SuspensionWorker.jobs.size }.by 1
-        end
+      it 'queues Admin::SuspensionWorker by 1', :sidekiq_fake do
+        expect do
+          subject
+        end.to change { Admin::SuspensionWorker.jobs.size }.by 1
       end
     end
 
diff --git a/spec/models/status_pin_spec.rb b/spec/models/status_pin_spec.rb
index 660b2e92ac..da375009ae 100644
--- a/spec/models/status_pin_spec.rb
+++ b/spec/models/status_pin_spec.rb
@@ -40,35 +40,34 @@ RSpec.describe StatusPin do
       expect(described_class.new(account: account, status: status).save).to be false
     end
 
-    max_pins = 5
-    it 'does not allow pins above the max' do
-      account = Fabricate(:account)
-      status = []
+    context 'with a pin limit' do
+      before { stub_const('StatusPinValidator::PIN_LIMIT', 2) }
 
-      (max_pins + 1).times do |i|
-        status[i] = Fabricate(:status, account: account)
+      it 'does not allow pins above the max' do
+        account = Fabricate(:account)
+
+        Fabricate.times(StatusPinValidator::PIN_LIMIT, :status_pin, account: account)
+
+        pin = described_class.new(account: account, status: Fabricate(:status, account: account))
+        expect(pin.save)
+          .to be(false)
+
+        expect(pin.errors[:base])
+          .to contain_exactly(I18n.t('statuses.pin_errors.limit'))
       end
 
-      max_pins.times do |i|
-        expect(described_class.new(account: account, status: status[i]).save).to be true
+      it 'allows pins above the max for remote accounts' do
+        account = Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/')
+
+        Fabricate.times(StatusPinValidator::PIN_LIMIT, :status_pin, account: account)
+
+        pin = described_class.new(account: account, status: Fabricate(:status, account: account))
+        expect(pin.save)
+          .to be(true)
+
+        expect(pin.errors[:base])
+          .to be_empty
       end
-
-      expect(described_class.new(account: account, status: status[max_pins]).save).to be false
-    end
-
-    it 'allows pins above the max for remote accounts' do
-      account = Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/')
-      status = []
-
-      (max_pins + 1).times do |i|
-        status[i] = Fabricate(:status, account: account)
-      end
-
-      max_pins.times do |i|
-        expect(described_class.new(account: account, status: status[i]).save).to be true
-      end
-
-      expect(described_class.new(account: account, status: status[max_pins]).save).to be true
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index faf7fabf1e..a2f8d2ca44 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -27,12 +27,6 @@ RSpec.describe User do
       expect(user).to model_have_error_on_field(:account)
     end
 
-    it 'is invalid without a valid locale' do
-      user = Fabricate.build(:user, locale: 'toto')
-      user.valid?
-      expect(user).to model_have_error_on_field(:locale)
-    end
-
     it 'is invalid without a valid email' do
       user = Fabricate.build(:user, email: 'john@')
       user.valid?
@@ -45,6 +39,18 @@ RSpec.describe User do
       expect(user.valid?).to be true
     end
 
+    it 'cleans out invalid locale' do
+      user = Fabricate.build(:user, locale: 'toto')
+      expect(user.valid?).to be true
+      expect(user.locale).to be_nil
+    end
+
+    it 'cleans out invalid timezone' do
+      user = Fabricate.build(:user, time_zone: 'toto')
+      expect(user.valid?).to be true
+      expect(user.time_zone).to be_nil
+    end
+
     it 'cleans out empty string from languages' do
       user = Fabricate.build(:user, chosen_languages: [''])
       user.valid?
diff --git a/spec/presenters/account_relationships_presenter_spec.rb b/spec/presenters/account_relationships_presenter_spec.rb
index 5c2ba54e00..5b05ac8001 100644
--- a/spec/presenters/account_relationships_presenter_spec.rb
+++ b/spec/presenters/account_relationships_presenter_spec.rb
@@ -23,12 +23,14 @@ RSpec.describe AccountRelationshipsPresenter do
       let(:options) { {} }
 
       it 'sets default maps' do
-        expect(presenter.following).to       eq default_map
-        expect(presenter.followed_by).to     eq default_map
-        expect(presenter.blocking).to        eq default_map
-        expect(presenter.muting).to          eq default_map
-        expect(presenter.requested).to       eq default_map
-        expect(presenter.domain_blocking).to eq default_map
+        expect(presenter).to have_attributes(
+          following: default_map,
+          followed_by: default_map,
+          blocking: default_map,
+          muting: default_map,
+          requested: default_map,
+          domain_blocking: default_map
+        )
       end
     end
 
diff --git a/spec/presenters/familiar_followers_presenter_spec.rb b/spec/presenters/familiar_followers_presenter_spec.rb
index c21ffd36ec..853babb84b 100644
--- a/spec/presenters/familiar_followers_presenter_spec.rb
+++ b/spec/presenters/familiar_followers_presenter_spec.rb
@@ -22,9 +22,12 @@ RSpec.describe FamiliarFollowersPresenter do
     it 'returns followers you follow' do
       result = subject.accounts.first
 
-      expect(result).to_not be_nil
-      expect(result.id).to eq requested_accounts.first.id
-      expect(result.accounts).to contain_exactly(familiar_follower)
+      expect(result)
+        .to be_present
+        .and have_attributes(
+          id: requested_accounts.first.id,
+          accounts: contain_exactly(familiar_follower)
+        )
     end
 
     context 'when requested account hides followers' do
@@ -35,9 +38,12 @@ RSpec.describe FamiliarFollowersPresenter do
       it 'does not return followers you follow' do
         result = subject.accounts.first
 
-        expect(result).to_not be_nil
-        expect(result.id).to eq requested_accounts.first.id
-        expect(result.accounts).to be_empty
+        expect(result)
+          .to be_present
+          .and have_attributes(
+            id: requested_accounts.first.id,
+            accounts: be_empty
+          )
       end
     end
 
@@ -49,9 +55,12 @@ RSpec.describe FamiliarFollowersPresenter do
       it 'does not return followers you follow' do
         result = subject.accounts.first
 
-        expect(result).to_not be_nil
-        expect(result.id).to eq requested_accounts.first.id
-        expect(result.accounts).to be_empty
+        expect(result)
+          .to be_present
+          .and have_attributes(
+            id: requested_accounts.first.id,
+            accounts: be_empty
+          )
       end
     end
   end
diff --git a/spec/presenters/status_relationships_presenter_spec.rb b/spec/presenters/status_relationships_presenter_spec.rb
index 7746c8cd78..af6a93b82b 100644
--- a/spec/presenters/status_relationships_presenter_spec.rb
+++ b/spec/presenters/status_relationships_presenter_spec.rb
@@ -22,11 +22,13 @@ RSpec.describe StatusRelationshipsPresenter do
       let(:options) { {} }
 
       it 'sets default maps' do
-        expect(presenter.reblogs_map).to    eq default_map
-        expect(presenter.favourites_map).to eq default_map
-        expect(presenter.bookmarks_map).to  eq default_map
-        expect(presenter.mutes_map).to      eq default_map
-        expect(presenter.pins_map).to       eq default_map
+        expect(presenter).to have_attributes(
+          reblogs_map: eq(default_map),
+          favourites_map: eq(default_map),
+          bookmarks_map: eq(default_map),
+          mutes_map: eq(default_map),
+          pins_map: eq(default_map)
+        )
       end
     end
 
@@ -80,18 +82,30 @@ RSpec.describe StatusRelationshipsPresenter do
 
       it 'sets @filters_map to filter top-level status' do
         matched_filters = presenter.filters_map[statuses[0].id]
-        expect(matched_filters.size).to eq 1
 
-        expect(matched_filters[0].filter.title).to eq 'filter1'
-        expect(matched_filters[0].keyword_matches).to eq ['banned']
+        expect(matched_filters)
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+          .and contain_exactly(
+            have_attributes(
+              filter: have_attributes(title: 'filter1'),
+              keyword_matches: contain_exactly('banned')
+            )
+          )
       end
 
       it 'sets @filters_map to filter reblogged status' do
         matched_filters = presenter.filters_map[statuses[1].reblog_of_id]
-        expect(matched_filters.size).to eq 1
 
-        expect(matched_filters[0].filter.title).to eq 'filter1'
-        expect(matched_filters[0].keyword_matches).to eq ['irrelevant']
+        expect(matched_filters)
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+          .and contain_exactly(
+            have_attributes(
+              filter: have_attributes(title: 'filter1'),
+              keyword_matches: contain_exactly('irrelevant')
+            )
+          )
       end
     end
 
@@ -107,18 +121,30 @@ RSpec.describe StatusRelationshipsPresenter do
 
       it 'sets @filters_map to filter top-level status' do
         matched_filters = presenter.filters_map[statuses[0].id]
-        expect(matched_filters.size).to eq 1
 
-        expect(matched_filters[0].filter.title).to eq 'filter1'
-        expect(matched_filters[0].status_matches).to eq [statuses[0].id]
+        expect(matched_filters)
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+          .and contain_exactly(
+            have_attributes(
+              filter: have_attributes(title: 'filter1'),
+              status_matches: contain_exactly(statuses.first.id)
+            )
+          )
       end
 
       it 'sets @filters_map to filter reblogged status' do
         matched_filters = presenter.filters_map[statuses[1].reblog_of_id]
-        expect(matched_filters.size).to eq 1
 
-        expect(matched_filters[0].filter.title).to eq 'filter1'
-        expect(matched_filters[0].status_matches).to eq [statuses[1].reblog_of_id]
+        expect(matched_filters)
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+          .and contain_exactly(
+            have_attributes(
+              filter: have_attributes(title: 'filter1'),
+              status_matches: contain_exactly(statuses.second.reblog_of_id)
+            )
+          )
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 79f98f2e22..d30e7201c4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -4,7 +4,6 @@ ENV['RAILS_ENV'] ||= 'test'
 
 # This needs to be defined before Rails is initialized
 RUN_SYSTEM_SPECS = ENV.fetch('RUN_SYSTEM_SPECS', false)
-RUN_SEARCH_SPECS = ENV.fetch('RUN_SEARCH_SPECS', false)
 
 if RUN_SYSTEM_SPECS
   STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
@@ -21,6 +20,7 @@ require 'webmock/rspec'
 require 'paperclip/matchers'
 require 'capybara/rspec'
 require 'chewy/rspec'
+require 'email_spec/rspec'
 
 Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
@@ -54,20 +54,30 @@ RSpec.configure do |config|
     case type
     when :system
       !RUN_SYSTEM_SPECS
-    when :search
-      !RUN_SEARCH_SPECS
     end
   }
-  config.fixture_path = Rails.root.join('spec', 'fixtures')
+
+  # By default, skip the elastic search integration specs
+  config.filter_run_excluding search: true
+
+  config.fixture_paths = [
+    Rails.root.join('spec', 'fixtures'),
+  ]
   config.use_transactional_fixtures = true
   config.order = 'random'
   config.infer_spec_type_from_file_location!
   config.filter_rails_from_backtrace!
 
+  # Set type to `cli` for all CLI specs
   config.define_derived_metadata(file_path: Regexp.new('spec/lib/mastodon/cli')) do |metadata|
     metadata[:type] = :cli
   end
 
+  # Set `search` metadata true for all specs in spec/search/
+  config.define_derived_metadata(file_path: Regexp.new('spec/search/*')) do |metadata|
+    metadata[:search] = true
+  end
+
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :helper
   config.include Devise::Test::ControllerHelpers, type: :view
@@ -85,6 +95,13 @@ RSpec.configure do |config|
     self.use_transactional_tests = true
   end
 
+  config.around(:each, :sidekiq_fake) do |example|
+    Sidekiq::Testing.fake! do
+      example.run
+      Sidekiq::Worker.clear_all
+    end
+  end
+
   config.before :each, type: :cli do
     stub_stdout
     stub_reset_connection_pools
diff --git a/spec/requests/api/v1/accounts/relationships_spec.rb b/spec/requests/api/v1/accounts/relationships_spec.rb
index 5011352c6b..cea45168a2 100644
--- a/spec/requests/api/v1/accounts/relationships_spec.rb
+++ b/spec/requests/api/v1/accounts/relationships_spec.rb
@@ -27,12 +27,16 @@ describe 'GET /api/v1/accounts/relationships' do
     it 'returns JSON with correct data', :aggregate_failures do
       subject
 
-      json = body_as_json
-
-      expect(response).to have_http_status(200)
-      expect(json).to be_a Enumerable
-      expect(json.first[:following]).to be true
-      expect(json.first[:followed_by]).to be false
+      expect(response)
+        .to have_http_status(200)
+      expect(body_as_json)
+        .to be_an(Enumerable)
+        .and have_attributes(
+          first: include(
+            following: true,
+            followed_by: false
+          )
+        )
     end
   end
 
@@ -40,18 +44,19 @@ describe 'GET /api/v1/accounts/relationships' do
     let(:params) { { id: [simon.id, lewis.id, bob.id] } }
 
     context 'when there is returned JSON data' do
-      let(:json) { body_as_json }
-
       context 'with default parameters' do
         it 'returns an enumerable json with correct elements, excluding suspended accounts', :aggregate_failures do
           subject
 
-          expect(response).to have_http_status(200)
-          expect(json).to be_a Enumerable
-          expect(json.size).to eq 2
-
-          expect_simon_item_one
-          expect_lewis_item_two
+          expect(response)
+            .to have_http_status(200)
+          expect(body_as_json)
+            .to be_an(Enumerable)
+            .and have_attributes(
+              size: 2,
+              first: include(simon_item),
+              second: include(lewis_item)
+            )
         end
       end
 
@@ -61,62 +66,91 @@ describe 'GET /api/v1/accounts/relationships' do
         it 'returns an enumerable json with correct elements, including suspended accounts', :aggregate_failures do
           subject
 
-          expect(response).to have_http_status(200)
-          expect(json).to be_a Enumerable
-          expect(json.size).to eq 3
-
-          expect_simon_item_one
-          expect_lewis_item_two
-          expect_bob_item_three
+          expect(response)
+            .to have_http_status(200)
+          expect(body_as_json)
+            .to be_an(Enumerable)
+            .and have_attributes(
+              size: 3,
+              first: include(simon_item),
+              second: include(lewis_item),
+              third: include(bob_item)
+            )
         end
       end
 
-      def expect_simon_item_one
-        expect(json.first[:id]).to eq simon.id.to_s
-        expect(json.first[:following]).to be true
-        expect(json.first[:showing_reblogs]).to be true
-        expect(json.first[:followed_by]).to be false
-        expect(json.first[:muting]).to be false
-        expect(json.first[:requested]).to be false
-        expect(json.first[:domain_blocking]).to be false
+      context 'when there are duplicate IDs in the params' do
+        let(:params) { { id: [simon.id, lewis.id, lewis.id, lewis.id, simon.id] } }
+
+        it 'removes duplicate account IDs from params' do
+          subject
+
+          expect(body_as_json)
+            .to be_an(Enumerable)
+            .and have_attributes(
+              size: 2,
+              first: include(simon_item),
+              second: include(lewis_item)
+            )
+        end
       end
 
-      def expect_lewis_item_two
-        expect(json.second[:id]).to eq lewis.id.to_s
-        expect(json.second[:following]).to be false
-        expect(json.second[:showing_reblogs]).to be false
-        expect(json.second[:followed_by]).to be true
-        expect(json.second[:muting]).to be false
-        expect(json.second[:requested]).to be false
-        expect(json.second[:domain_blocking]).to be false
+      def simon_item
+        {
+          id: simon.id.to_s,
+          following: true,
+          showing_reblogs: true,
+          followed_by: false,
+          muting: false,
+          requested: false,
+          domain_blocking: false,
+        }
       end
 
-      def expect_bob_item_three
-        expect(json.third[:id]).to eq bob.id.to_s
-        expect(json.third[:following]).to be false
-        expect(json.third[:showing_reblogs]).to be false
-        expect(json.third[:followed_by]).to be false
-        expect(json.third[:muting]).to be false
-        expect(json.third[:requested]).to be false
-        expect(json.third[:domain_blocking]).to be false
+      def lewis_item
+        {
+          id: lewis.id.to_s,
+          following: false,
+          showing_reblogs: false,
+          followed_by: true,
+          muting: false,
+          requested: false,
+          domain_blocking: false,
+
+        }
+      end
+
+      def bob_item
+        {
+          id: bob.id.to_s,
+          following: false,
+          showing_reblogs: false,
+          followed_by: false,
+          muting: false,
+          requested: false,
+          domain_blocking: false,
+
+        }
       end
     end
 
     it 'returns JSON with correct data on previously cached requests' do
       # Initial request including multiple accounts in params
       get '/api/v1/accounts/relationships', headers: headers, params: { id: [simon.id, lewis.id] }
-      expect(body_as_json.size).to eq(2)
+      expect(body_as_json)
+        .to have_attributes(size: 2)
 
       # Subsequent request with different id, should override cache from first request
       get '/api/v1/accounts/relationships', headers: headers, params: { id: [simon.id] }
 
-      expect(response).to have_http_status(200)
+      expect(response)
+        .to have_http_status(200)
 
       expect(body_as_json)
         .to be_an(Enumerable)
         .and have_attributes(
           size: 1,
-          first: hash_including(
+          first: include(
             following: true,
             showing_reblogs: true
           )
@@ -129,13 +163,17 @@ describe 'GET /api/v1/accounts/relationships' do
 
       get '/api/v1/accounts/relationships', headers: headers, params: { id: [simon.id] }
 
-      expect(response).to have_http_status(200)
+      expect(response)
+        .to have_http_status(200)
 
-      json = body_as_json
-
-      expect(json).to be_a Enumerable
-      expect(json.first[:following]).to be false
-      expect(json.first[:showing_reblogs]).to be false
+      expect(body_as_json)
+        .to be_an(Enumerable)
+        .and have_attributes(
+          first: include(
+            following: false,
+            showing_reblogs: false
+          )
+        )
     end
   end
 end
diff --git a/spec/requests/api/v1/accounts_show_spec.rb b/spec/requests/api/v1/accounts_show_spec.rb
deleted file mode 100644
index ee6e925aa9..0000000000
--- a/spec/requests/api/v1/accounts_show_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'GET /api/v1/accounts/{account_id}' do
-  it 'returns account entity as 200 OK' do
-    account = Fabricate(:account)
-
-    get "/api/v1/accounts/#{account.id}"
-
-    aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(body_as_json[:id]).to eq(account.id.to_s)
-    end
-  end
-
-  it 'returns 404 if account not found' do
-    get '/api/v1/accounts/1'
-
-    aggregate_failures do
-      expect(response).to have_http_status(404)
-      expect(body_as_json[:error]).to eq('Record not found')
-    end
-  end
-
-  context 'when with token' do
-    it 'returns account entity as 200 OK if token is valid' do
-      account = Fabricate(:account)
-      user = Fabricate(:user, account: account)
-      token = Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts').token
-
-      get "/api/v1/accounts/#{account.id}", headers: { Authorization: "Bearer #{token}" }
-
-      aggregate_failures do
-        expect(response).to have_http_status(200)
-        expect(body_as_json[:id]).to eq(account.id.to_s)
-      end
-    end
-
-    it 'returns 403 if scope of token is invalid' do
-      account = Fabricate(:account)
-      user = Fabricate(:user, account: account)
-      token = Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses').token
-
-      get "/api/v1/accounts/#{account.id}", headers: { Authorization: "Bearer #{token}" }
-
-      aggregate_failures do
-        expect(response).to have_http_status(403)
-        expect(body_as_json[:error]).to eq('This action is outside the authorized scopes')
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/requests/api/v1/accounts_spec.rb
similarity index 59%
rename from spec/controllers/api/v1/accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts_spec.rb
index 9d0bb73c7c..e543c41360 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -2,59 +2,100 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::AccountsController do
-  render_views
+describe '/api/v1/accounts' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { '' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let(:user)   { Fabricate(:user) }
-  let(:scopes) { '' }
-  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  describe 'GET /api/v1/accounts/:id' do
+    context 'when logged out' do
+      let(:account) { Fabricate(:account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
+      it 'returns account entity as 200 OK', :aggregate_failures do
+        get "/api/v1/accounts/#{account.id}"
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:id]).to eq(account.id.to_s)
+      end
+    end
+
+    context 'when the account does not exist' do
+      it 'returns http not found' do
+        get '/api/v1/accounts/1'
+
+        expect(response).to have_http_status(404)
+        expect(body_as_json[:error]).to eq('Record not found')
+      end
+    end
+
+    context 'when logged in' do
+      subject do
+        get "/api/v1/accounts/#{account.id}", headers: headers
+      end
+
+      let(:account) { Fabricate(:account) }
+      let(:scopes) { 'read:accounts' }
+
+      it 'returns account entity as 200 OK', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:id]).to eq(account.id.to_s)
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    end
   end
 
-  describe 'POST #create' do
-    let(:app) { Fabricate(:application) }
-    let(:token) { Doorkeeper::AccessToken.find_or_create_for(application: app, resource_owner: nil, scopes: 'read write', use_refresh_token: false) }
-    let(:agreement) { nil }
-
-    before do
-      post :create, params: { username: 'test', password: '12345678', email: 'hello@world.tld', agreement: agreement }
+  describe 'POST /api/v1/accounts' do
+    subject do
+      post '/api/v1/accounts', headers: headers, params: { username: 'test', password: '12345678', email: 'hello@world.tld', agreement: agreement }
     end
 
+    let(:client_app) { Fabricate(:application) }
+    let(:token) { Doorkeeper::AccessToken.find_or_create_for(application: client_app, resource_owner: nil, scopes: 'read write', use_refresh_token: false) }
+    let(:agreement) { nil }
+
     context 'when given truthy agreement' do
       let(:agreement) { 'true' }
 
       it 'creates a user', :aggregate_failures do
+        subject
+
         expect(response).to have_http_status(200)
         expect(body_as_json[:access_token]).to_not be_blank
 
         user = User.find_by(email: 'hello@world.tld')
         expect(user).to_not be_nil
-        expect(user.created_by_application_id).to eq app.id
+        expect(user.created_by_application_id).to eq client_app.id
       end
     end
 
     context 'when given no agreement' do
       it 'returns http unprocessable entity' do
+        subject
+
         expect(response).to have_http_status(422)
       end
     end
   end
 
-  describe 'POST #follow' do
+  describe 'POST /api/v1/accounts/:id/follow' do
     let(:scopes) { 'write:follows' }
     let(:other_account) { Fabricate(:account, username: 'bob', locked: locked) }
 
     context 'when posting to an other account' do
-      before do
-        post :follow, params: { id: other_account.id }
+      subject do
+        post "/api/v1/accounts/#{other_account.id}/follow", headers: headers
       end
 
       context 'with unlocked account' do
         let(:locked) { false }
 
         it 'creates a following relation between user and target user', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(200)
 
           json = body_as_json
@@ -72,6 +113,8 @@ RSpec.describe Api::V1::AccountsController do
         let(:locked) { true }
 
         it 'creates a follow request relation between user and target user', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(200)
 
           json = body_as_json
@@ -94,48 +137,53 @@ RSpec.describe Api::V1::AccountsController do
       end
 
       it 'changes reblogs option' do
-        post :follow, params: { id: other_account.id, reblogs: true }
+        post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { reblogs: true }
 
-        json = body_as_json
-
-        expect(json[:following]).to be true
-        expect(json[:showing_reblogs]).to be true
-        expect(json[:notifying]).to be false
+        expect(body_as_json).to include({
+          following: true,
+          showing_reblogs: true,
+          notifying: false,
+        })
       end
 
       it 'changes notify option' do
-        post :follow, params: { id: other_account.id, notify: true }
+        post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { notify: true }
 
-        json = body_as_json
-
-        expect(json[:following]).to be true
-        expect(json[:showing_reblogs]).to be false
-        expect(json[:notifying]).to be true
+        expect(body_as_json).to include({
+          following: true,
+          showing_reblogs: false,
+          notifying: true,
+        })
       end
 
       it 'changes languages option' do
-        post :follow, params: { id: other_account.id, languages: %w(en es) }
+        post "/api/v1/accounts/#{other_account.id}/follow", headers: headers, params: { languages: %w(en es) }
 
-        json = body_as_json
-
-        expect(json[:following]).to be true
-        expect(json[:showing_reblogs]).to be false
-        expect(json[:notifying]).to be false
-        expect(json[:languages]).to match_array %w(en es)
+        expect(body_as_json).to include({
+          following: true,
+          showing_reblogs: false,
+          notifying: false,
+          languages: match_array(%w(en es)),
+        })
       end
     end
   end
 
-  describe 'POST #unfollow' do
+  describe 'POST /api/v1/accounts/:id/unfollow' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/unfollow", headers: headers
+    end
+
     let(:scopes) { 'write:follows' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
-      post :unfollow, params: { id: other_account.id }
     end
 
     it 'removes the following relation between user and target user', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.following?(other_account)).to be false
     end
@@ -143,16 +191,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #remove_from_followers' do
+  describe 'POST /api/v1/accounts/:id/remove_from_followers' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/remove_from_followers", headers: headers
+    end
+
     let(:scopes) { 'write:follows' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       other_account.follow!(user.account)
-      post :remove_from_followers, params: { id: other_account.id }
     end
 
     it 'removes the followed relation between user and target user', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.followed_by?(other_account)).to be false
     end
@@ -160,16 +213,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #block' do
+  describe 'POST /api/v1/accounts/:id/block' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/block", headers: headers
+    end
+
     let(:scopes) { 'write:blocks' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
-      post :block, params: { id: other_account.id }
     end
 
     it 'creates a blocking relation', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.following?(other_account)).to be false
       expect(user.account.blocking?(other_account)).to be true
@@ -178,16 +236,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #unblock' do
+  describe 'POST /api/v1/accounts/:id/unblock' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/unblock", headers: headers
+    end
+
     let(:scopes) { 'write:blocks' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.block!(other_account)
-      post :unblock, params: { id: other_account.id }
     end
 
     it 'removes the blocking relation between user and target user', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.blocking?(other_account)).to be false
     end
@@ -195,16 +258,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #mute' do
+  describe 'POST /api/v1/accounts/:id/mute' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/mute", headers: headers
+    end
+
     let(:scopes) { 'write:mutes' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
-      post :mute, params: { id: other_account.id }
     end
 
     it 'mutes notifications', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.following?(other_account)).to be true
       expect(user.account.muting?(other_account)).to be true
@@ -214,16 +282,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #mute with notifications set to false' do
+  describe 'POST /api/v1/accounts/:id/mute with notifications set to false' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/mute", headers: headers, params: { notifications: false }
+    end
+
     let(:scopes) { 'write:mutes' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
-      post :mute, params: { id: other_account.id, notifications: false }
     end
 
     it 'does not mute notifications', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.following?(other_account)).to be true
       expect(user.account.muting?(other_account)).to be true
@@ -233,16 +306,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #mute with nonzero duration set' do
+  describe 'POST /api/v1/accounts/:id/mute with nonzero duration set' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/mute", headers: headers, params: { duration: 300 }
+    end
+
     let(:scopes) { 'write:mutes' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
-      post :mute, params: { id: other_account.id, duration: 300 }
     end
 
     it 'mutes notifications', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.following?(other_account)).to be true
       expect(user.account.muting?(other_account)).to be true
@@ -252,16 +330,21 @@ RSpec.describe Api::V1::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'read:accounts'
   end
 
-  describe 'POST #unmute' do
+  describe 'POST /api/v1/accounts/:id/unmute' do
+    subject do
+      post "/api/v1/accounts/#{other_account.id}/unmute", headers: headers
+    end
+
     let(:scopes) { 'write:mutes' }
     let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.mute!(other_account)
-      post :unmute, params: { id: other_account.id }
     end
 
     it 'removes the muting relation between user and target user', :aggregate_failures do
+      subject
+
       expect(response).to have_http_status(200)
       expect(user.account.muting?(other_account)).to be false
     end
diff --git a/spec/requests/api/v1/admin/account_actions_spec.rb b/spec/requests/api/v1/admin/account_actions_spec.rb
index bdf1f08e43..c14e08c21c 100644
--- a/spec/requests/api/v1/admin/account_actions_spec.rb
+++ b/spec/requests/api/v1/admin/account_actions_spec.rb
@@ -8,18 +8,12 @@ RSpec.describe 'Account actions' do
   let(:scopes)  { 'admin:write admin:write:accounts' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
-  let(:mailer)  { instance_double(ActionMailer::MessageDelivery, deliver_later!: nil) }
-
-  before do
-    allow(UserMailer).to receive(:warning).with(target_account.user, anything).and_return(mailer)
-  end
 
   shared_examples 'a successful notification delivery' do
     it 'notifies the user about the action taken' do
-      subject
-
-      expect(UserMailer).to have_received(:warning).with(target_account.user, anything).once
-      expect(mailer).to have_received(:deliver_later!).once
+      expect { subject }
+        .to have_enqueued_job(ActionMailer::MailDeliveryJob)
+        .with('UserMailer', 'warning', 'deliver_now!', args: [User, AccountWarning])
     end
   end
 
diff --git a/spec/requests/api/v1/admin/dimensions_spec.rb b/spec/requests/api/v1/admin/dimensions_spec.rb
new file mode 100644
index 0000000000..87534a74b8
--- /dev/null
+++ b/spec/requests/api/v1/admin/dimensions_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin Dimensions' do
+  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/admin/dimensions' do
+    context 'when not authorized' do
+      it 'returns http forbidden' do
+        post '/api/v1/admin/dimensions', params: { account_id: account.id, limit: 2 }
+
+        expect(response)
+          .to have_http_status(403)
+      end
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'admin:read' }
+
+      it 'returns http success and status json' do
+        post '/api/v1/admin/dimensions', params: { account_id: account.id, limit: 2 }, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_an(Array)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/admin/domain_allows_spec.rb b/spec/requests/api/v1/admin/domain_allows_spec.rb
index 6db1ab6e30..662a8f9a8d 100644
--- a/spec/requests/api/v1/admin/domain_allows_spec.rb
+++ b/spec/requests/api/v1/admin/domain_allows_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Domain Allows' do
     end
 
     context 'when there are allowed domains' do
-      let!(:domain_allows) { Fabricate.times(5, :domain_allow) }
+      let!(:domain_allows) { Fabricate.times(2, :domain_allow) }
       let(:expected_response) do
         domain_allows.map do |domain_allow|
           {
@@ -53,7 +53,7 @@ RSpec.describe 'Domain Allows' do
       end
 
       context 'with limit param' do
-        let(:params) { { limit: 2 } }
+        let(:params) { { limit: 1 } }
 
         it 'returns only the requested number of allowed domains' do
           subject
diff --git a/spec/requests/api/v1/admin/measures_spec.rb b/spec/requests/api/v1/admin/measures_spec.rb
new file mode 100644
index 0000000000..15f2df84c6
--- /dev/null
+++ b/spec/requests/api/v1/admin/measures_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin Measures' do
+  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/admin/measures' do
+    context 'when not authorized' do
+      it 'returns http forbidden' do
+        post '/api/v1/admin/measures', params: { account_id: account.id, limit: 2 }
+
+        expect(response)
+          .to have_http_status(403)
+      end
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'admin:read' }
+
+      it 'returns http success and status json' do
+        post '/api/v1/admin/measures', params: { account_id: account.id, limit: 2 }, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_an(Array)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/admin/retention_spec.rb b/spec/requests/api/v1/admin/retention_spec.rb
new file mode 100644
index 0000000000..9178335ba5
--- /dev/null
+++ b/spec/requests/api/v1/admin/retention_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin Retention' do
+  let(:user)    { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/admin/retention' do
+    context 'when not authorized' do
+      it 'returns http forbidden' do
+        post '/api/v1/admin/retention', params: { account_id: account.id, limit: 2 }
+
+        expect(response)
+          .to have_http_status(403)
+      end
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'admin:read' }
+
+      it 'returns http success and status json' do
+        post '/api/v1/admin/retention', params: { account_id: account.id, limit: 2 }, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_an(Array)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/bookmarks_spec.rb b/spec/requests/api/v1/bookmarks_spec.rb
index 1f1cd35caa..18f4fddc29 100644
--- a/spec/requests/api/v1/bookmarks_spec.rb
+++ b/spec/requests/api/v1/bookmarks_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe 'Bookmarks' do
     end
 
     let(:params)     { {} }
-    let!(:bookmarks) { Fabricate.times(3, :bookmark, account: user.account) }
+    let!(:bookmarks) { Fabricate.times(2, :bookmark, account: user.account) }
 
     let(:expected_response) do
       bookmarks.map do |bookmark|
@@ -37,7 +37,7 @@ RSpec.describe 'Bookmarks' do
     end
 
     context 'with limit param' do
-      let(:params) { { limit: 2 } }
+      let(:params) { { limit: 1 } }
 
       it 'paginates correctly', :aggregate_failures do
         subject
diff --git a/spec/requests/api/v1/custom_emojis_spec.rb b/spec/requests/api/v1/custom_emojis_spec.rb
new file mode 100644
index 0000000000..5de0dda0be
--- /dev/null
+++ b/spec/requests/api/v1/custom_emojis_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Custom Emojis' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/custom_emojis' do
+    before do
+      Fabricate(:custom_emoji, domain: nil, disabled: false, visible_in_picker: true)
+    end
+
+    context 'when logged out' do
+      it 'returns http success and json' do
+        get api_v1_custom_emojis_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and have_attributes(
+            first: include(shortcode: 'coolcat')
+          )
+      end
+    end
+
+    context 'when logged in' do
+      it 'returns http success and json' do
+        get api_v1_custom_emojis_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and have_attributes(
+            first: include(shortcode: 'coolcat')
+          )
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/endorsements_spec.rb b/spec/requests/api/v1/endorsements_spec.rb
new file mode 100644
index 0000000000..e267f2abd2
--- /dev/null
+++ b/spec/requests/api/v1/endorsements_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Endorsements' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/endorsements' do
+    context 'when not authorized' do
+      it 'returns http unauthorized' do
+        get api_v1_endorsements_path
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+
+    context 'with wrong scope' do
+      before do
+        get api_v1_endorsements_path, headers: headers
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'read:accounts' }
+
+      context 'with endorsed accounts' do
+        let!(:account_pin) { Fabricate(:account_pin, account: user.account) }
+
+        it 'returns http success and accounts json' do
+          get api_v1_endorsements_path, headers: headers
+
+          expect(response)
+            .to have_http_status(200)
+
+          expect(body_as_json)
+            .to be_present
+            .and have_attributes(
+              first: include(acct: account_pin.target_account.acct)
+            )
+        end
+      end
+
+      context 'without endorsed accounts without json' do
+        it 'returns http success' do
+          get api_v1_endorsements_path, headers: headers
+
+          expect(response)
+            .to have_http_status(200)
+
+          expect(body_as_json)
+            .to_not be_present
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/favourites_spec.rb b/spec/requests/api/v1/favourites_spec.rb
index 713990592c..2d8a42e716 100644
--- a/spec/requests/api/v1/favourites_spec.rb
+++ b/spec/requests/api/v1/favourites_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe 'Favourites' do
     end
 
     let(:params)      { {} }
-    let!(:favourites) { Fabricate.times(3, :favourite, account: user.account) }
+    let!(:favourites) { Fabricate.times(2, :favourite, account: user.account) }
 
     let(:expected_response) do
       favourites.map do |favourite|
@@ -37,7 +37,7 @@ RSpec.describe 'Favourites' do
     end
 
     context 'with limit param' do
-      let(:params) { { limit: 2 } }
+      let(:params) { { limit: 1 } }
 
       it 'returns only the requested number of favourites' do
         subject
diff --git a/spec/requests/api/v1/featured_tags_spec.rb b/spec/requests/api/v1/featured_tags_spec.rb
index 6c171f6e47..c4aa2c0a2d 100644
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe 'FeaturedTags' do
     end
 
     context 'when the requesting user has no featured tag' do
-      before { Fabricate.times(3, :featured_tag) }
+      before { Fabricate(:featured_tag) }
 
       it 'returns an empty body' do
         get '/api/v1/featured_tags', headers: headers
@@ -44,7 +44,7 @@ RSpec.describe 'FeaturedTags' do
     end
 
     context 'when the requesting user has featured tags' do
-      let!(:user_featured_tags) { Fabricate.times(5, :featured_tag, account: user.account) }
+      let!(:user_featured_tags) { Fabricate.times(1, :featured_tag, account: user.account) }
 
       it 'returns only the featured tags belonging to the requesting user' do
         get '/api/v1/featured_tags', headers: headers
diff --git a/spec/requests/api/v1/follow_requests_spec.rb b/spec/requests/api/v1/follow_requests_spec.rb
index 1d78c9be19..a8898ccb3e 100644
--- a/spec/requests/api/v1/follow_requests_spec.rb
+++ b/spec/requests/api/v1/follow_requests_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Follow requests' do
       get '/api/v1/follow_requests', headers: headers, params: params
     end
 
-    let(:accounts) { Fabricate.times(5, :account) }
+    let(:accounts) { Fabricate.times(2, :account) }
     let(:params)   { {} }
 
     let(:expected_response) do
@@ -40,7 +40,7 @@ RSpec.describe 'Follow requests' do
     end
 
     context 'with limit param' do
-      let(:params) { { limit: 2 } }
+      let(:params) { { limit: 1 } }
 
       it 'returns only the requested number of follow requests' do
         subject
diff --git a/spec/requests/api/v1/followed_tags_spec.rb b/spec/requests/api/v1/followed_tags_spec.rb
index 9391c7bdc8..52ed1ba4bb 100644
--- a/spec/requests/api/v1/followed_tags_spec.rb
+++ b/spec/requests/api/v1/followed_tags_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Followed tags' do
       get '/api/v1/followed_tags', headers: headers, params: params
     end
 
-    let!(:tag_follows) { Fabricate.times(5, :tag_follow, account: user.account) }
+    let!(:tag_follows) { Fabricate.times(2, :tag_follow, account: user.account) }
     let(:params)       { {} }
 
     let(:expected_response) do
@@ -41,7 +41,7 @@ RSpec.describe 'Followed tags' do
     end
 
     context 'with limit param' do
-      let(:params) { { limit: 3 } }
+      let(:params) { { limit: 1 } }
 
       it 'returns only the requested number of follow tags' do
         subject
@@ -58,7 +58,7 @@ RSpec.describe 'Followed tags' do
       it 'sets the correct pagination header for the next path' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows[2].id))
+        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows.last.id))
       end
     end
   end
diff --git a/spec/requests/api/v1/instance_spec.rb b/spec/requests/api/v1/instance_spec.rb
new file mode 100644
index 0000000000..600584eccb
--- /dev/null
+++ b/spec/requests/api/v1/instance_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Instances' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/instance' do
+    context 'when not logged in' do
+      it 'returns http success and json' do
+        get api_v1_instance_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and include(title: 'Mastodon Glitch Edition')
+      end
+    end
+
+    context 'when logged in' do
+      it 'returns http success and json' do
+        get api_v1_instance_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and include(title: 'Mastodon Glitch Edition')
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/activity_spec.rb b/spec/requests/api/v1/instances/activity_spec.rb
new file mode 100644
index 0000000000..d1f92ef36e
--- /dev/null
+++ b/spec/requests/api/v1/instances/activity_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Activity' do
+  describe 'GET /api/v1/instance/activity' do
+    around do |example|
+      original = Setting.activity_api_enabled
+      example.run
+      Setting.activity_api_enabled = original
+    end
+
+    context 'with activity api enabled' do
+      before { Setting.activity_api_enabled = true }
+
+      it 'returns http success' do
+        get api_v1_instance_activity_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and(be_an(Array))
+          .and(have_attributes(size: Api::V1::Instances::ActivityController::WEEKS_OF_ACTIVITY))
+      end
+    end
+
+    context 'with activity api diabled' do
+      before { Setting.activity_api_enabled = false }
+
+      it 'returns not found' do
+        get api_v1_instance_activity_path
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/domain_blocks_spec.rb b/spec/requests/api/v1/instances/domain_blocks_spec.rb
new file mode 100644
index 0000000000..99b5e2b6aa
--- /dev/null
+++ b/spec/requests/api/v1/instances/domain_blocks_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Domain Blocks' do
+  describe 'GET /api/v1/instance/domain_blocks' do
+    around do |example|
+      original = Setting.show_domain_blocks
+      example.run
+      Setting.show_domain_blocks = original
+    end
+
+    before do
+      Fabricate(:domain_block)
+    end
+
+    context 'with domain blocks set to all' do
+      before { Setting.show_domain_blocks = 'all' }
+
+      it 'returns http success' do
+        get api_v1_instance_domain_blocks_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and(be_an(Array))
+          .and(have_attributes(size: 1))
+      end
+    end
+
+    context 'with domain blocks set to users' do
+      before { Setting.show_domain_blocks = 'users' }
+
+      it 'returns http not found' do
+        get api_v1_instance_domain_blocks_path
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'with domain blocks set to disabled' do
+      before { Setting.show_domain_blocks = 'disabled' }
+
+      it 'returns http not found' do
+        get api_v1_instance_domain_blocks_path
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/extended_descriptions_spec.rb b/spec/requests/api/v1/instances/extended_descriptions_spec.rb
new file mode 100644
index 0000000000..64982de686
--- /dev/null
+++ b/spec/requests/api/v1/instances/extended_descriptions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Extended Descriptions' do
+  describe 'GET /api/v1/instance/extended_description' do
+    it 'returns http success' do
+      get api_v1_instance_extended_description_path
+
+      expect(response)
+        .to have_http_status(200)
+
+      expect(body_as_json)
+        .to be_present
+        .and include(:content)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/peers_spec.rb b/spec/requests/api/v1/instances/peers_spec.rb
new file mode 100644
index 0000000000..d3400ae8fd
--- /dev/null
+++ b/spec/requests/api/v1/instances/peers_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Peers' do
+  describe 'GET /api/v1/instance/peers' do
+    around do |example|
+      original = Setting.peers_api_enabled
+      example.run
+      Setting.peers_api_enabled = original
+    end
+
+    context 'with peers api enabled' do
+      before { Setting.peers_api_enabled = true }
+
+      it 'returns http success' do
+        get api_v1_instance_peers_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_an(Array)
+      end
+    end
+
+    context 'with peers api diabled' do
+      before { Setting.peers_api_enabled = false }
+
+      it 'returns http not found' do
+        get api_v1_instance_peers_path
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/privacy_policies_spec.rb b/spec/requests/api/v1/instances/privacy_policies_spec.rb
new file mode 100644
index 0000000000..24de98d880
--- /dev/null
+++ b/spec/requests/api/v1/instances/privacy_policies_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Privacy Policy' do
+  describe 'GET /api/v1/instance/privacy_policy' do
+    it 'returns http success' do
+      get api_v1_instance_privacy_policy_path
+
+      expect(response)
+        .to have_http_status(200)
+
+      expect(body_as_json)
+        .to be_present
+        .and include(:content)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/rules_spec.rb b/spec/requests/api/v1/instances/rules_spec.rb
new file mode 100644
index 0000000000..65b8d78c7d
--- /dev/null
+++ b/spec/requests/api/v1/instances/rules_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Rules' do
+  describe 'GET /api/v1/instance/rules' do
+    it 'returns http success' do
+      get api_v1_instance_rules_path
+
+      expect(response)
+        .to have_http_status(200)
+
+      expect(body_as_json)
+        .to be_an(Array)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/instances/translation_languages_spec.rb b/spec/requests/api/v1/instances/translation_languages_spec.rb
new file mode 100644
index 0000000000..0b7dd8314d
--- /dev/null
+++ b/spec/requests/api/v1/instances/translation_languages_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Translation Languages' do
+  describe 'GET /api/v1/instances/translation_languages' do
+    context 'when no translation service is configured' do
+      it 'returns empty language matrix', :aggregate_failures do
+        get api_v1_instance_translation_languages_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to eq({})
+      end
+    end
+
+    context 'when a translation service is configured' do
+      before { configure_translation_service }
+
+      it 'returns language matrix', :aggregate_failures do
+        get api_v1_instance_translation_languages_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to eq({ und: %w(en de), en: ['de'] })
+      end
+
+      private
+
+      def configure_translation_service
+        allow(TranslationService).to receive_messages(configured?: true, configured: service_double)
+      end
+
+      def service_double
+        instance_double(TranslationService::DeepL, languages: { nil => %w(en de), 'en' => ['de'] })
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/lists/accounts_spec.rb b/spec/requests/api/v1/lists/accounts_spec.rb
index 4d2a168b34..de49982351 100644
--- a/spec/requests/api/v1/lists/accounts_spec.rb
+++ b/spec/requests/api/v1/lists/accounts_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Accounts' do
 
     let(:params)   { { limit: 0 } }
     let(:list)     { Fabricate(:list, account: user.account) }
-    let(:accounts) { Fabricate.times(3, :account) }
+    let(:accounts) { Fabricate.times(2, :account) }
 
     let(:expected_response) do
       accounts.map do |account|
diff --git a/spec/requests/api/v1/mutes_spec.rb b/spec/requests/api/v1/mutes_spec.rb
index 9a1d16200a..b2782a0c22 100644
--- a/spec/requests/api/v1/mutes_spec.rb
+++ b/spec/requests/api/v1/mutes_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Mutes' do
       get '/api/v1/mutes', headers: headers, params: params
     end
 
-    let!(:mutes) { Fabricate.times(3, :mute, account: user.account) }
+    let!(:mutes) { Fabricate.times(2, :mute, account: user.account) }
     let(:params) { {} }
 
     it_behaves_like 'forbidden for wrong scope', 'write write:mutes'
@@ -33,7 +33,7 @@ RSpec.describe 'Mutes' do
     end
 
     context 'with limit param' do
-      let(:params) { { limit: 2 } }
+      let(:params) { { limit: 1 } }
 
       it 'returns only the requested number of muted accounts' do
         subject
@@ -46,8 +46,8 @@ RSpec.describe 'Mutes' do
 
         headers = response.headers['Link']
 
-        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_mutes_url(limit: params[:limit], since_id: mutes[2].id.to_s))
-        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_mutes_url(limit: params[:limit], max_id: mutes[1].id.to_s))
+        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_mutes_url(limit: params[:limit], since_id: mutes.last.id.to_s))
+        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_mutes_url(limit: params[:limit], max_id: mutes.last.id.to_s))
       end
     end
 
@@ -72,8 +72,8 @@ RSpec.describe 'Mutes' do
 
         body = body_as_json
 
-        expect(body.size).to eq 2
-        expect(body[0][:id]).to eq mutes[2].target_account_id.to_s
+        expect(body.size).to eq 1
+        expect(body[0][:id]).to eq mutes[1].target_account_id.to_s
       end
     end
 
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 7a879c35b7..7a904816e0 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -168,7 +168,7 @@ RSpec.describe 'Notifications' do
     end
 
     before do
-      Fabricate.times(3, :notification, account: user.account)
+      Fabricate(:notification, account: user.account)
     end
 
     it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
diff --git a/spec/requests/api/v1/preferences_spec.rb b/spec/requests/api/v1/preferences_spec.rb
new file mode 100644
index 0000000000..6f4188c35a
--- /dev/null
+++ b/spec/requests/api/v1/preferences_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Preferences' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/preferences' do
+    context 'when not authorized' do
+      it 'returns http unauthorized' do
+        get api_v1_preferences_path
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+
+    context 'with wrong scope' do
+      before do
+        get api_v1_preferences_path, headers: headers
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'read:accounts' }
+
+      it 'returns http success' do
+        get api_v1_preferences_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/scheduled_status_spec.rb b/spec/requests/api/v1/scheduled_status_spec.rb
new file mode 100644
index 0000000000..49ccde275c
--- /dev/null
+++ b/spec/requests/api/v1/scheduled_status_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Scheduled Statuses' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/scheduled_statuses' do
+    context 'when not authorized' do
+      it 'returns http unauthorized' do
+        get api_v1_scheduled_statuses_path
+
+        expect(response)
+          .to have_http_status(401)
+      end
+    end
+
+    context 'with wrong scope' do
+      before do
+        get api_v1_scheduled_statuses_path, headers: headers
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write write:statuses'
+    end
+
+    context 'with correct scope' do
+      let(:scopes) { 'read:statuses' }
+
+      context 'without scheduled statuses' do
+        it 'returns http success without json' do
+          get api_v1_scheduled_statuses_path, headers: headers
+
+          expect(response)
+            .to have_http_status(200)
+
+          expect(body_as_json)
+            .to_not be_present
+        end
+      end
+
+      context 'with scheduled statuses' do
+        let!(:scheduled_status) { Fabricate(:scheduled_status, account: user.account) }
+
+        it 'returns http success and status json' do
+          get api_v1_scheduled_statuses_path, headers: headers
+
+          expect(response)
+            .to have_http_status(200)
+
+          expect(body_as_json)
+            .to be_present
+            .and have_attributes(
+              first: include(id: scheduled_status.id.to_s)
+            )
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/statuses/favourites_spec.rb b/spec/requests/api/v1/statuses/favourites_spec.rb
index ac5e86f297..8f3e6e5c42 100644
--- a/spec/requests/api/v1/statuses/favourites_spec.rb
+++ b/spec/requests/api/v1/statuses/favourites_spec.rb
@@ -70,19 +70,13 @@ RSpec.describe 'Favourites' do
     end
   end
 
-  describe 'POST /api/v1/statuses/:status_id/unfavourite' do
+  describe 'POST /api/v1/statuses/:status_id/unfavourite', :sidekiq_fake do
     subject do
       post "/api/v1/statuses/#{status.id}/unfavourite", headers: headers
     end
 
     let(:status) { Fabricate(:status) }
 
-    around do |example|
-      Sidekiq::Testing.fake! do
-        example.run
-      end
-    end
-
     it_behaves_like 'forbidden for wrong scope', 'read read:favourites'
 
     context 'with public status' do
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/requests/api/v1/statuses_spec.rb
similarity index 68%
rename from spec/controllers/api/v1/statuses_controller_spec.rb
rename to spec/requests/api/v1/statuses_spec.rb
index 30bafe19ac..201674fccd 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -2,24 +2,26 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::StatusesController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: scopes) }
-
+describe '/api/v1/statuses' do
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
+    let(:user)  { Fabricate(:user) }
+    let(:client_app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: client_app, scopes: scopes) }
+    let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+    describe 'GET /api/v1/statuses/:id' do
+      subject do
+        get "/api/v1/statuses/#{status.id}", headers: headers
+      end
 
-    describe 'GET #show' do
       let(:scopes) { 'read:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
 
+      it_behaves_like 'forbidden for wrong scope', 'write write:statuses'
+
       it 'returns http success' do
-        get :show, params: { id: status.id }
+        subject
+
         expect(response).to have_http_status(200)
       end
 
@@ -31,11 +33,10 @@ RSpec.describe Api::V1::StatusesController do
         end
 
         it 'returns filter information', :aggregate_failures do
-          get :show, params: { id: status.id }
-          json = body_as_json
+          subject
 
           expect(response).to have_http_status(200)
-          expect(json[:filtered][0]).to include({
+          expect(body_as_json[:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -55,11 +56,10 @@ RSpec.describe Api::V1::StatusesController do
         end
 
         it 'returns filter information', :aggregate_failures do
-          get :show, params: { id: status.id }
-          json = body_as_json
+          subject
 
           expect(response).to have_http_status(200)
-          expect(json[:filtered][0]).to include({
+          expect(body_as_json[:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -78,11 +78,10 @@ RSpec.describe Api::V1::StatusesController do
         end
 
         it 'returns filter information', :aggregate_failures do
-          get :show, params: { id: status.id }
-          json = body_as_json
+          subject
 
           expect(response).to have_http_status(200)
-          expect(json[:reblog][:filtered][0]).to include({
+          expect(body_as_json[:reblog][:filtered][0]).to include({
             filter: a_hash_including({
               id: user.account.custom_filters.first.id.to_s,
               title: 'filter1',
@@ -94,7 +93,7 @@ RSpec.describe Api::V1::StatusesController do
       end
     end
 
-    describe 'GET #context' do
+    describe 'GET /api/v1/statuses/:id/context' do
       let(:scopes) { 'read:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
 
@@ -103,20 +102,26 @@ RSpec.describe Api::V1::StatusesController do
       end
 
       it 'returns http success' do
-        get :context, params: { id: status.id }
+        get "/api/v1/statuses/#{status.id}/context", headers: headers
+
         expect(response).to have_http_status(200)
       end
     end
 
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses' do
+      subject do
+        post '/api/v1/statuses', headers: headers, params: params
+      end
+
       let(:scopes) { 'write:statuses' }
+      let(:params) { { status: 'Hello world' } }
+
+      it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
 
       context 'with a basic status body' do
-        before do
-          post :create, params: { status: 'Hello world' }
-        end
-
         it 'returns rate limit headers', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(200)
           expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
           expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
@@ -127,22 +132,22 @@ RSpec.describe Api::V1::StatusesController do
         let!(:alice) { Fabricate(:account, username: 'alice') }
         let!(:bob)   { Fabricate(:account, username: 'bob') }
 
-        before do
-          post :create, params: { status: '@alice hm, @bob is really annoying lately', allowed_mentions: [alice.id] }
-        end
+        let(:params) { { status: '@alice hm, @bob is really annoying lately', allowed_mentions: [alice.id] } }
 
         it 'returns serialized extra accounts in body', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(422)
           expect(body_as_json[:unexpected_accounts].map { |a| a.slice(:id, :acct) }).to eq [{ id: bob.id.to_s, acct: bob.acct }]
         end
       end
 
       context 'with missing parameters' do
-        before do
-          post :create, params: {}
-        end
+        let(:params) { {} }
 
         it 'returns rate limit headers', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(422)
           expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
         end
@@ -151,11 +156,12 @@ RSpec.describe Api::V1::StatusesController do
       context 'when exceeding rate limit' do
         before do
           rate_limiter = RateLimiter.new(user.account, family: :statuses)
-          300.times { rate_limiter.record! }
-          post :create, params: { status: 'Hello world' }
+          RateLimiter::FAMILIES[:statuses][:limit].times { rate_limiter.record! }
         end
 
         it 'returns rate limit headers', :aggregate_failures do
+          subject
+
           expect(response).to have_http_status(429)
           expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
           expect(response.headers['X-RateLimit-Remaining']).to eq '0'
@@ -163,29 +169,37 @@ RSpec.describe Api::V1::StatusesController do
       end
     end
 
-    describe 'DELETE #destroy' do
+    describe 'DELETE /api/v1/statuses/:id' do
+      subject do
+        delete "/api/v1/statuses/#{status.id}", headers: headers
+      end
+
       let(:scopes) { 'write:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
 
-      before do
-        post :destroy, params: { id: status.id }
-      end
+      it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
 
       it 'removes the status', :aggregate_failures do
+        subject
+
         expect(response).to have_http_status(200)
         expect(Status.find_by(id: status.id)).to be_nil
       end
     end
 
-    describe 'PUT #update' do
+    describe 'PUT /api/v1/statuses/:id' do
+      subject do
+        put "/api/v1/statuses/#{status.id}", headers: headers, params: { status: 'I am updated' }
+      end
+
       let(:scopes) { 'write:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
 
-      before do
-        put :update, params: { id: status.id, status: 'I am updated' }
-      end
+      it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
 
       it 'updates the status', :aggregate_failures do
+        subject
+
         expect(response).to have_http_status(200)
         expect(status.reload.text).to eq 'I am updated'
       end
@@ -193,49 +207,49 @@ RSpec.describe Api::V1::StatusesController do
   end
 
   context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
-    end
-
     context 'with a private status' do
-      let(:status) { Fabricate(:status, account: user.account, visibility: :private) }
+      let(:status) { Fabricate(:status, visibility: :private) }
 
-      describe 'GET #show' do
+      describe 'GET /api/v1/statuses/:id' do
         it 'returns http unauthorized' do
-          get :show, params: { id: status.id }
+          get "/api/v1/statuses/#{status.id}"
+
           expect(response).to have_http_status(404)
         end
       end
 
-      describe 'GET #context' do
+      describe 'GET /api/v1/statuses/:id/context' do
         before do
-          Fabricate(:status, account: user.account, thread: status)
+          Fabricate(:status, thread: status)
         end
 
         it 'returns http unauthorized' do
-          get :context, params: { id: status.id }
+          get "/api/v1/statuses/#{status.id}/context"
+
           expect(response).to have_http_status(404)
         end
       end
     end
 
     context 'with a public status' do
-      let(:status) { Fabricate(:status, account: user.account, visibility: :public) }
+      let(:status) { Fabricate(:status, visibility: :public) }
 
-      describe 'GET #show' do
+      describe 'GET /api/v1/statuses/:id' do
         it 'returns http success' do
-          get :show, params: { id: status.id }
+          get "/api/v1/statuses/#{status.id}"
+
           expect(response).to have_http_status(200)
         end
       end
 
-      describe 'GET #context' do
+      describe 'GET /api/v1/statuses/:id/context' do
         before do
-          Fabricate(:status, account: user.account, thread: status)
+          Fabricate(:status, thread: status)
         end
 
         it 'returns http success' do
-          get :context, params: { id: status.id }
+          get "/api/v1/statuses/#{status.id}/context"
+
           expect(response).to have_http_status(200)
         end
       end
diff --git a/spec/requests/api/v2/filters/filters_spec.rb b/spec/requests/api/v2/filters_spec.rb
similarity index 99%
rename from spec/requests/api/v2/filters/filters_spec.rb
rename to spec/requests/api/v2/filters_spec.rb
index 2ee24d8095..fd0483abbe 100644
--- a/spec/requests/api/v2/filters/filters_spec.rb
+++ b/spec/requests/api/v2/filters_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Filters' do
       get '/api/v2/filters', headers: headers
     end
 
-    let!(:filters) { Fabricate.times(3, :custom_filter, account: user.account) }
+    let!(:filters) { Fabricate.times(2, :custom_filter, account: user.account) }
 
     it_behaves_like 'forbidden for wrong scope', 'write write:filters'
     it_behaves_like 'unauthorized for invalid token'
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
new file mode 100644
index 0000000000..bbe8299ac5
--- /dev/null
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Instances' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2/instance' do
+    context 'when logged out' do
+      it 'returns http success and json' do
+        get api_v2_instance_path
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and include(title: 'Mastodon Glitch Edition')
+      end
+    end
+
+    context 'when logged in' do
+      it 'returns http success and json' do
+        get api_v2_instance_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and include(title: 'Mastodon Glitch Edition')
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v2/media_spec.rb b/spec/requests/api/v2/media_spec.rb
index fc6946be53..990fa5d0ba 100644
--- a/spec/requests/api/v2/media_spec.rb
+++ b/spec/requests/api/v2/media_spec.rb
@@ -9,10 +9,82 @@ RSpec.describe 'Media API', :paperclip_processing do
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   describe 'POST /api/v2/media' do
-    it 'returns http success' do
-      post '/api/v2/media', headers: headers, params: { file: fixture_file_upload('attachment-jpg.123456_abcd', 'image/jpeg') }
-      expect(File.exist?(user.account.media_attachments.first.file.path(:small))).to be true
-      expect(response).to have_http_status(200)
+    context 'when small media format attachment is processed immediately' do
+      let(:params) { { file: fixture_file_upload('attachment-jpg.123456_abcd', 'image/jpeg') } }
+
+      it 'returns http success' do
+        post '/api/v2/media', headers: headers, params: params
+
+        expect(File.exist?(user.account.media_attachments.first.file.path(:small)))
+          .to be true
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_a(Hash)
+      end
+    end
+
+    context 'when large format media attachment has not been processed' do
+      let(:params) { { file: fixture_file_upload('attachment.webm', 'video/webm') } }
+
+      it 'returns http accepted' do
+        post '/api/v2/media', headers: headers, params: params
+
+        expect(File.exist?(user.account.media_attachments.first.file.path(:small)))
+          .to be true
+
+        expect(response)
+          .to have_http_status(202)
+
+        expect(body_as_json)
+          .to be_a(Hash)
+      end
+    end
+
+    describe 'when paperclip errors occur' do
+      let(:media_attachments) { double }
+      let(:params)            { { file: fixture_file_upload('attachment.jpg', 'image/jpeg') } }
+
+      before do
+        allow(User).to receive(:find).with(token.resource_owner_id).and_return(user)
+        allow(user.account).to receive(:media_attachments).and_return(media_attachments)
+      end
+
+      context 'when imagemagick cannot identify the file type' do
+        before do
+          allow(media_attachments).to receive(:create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
+        end
+
+        it 'returns http unprocessable entity' do
+          post '/api/v2/media', headers: headers, params: params
+
+          expect(response)
+            .to have_http_status(422)
+
+          expect(body_as_json)
+            .to be_a(Hash)
+            .and include(error: /File type/)
+        end
+      end
+
+      context 'when there is a generic error' do
+        before do
+          allow(media_attachments).to receive(:create!).and_raise(Paperclip::Error)
+        end
+
+        it 'returns http 500' do
+          post '/api/v2/media', headers: headers, params: params
+
+          expect(response)
+            .to have_http_status(500)
+
+          expect(body_as_json)
+            .to be_a(Hash)
+            .and include(error: /processing/)
+        end
+      end
     end
   end
 end
diff --git a/spec/requests/host_meta_request_spec.rb b/spec/requests/host_meta_request_spec.rb
deleted file mode 100644
index ec26ecba7d..0000000000
--- a/spec/requests/host_meta_request_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'The host_meta route' do
-  describe 'requested without accepts headers' do
-    it 'returns an xml response' do
-      get host_meta_url
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/xrd+xml'
-    end
-  end
-end
diff --git a/spec/requests/remote_interaction_helper_spec.rb b/spec/requests/remote_interaction_helper_spec.rb
new file mode 100644
index 0000000000..e6364fe8ce
--- /dev/null
+++ b/spec/requests/remote_interaction_helper_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Remote Interaction Helper' do
+  describe 'GET /remote_interaction_helper' do
+    it 'returns http success' do
+      get remote_interaction_helper_path
+
+      expect(response)
+        .to have_http_status(200)
+        .and render_template(:index, layout: 'helper_frame')
+        .and have_attributes(
+          headers: include(
+            'X-Frame-Options' => 'SAMEORIGIN',
+            'Referrer-Policy' => 'no-referrer',
+            'Content-Security-Policy' => expected_csp_headers
+          )
+        )
+    end
+  end
+
+  private
+
+  def expected_csp_headers
+    <<~CSP.squish
+      default-src 'none'; frame-ancestors 'self'; form-action 'none'; script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'; connect-src https:
+    CSP
+  end
+end
diff --git a/spec/requests/webfinger_request_spec.rb b/spec/requests/webfinger_request_spec.rb
deleted file mode 100644
index 68a1478bed..0000000000
--- a/spec/requests/webfinger_request_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'The webfinger route' do
-  let(:alice) { Fabricate(:account, username: 'alice') }
-
-  describe 'requested with standard accepts headers' do
-    it 'returns a json response' do
-      get webfinger_url(resource: alice.to_webfinger_s)
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/jrd+json'
-    end
-  end
-
-  describe 'asking for json format' do
-    it 'returns a json response for json format' do
-      get webfinger_url(resource: alice.to_webfinger_s, format: :json)
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/jrd+json'
-    end
-
-    it 'returns a json response for json accept header' do
-      headers = { 'HTTP_ACCEPT' => 'application/jrd+json' }
-      get webfinger_url(resource: alice.to_webfinger_s), headers: headers
-
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/jrd+json'
-    end
-  end
-end
diff --git a/spec/requests/well_known/change_password_spec.rb b/spec/requests/well_known/change_password_spec.rb
new file mode 100644
index 0000000000..04134b71ff
--- /dev/null
+++ b/spec/requests/well_known/change_password_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The /.well-known/change-password request' do
+  it 'redirects to the change password page' do
+    get '/.well-known/change-password'
+
+    expect(response).to redirect_to '/auth/edit'
+  end
+end
diff --git a/spec/requests/well_known/host_meta_spec.rb b/spec/requests/well_known/host_meta_spec.rb
new file mode 100644
index 0000000000..ca10a51a01
--- /dev/null
+++ b/spec/requests/well_known/host_meta_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The /.well-known/host-meta request' do
+  it 'returns http success with valid XML response' do
+    get '/.well-known/host-meta'
+
+    expect(response)
+      .to have_http_status(200)
+      .and have_attributes(
+        media_type: 'application/xrd+xml',
+        body: host_meta_xml_template
+      )
+  end
+
+  private
+
+  def host_meta_xml_template
+    <<~XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        <Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
+      </XRD>
+    XML
+  end
+end
diff --git a/spec/requests/well_known/node_info_spec.rb b/spec/requests/well_known/node_info_spec.rb
new file mode 100644
index 0000000000..0934b0fde6
--- /dev/null
+++ b/spec/requests/well_known/node_info_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The well-known node-info endpoints' do
+  describe 'The /.well-known/node-info endpoint' do
+    it 'returns JSON document pointing to node info' do
+      get '/.well-known/nodeinfo'
+
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          media_type: 'application/json'
+        )
+
+      expect(body_as_json).to include(
+        links: be_an(Array).and(
+          contain_exactly(
+            include(
+              rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0',
+              href: include('nodeinfo/2.0')
+            )
+          )
+        )
+      )
+    end
+  end
+
+  describe 'The /nodeinfo/2.0 endpoint' do
+    it 'returns JSON document with node info properties' do
+      get '/nodeinfo/2.0'
+
+      expect(response)
+        .to have_http_status(200)
+        .and have_attributes(
+          media_type: 'application/json'
+        )
+
+      expect(non_matching_hash)
+        .to_not match_json_schema('nodeinfo_2.0')
+
+      expect(body_as_json)
+        .to match_json_schema('nodeinfo_2.0')
+        .and include(
+          version: '2.0',
+          usage: be_a(Hash),
+          software: be_a(Hash),
+          protocols: be_a(Array)
+        )
+    end
+
+    private
+
+    def non_matching_hash
+      { 'foo' => 0 }
+    end
+  end
+end
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
new file mode 100644
index 0000000000..779f1bba59
--- /dev/null
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -0,0 +1,255 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The /.well-known/webfinger endpoint' do
+  subject(:perform_request!) { get webfinger_url(resource: resource) }
+
+  let(:alternate_domains) { [] }
+  let(:alice) { Fabricate(:account, username: 'alice') }
+  let(:resource) { nil }
+
+  around do |example|
+    tmp = Rails.configuration.x.alternate_domains
+    Rails.configuration.x.alternate_domains = alternate_domains
+    example.run
+    Rails.configuration.x.alternate_domains = tmp
+  end
+
+  shared_examples 'a successful response' do
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'sets only a Vary Origin header' do
+      expect(response.headers['Vary']).to eq('Origin')
+    end
+
+    it 'returns application/jrd+json' do
+      expect(response.media_type).to eq 'application/jrd+json'
+    end
+
+    it 'returns links for the account' do
+      json = body_as_json
+      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
+      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+    end
+  end
+
+  context 'when an account exists' do
+    let(:resource) { alice.to_webfinger_s }
+
+    before do
+      perform_request!
+    end
+
+    it_behaves_like 'a successful response'
+  end
+
+  context 'when an account is temporarily suspended' do
+    let(:resource) { alice.to_webfinger_s }
+
+    before do
+      alice.suspend!
+      perform_request!
+    end
+
+    it_behaves_like 'a successful response'
+  end
+
+  context 'when an account is permanently suspended or deleted' do
+    let(:resource) { alice.to_webfinger_s }
+
+    before do
+      alice.suspend!
+      alice.deletion_request.destroy
+      perform_request!
+    end
+
+    it 'returns http gone' do
+      expect(response).to have_http_status(410)
+    end
+  end
+
+  context 'when an account is not found' do
+    let(:resource) { 'acct:not@existing.com' }
+
+    before do
+      perform_request!
+    end
+
+    it 'returns http not found' do
+      expect(response).to have_http_status(404)
+    end
+  end
+
+  context 'with an alternate domain' do
+    let(:alternate_domains) { ['foo.org'] }
+
+    before do
+      perform_request!
+    end
+
+    context 'when an account exists' do
+      let(:resource) do
+        username, = alice.to_webfinger_s.split('@')
+        "#{username}@foo.org"
+      end
+
+      it_behaves_like 'a successful response'
+    end
+
+    context 'when the domain is wrong' do
+      let(:resource) do
+        username, = alice.to_webfinger_s.split('@')
+        "#{username}@bar.org"
+      end
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  context 'when the old name scheme is used to query the instance actor' do
+    let(:resource) do
+      "#{Rails.configuration.x.local_domain}@#{Rails.configuration.x.local_domain}"
+    end
+
+    before do
+      perform_request!
+    end
+
+    it 'returns http success' 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
+      json = body_as_json
+      expect(json[:subject]).to eq 'acct:mastodon.internal@cb6e6126.ngrok.io'
+      expect(json[:aliases]).to eq ['https://cb6e6126.ngrok.io/actor']
+    end
+  end
+
+  context 'with no resource parameter' do
+    let(:resource) { nil }
+
+    before do
+      perform_request!
+    end
+
+    it 'returns http bad request' do
+      expect(response).to have_http_status(400)
+    end
+  end
+
+  context 'with a nonsense parameter' do
+    let(:resource) { 'df/:dfkj' }
+
+    before do
+      perform_request!
+    end
+
+    it 'returns http bad request' do
+      expect(response).to have_http_status(400)
+    end
+  end
+
+  context 'when an account has an avatar' do
+    let(:alice) { Fabricate(:account, username: 'alice', avatar: attachment_fixture('attachment.jpg')) }
+    let(:resource) { alice.to_webfinger_s }
+
+    it 'returns avatar in response' do
+      perform_request!
+
+      avatar_link = get_avatar_link(body_as_json)
+      expect(avatar_link).to_not be_nil
+      expect(avatar_link[:type]).to eq alice.avatar.content_type
+      expect(avatar_link[:href]).to eq Addressable::URI.new(host: Rails.configuration.x.local_domain, path: alice.avatar.to_s, scheme: 'https').to_s
+    end
+
+    context 'with limited federation mode' do
+      before do
+        allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
+      end
+
+      it 'does not return avatar in response' do
+        perform_request!
+
+        avatar_link = get_avatar_link(body_as_json)
+        expect(avatar_link).to be_nil
+      end
+    end
+
+    context 'when enabling DISALLOW_UNAUTHENTICATED_API_ACCESS' do
+      around do |example|
+        ClimateControl.modify DISALLOW_UNAUTHENTICATED_API_ACCESS: 'true' do
+          example.run
+        end
+      end
+
+      it 'does not return avatar in response' do
+        perform_request!
+
+        avatar_link = get_avatar_link(body_as_json)
+        expect(avatar_link).to be_nil
+      end
+    end
+  end
+
+  context 'when an account does not have an avatar' do
+    let(:alice) { Fabricate(:account, username: 'alice', avatar: nil) }
+    let(:resource) { alice.to_webfinger_s }
+
+    before do
+      perform_request!
+    end
+
+    it 'does not return avatar in response' do
+      avatar_link = get_avatar_link(body_as_json)
+      expect(avatar_link).to be_nil
+    end
+  end
+
+  context 'with different headers' do
+    describe 'requested with standard accepts headers' do
+      it 'returns a json response' do
+        get webfinger_url(resource: alice.to_webfinger_s)
+
+        expect(response).to have_http_status(200)
+        expect(response.media_type).to eq 'application/jrd+json'
+      end
+    end
+
+    describe 'asking for json format' do
+      it 'returns a json response for json format' do
+        get webfinger_url(resource: alice.to_webfinger_s, format: :json)
+
+        expect(response).to have_http_status(200)
+        expect(response.media_type).to eq 'application/jrd+json'
+      end
+
+      it 'returns a json response for json accept header' do
+        headers = { 'HTTP_ACCEPT' => 'application/jrd+json' }
+        get webfinger_url(resource: alice.to_webfinger_s), headers: headers
+
+        expect(response).to have_http_status(200)
+        expect(response.media_type).to eq 'application/jrd+json'
+      end
+    end
+  end
+
+  private
+
+  def get_avatar_link(json)
+    json[:links].find { |link| link[:rel] == 'http://webfinger.net/rel/avatar' }
+  end
+end
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index 16d718815a..3a3f95ccc6 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -12,14 +12,7 @@ RSpec.describe BulkImportService do
     import.update(total_items: import.rows.count)
   end
 
-  describe '#call' do
-    around do |example|
-      Sidekiq::Testing.fake! do
-        example.run
-        Sidekiq::Worker.clear_all
-      end
-    end
-
+  describe '#call', :sidekiq_fake do
     context 'when importing follows' do
       let(:import_type) { 'following' }
       let(:overwrite)   { false }
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index eb38230b0a..7f9f746c2a 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -111,7 +111,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
   end
 
-  context 'when poll changes' do
+  context 'when poll changes', :sidekiq_fake do
     let(:account) { Fabricate(:account) }
     let!(:status) { Fabricate(:status, text: 'Foo', account: account, poll_attributes: { options: %w(Foo Bar), account: account, multiple: false, hide_totals: false, expires_at: 7.days.from_now }) }
     let!(:poll)   { status.poll }
@@ -120,9 +120,7 @@ RSpec.describe UpdateStatusService, type: :service do
     before do
       status.update(poll: poll)
       VoteService.new.call(voter, poll, [0])
-      Sidekiq::Testing.fake! do
-        subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz Foo), expires_in: 5.days.to_i })
-      end
+      subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz Foo), expires_in: 5.days.to_i })
     end
 
     it 'updates poll' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7c97d85953..dc60976d05 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,15 +1,7 @@
 # frozen_string_literal: true
 
-if ENV['DISABLE_SIMPLECOV'] != 'true'
-  require 'simplecov'
-  SimpleCov.start 'rails' do
-    add_filter 'lib/linter'
-    add_group 'Policies', 'app/policies'
-    add_group 'Presenters', 'app/presenters'
-    add_group 'Serializers', 'app/serializers'
-    add_group 'Services', 'app/services'
-    add_group 'Validators', 'app/validators'
-  end
+unless ENV['DISABLE_SIMPLECOV'] == 'true'
+  require 'simplecov' # Configuration details loaded from .simplecov
 end
 
 RSpec.configure do |config|
diff --git a/spec/support/search_data_manager.rb b/spec/support/search_data_manager.rb
index 176a674adf..3c7140b48b 100644
--- a/spec/support/search_data_manager.rb
+++ b/spec/support/search_data_manager.rb
@@ -60,7 +60,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.around :each, type: :search do |example|
+  config.around :each, :search do |example|
     search_data_manager.populate_indexes
     example.run
     search_data_manager.remove_indexes
@@ -73,6 +73,6 @@ RSpec.configure do |config|
   end
 
   def search_examples_present?
-    RUN_SEARCH_SPECS
+    RSpec.world.filtered_examples.values.flatten.any? { |example| example.metadata[:search] == true }
   end
 end
diff --git a/spec/workers/account_refresh_worker_spec.rb b/spec/workers/account_refresh_worker_spec.rb
new file mode 100644
index 0000000000..361d69aa0a
--- /dev/null
+++ b/spec/workers/account_refresh_worker_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe AccountRefreshWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(ResolveAccountService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(ResolveAccountService).to receive(:new).and_return(service)
+    end
+
+    context 'when account does not exist' do
+      it 'returns immediately without processing' do
+        worker.perform(123_123_123)
+
+        expect(service).to_not have_received(:call)
+      end
+    end
+
+    context 'when account exists' do
+      context 'when account does not need refreshing' do
+        let(:account) { Fabricate(:account, last_webfingered_at: recent_webfinger_at) }
+
+        it 'returns immediately without processing' do
+          worker.perform(account.id)
+
+          expect(service).to_not have_received(:call)
+        end
+      end
+
+      context 'when account needs refreshing' do
+        let(:account) { Fabricate(:account, last_webfingered_at: outdated_webfinger_at) }
+
+        it 'schedules an account update' do
+          worker.perform(account.id)
+
+          expect(service).to have_received(:call)
+        end
+      end
+
+      def recent_webfinger_at
+        (Account::BACKGROUND_REFRESH_INTERVAL - 3.days).ago
+      end
+
+      def outdated_webfinger_at
+        (Account::BACKGROUND_REFRESH_INTERVAL + 3.days).ago
+      end
+    end
+  end
+end
diff --git a/spec/workers/activitypub/post_upgrade_worker_spec.rb b/spec/workers/activitypub/post_upgrade_worker_spec.rb
new file mode 100644
index 0000000000..08de150ad9
--- /dev/null
+++ b/spec/workers/activitypub/post_upgrade_worker_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ActivityPub::PostUpgradeWorker do
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    let(:domain) { 'host.example' }
+
+    it 'updates relevant values' do
+      account = Fabricate(:account, domain: domain, last_webfingered_at: 1.day.ago, protocol: :ostatus)
+      worker.perform(domain)
+
+      expect(account.reload.last_webfingered_at).to be_nil
+    end
+  end
+end
diff --git a/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb b/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb
new file mode 100644
index 0000000000..8cf13cb900
--- /dev/null
+++ b/spec/workers/activitypub/synchronize_featured_tags_collection_worker_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ActivityPub::SynchronizeFeaturedTagsCollectionWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(ActivityPub::FetchFeaturedTagsCollectionService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(ActivityPub::FetchFeaturedTagsCollectionService).to receive(:new).and_return(service)
+    end
+
+    let(:account) { Fabricate(:account) }
+    let(:url) { 'https://host.example' }
+
+    it 'sends the account and url to the service' do
+      worker.perform(account.id, url)
+
+      expect(service).to have_received(:call).with(account, url)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123, url)
+
+      expect(result).to be(true)
+    end
+  end
+end
diff --git a/spec/workers/admin/suspension_worker_spec.rb b/spec/workers/admin/suspension_worker_spec.rb
new file mode 100644
index 0000000000..da12037edc
--- /dev/null
+++ b/spec/workers/admin/suspension_worker_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::SuspensionWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(SuspendAccountService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(SuspendAccountService).to receive(:new).and_return(service)
+    end
+
+    let(:account) { Fabricate(:account) }
+
+    it 'sends the account to the service' do
+      worker.perform(account.id)
+
+      expect(service).to have_received(:call).with(account)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be(true)
+    end
+  end
+end
diff --git a/spec/workers/after_account_domain_block_worker_spec.rb b/spec/workers/after_account_domain_block_worker_spec.rb
new file mode 100644
index 0000000000..54a113a2b3
--- /dev/null
+++ b/spec/workers/after_account_domain_block_worker_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe AfterAccountDomainBlockWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(AfterBlockDomainFromAccountService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(AfterBlockDomainFromAccountService).to receive(:new).and_return(service)
+    end
+
+    let(:account) { Fabricate(:account) }
+    let(:domain) { 'host.example' }
+
+    it 'sends the account and domain to the service' do
+      worker.perform(account.id, domain)
+
+      expect(service).to have_received(:call).with(account, domain)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123, domain)
+
+      expect(result).to be(true)
+    end
+  end
+end
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
new file mode 100644
index 0000000000..1a169513e9
--- /dev/null
+++ b/spec/workers/backup_worker_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe BackupWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(BackupService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(BackupService).to receive(:new).and_return(service)
+    end
+
+    let(:backup) { Fabricate(:backup) }
+    let!(:other_backup) { Fabricate(:backup, user: backup.user) }
+
+    it 'sends the backup to the service and removes other backups' do
+      expect do
+        worker.perform(backup.id)
+      end.to change(UserMailer.deliveries, :size).by(1)
+
+      expect(service).to have_received(:call).with(backup)
+      expect { other_backup.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    context 'when sidekiq retries are exhausted' do
+      it 'destroys the backup' do
+        described_class.within_sidekiq_retries_exhausted_block({ 'args' => [backup.id] }) do
+          worker.perform(backup.id)
+        end
+
+        expect { backup.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end
diff --git a/spec/workers/delete_mute_worker_spec.rb b/spec/workers/delete_mute_worker_spec.rb
new file mode 100644
index 0000000000..1fc84491c3
--- /dev/null
+++ b/spec/workers/delete_mute_worker_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe DeleteMuteWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(UnmuteService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(UnmuteService).to receive(:new).and_return(service)
+    end
+
+    context 'with an expired mute' do
+      let(:mute) { Fabricate(:mute, expires_at: 1.day.ago) }
+
+      it 'sends the mute to the service' do
+        worker.perform(mute.id)
+
+        expect(service).to have_received(:call).with(mute.account, mute.target_account)
+      end
+    end
+
+    context 'with an unexpired mute' do
+      let(:mute) { Fabricate(:mute, expires_at: 1.day.from_now) }
+
+      it 'does not send the mute to the service' do
+        worker.perform(mute.id)
+
+        expect(service).to_not have_received(:call)
+      end
+    end
+
+    context 'with a non-existent mute' do
+      it 'does not send the mute to the service' do
+        worker.perform(123_123_123)
+
+        expect(service).to_not have_received(:call)
+      end
+    end
+  end
+end
diff --git a/spec/workers/feed_insert_worker_spec.rb b/spec/workers/feed_insert_worker_spec.rb
index 97c73c5999..e9484879ff 100644
--- a/spec/workers/feed_insert_worker_spec.rb
+++ b/spec/workers/feed_insert_worker_spec.rb
@@ -8,6 +8,7 @@ describe FeedInsertWorker do
   describe 'perform' do
     let(:follower) { Fabricate(:account) }
     let(:status) { Fabricate(:status) }
+    let(:list) { Fabricate(:list) }
 
     context 'when there are no records' do
       it 'skips push with missing status' do
@@ -42,11 +43,29 @@ describe FeedInsertWorker do
       it 'pushes the status onto the home timeline without filter' do
         instance = instance_double(FeedManager, push_to_home: nil, filter?: false)
         allow(FeedManager).to receive(:instance).and_return(instance)
-        result = subject.perform(status.id, follower.id)
+        result = subject.perform(status.id, follower.id, :home)
 
         expect(result).to be_nil
         expect(instance).to have_received(:push_to_home).with(follower, status, update: nil)
       end
+
+      it 'pushes the status onto the tags timeline without filter' do
+        instance = instance_double(FeedManager, push_to_home: nil, filter?: false)
+        allow(FeedManager).to receive(:instance).and_return(instance)
+        result = subject.perform(status.id, follower.id, :tags)
+
+        expect(result).to be_nil
+        expect(instance).to have_received(:push_to_home).with(follower, status, update: nil)
+      end
+
+      it 'pushes the status onto the list timeline without filter' do
+        instance = instance_double(FeedManager, push_to_list: nil, filter?: false)
+        allow(FeedManager).to receive(:instance).and_return(instance)
+        result = subject.perform(status.id, list.id, :list)
+
+        expect(result).to be_nil
+        expect(instance).to have_received(:push_to_list).with(list, status, update: nil)
+      end
     end
   end
 end
diff --git a/spec/workers/import_worker_spec.rb b/spec/workers/import_worker_spec.rb
new file mode 100644
index 0000000000..4095a5d354
--- /dev/null
+++ b/spec/workers/import_worker_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ImportWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(ImportService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(ImportService).to receive(:new).and_return(service)
+    end
+
+    let(:import) { Fabricate(:import) }
+
+    it 'sends the import to the service' do
+      worker.perform(import.id)
+
+      expect(service).to have_received(:call).with(import)
+      expect { import.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+end
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index efad92c047..34b342710b 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -35,17 +35,16 @@ describe MoveWorker do
     context 'when user notes are short enough' do
       it 'copies user note with prelude' do
         subject.perform(source_account.id, target_account.id)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment)
+        expect(relevant_account_note.comment)
+          .to include(source_account.acct, account_note.comment)
       end
 
       it 'merges user notes when needed' do
         new_account_note = AccountNote.create!(account: account_note.account, target_account: target_account, comment: 'new note prior to move')
 
         subject.perform(source_account.id, target_account.id)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(source_account.acct)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(new_account_note.comment)
+        expect(relevant_account_note.comment)
+          .to include(source_account.acct, account_note.comment, new_account_note.comment)
       end
     end
 
@@ -54,16 +53,24 @@ describe MoveWorker do
 
       it 'copies user note without prelude' do
         subject.perform(source_account.id, target_account.id)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(account_note.comment)
+        expect(relevant_account_note.comment)
+          .to include(account_note.comment)
       end
 
       it 'keeps user notes unchanged' do
         new_account_note = AccountNote.create!(account: account_note.account, target_account: target_account, comment: 'new note prior to move')
 
         subject.perform(source_account.id, target_account.id)
-        expect(AccountNote.find_by(account: account_note.account, target_account: target_account).comment).to include(new_account_note.comment)
+        expect(relevant_account_note.comment)
+          .to include(new_account_note.comment)
       end
     end
+
+    private
+
+    def relevant_account_note
+      AccountNote.find_by(account: account_note.account, target_account: target_account)
+    end
   end
 
   shared_examples 'block and mute handling' do
@@ -71,10 +78,19 @@ describe MoveWorker do
       subject.perform(source_account.id, target_account.id)
 
       expect(block_service).to have_received(:call).with(blocking_account, target_account)
-      expect(AccountNote.find_by(account: blocking_account, target_account: target_account).comment).to include(source_account.acct)
-
       expect(muting_account.muting?(target_account)).to be true
-      expect(AccountNote.find_by(account: muting_account, target_account: target_account).comment).to include(source_account.acct)
+
+      expect(
+        [note_account_comment, mute_account_comment]
+      ).to all include(source_account.acct)
+    end
+
+    def note_account_comment
+      AccountNote.find_by(account: blocking_account, target_account: target_account).comment
+    end
+
+    def mute_account_comment
+      AccountNote.find_by(account: muting_account, target_account: target_account).comment
     end
   end
 
@@ -143,12 +159,9 @@ describe MoveWorker do
 
   describe '#perform' do
     context 'when both accounts are distant' do
-      it 'calls UnfollowFollowWorker' do
-        Sidekiq::Testing.fake! do
-          subject.perform(source_account.id, target_account.id)
-          expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, false)
-          Sidekiq::Worker.drain_all
-        end
+      it 'calls UnfollowFollowWorker', :sidekiq_fake do
+        subject.perform(source_account.id, target_account.id)
+        expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, false)
       end
 
       include_examples 'common tests'
@@ -157,12 +170,9 @@ describe MoveWorker do
     context 'when target account is local' do
       let(:target_account) { Fabricate(:account) }
 
-      it 'calls UnfollowFollowWorker' do
-        Sidekiq::Testing.fake! do
-          subject.perform(source_account.id, target_account.id)
-          expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, true)
-          Sidekiq::Worker.clear_all
-        end
+      it 'calls UnfollowFollowWorker', :sidekiq_fake do
+        subject.perform(source_account.id, target_account.id)
+        expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, true)
       end
 
       include_examples 'common tests'
diff --git a/spec/workers/poll_expiration_notify_worker_spec.rb b/spec/workers/poll_expiration_notify_worker_spec.rb
index 78cbc1ee40..ca36a37590 100644
--- a/spec/workers/poll_expiration_notify_worker_spec.rb
+++ b/spec/workers/poll_expiration_notify_worker_spec.rb
@@ -10,13 +10,7 @@ describe PollExpirationNotifyWorker do
   let(:remote?) { false }
   let(:poll_vote) { Fabricate(:poll_vote, poll: poll) }
 
-  describe '#perform' do
-    around do |example|
-      Sidekiq::Testing.fake! do
-        example.run
-      end
-    end
-
+  describe '#perform', :sidekiq_fake do
     it 'runs without error for missing record' do
       expect { worker.perform(nil) }.to_not raise_error
     end
diff --git a/spec/workers/post_process_media_worker_spec.rb b/spec/workers/post_process_media_worker_spec.rb
index 33072704bf..828da5244f 100644
--- a/spec/workers/post_process_media_worker_spec.rb
+++ b/spec/workers/post_process_media_worker_spec.rb
@@ -2,12 +2,38 @@
 
 require 'rails_helper'
 
-describe PostProcessMediaWorker do
+describe PostProcessMediaWorker, :paperclip_processing do
   let(:worker) { described_class.new }
 
-  describe 'perform' do
-    it 'runs without error for missing record' do
-      expect { worker.perform(nil) }.to_not raise_error
+  describe '#perform' do
+    let(:media_attachment) { Fabricate(:media_attachment) }
+
+    it 'reprocesses and updates the media attachment' do
+      worker.perform(media_attachment.id)
+
+      expect(media_attachment.processing).to eq('complete')
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be(true)
+    end
+
+    context 'when sidekiq retries are exhausted' do
+      it 'sets state to failed' do
+        described_class.within_sidekiq_retries_exhausted_block({ 'args' => [media_attachment.id] }) do
+          worker.perform(media_attachment.id)
+        end
+
+        expect(media_attachment.reload.processing).to eq('failed')
+      end
+
+      it 'returns true for non-existent record' do
+        described_class.within_sidekiq_retries_exhausted_block({ 'args' => [123_123_123] }) do
+          expect(worker.perform(123_123_123)).to be(true)
+        end
+      end
     end
   end
 end
diff --git a/spec/workers/publish_announcement_reaction_worker_spec.rb b/spec/workers/publish_announcement_reaction_worker_spec.rb
new file mode 100644
index 0000000000..91668b5ada
--- /dev/null
+++ b/spec/workers/publish_announcement_reaction_worker_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe PublishAnnouncementReactionWorker do
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    before { Fabricate(:account, user: Fabricate(:user, current_sign_in_at: 1.hour.ago)) }
+
+    let(:announcement) { Fabricate(:announcement) }
+    let(:name) { 'name value' }
+
+    it 'sends the announcement and name to the service when subscribed' do
+      allow(redis).to receive(:exists?).and_return(true)
+      allow(redis).to receive(:publish)
+
+      worker.perform(announcement.id, name)
+
+      expect(redis).to have_received(:publish)
+    end
+
+    it 'does not send the announcement and name to the service when not subscribed' do
+      allow(redis).to receive(:exists?).and_return(false)
+      allow(redis).to receive(:publish)
+
+      worker.perform(announcement.id, name)
+
+      expect(redis).to_not have_received(:publish)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123, name)
+
+      expect(result).to be(true)
+    end
+  end
+end
diff --git a/spec/workers/redownload_avatar_worker_spec.rb b/spec/workers/redownload_avatar_worker_spec.rb
index b44ae9f035..4ab368e12f 100644
--- a/spec/workers/redownload_avatar_worker_spec.rb
+++ b/spec/workers/redownload_avatar_worker_spec.rb
@@ -5,9 +5,48 @@ require 'rails_helper'
 describe RedownloadAvatarWorker do
   let(:worker) { described_class.new }
 
-  describe 'perform' do
-    it 'runs without error for missing record' do
-      expect { worker.perform(nil) }.to_not raise_error
+  describe '#perform' do
+    it 'returns nil for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be_nil
+    end
+
+    it 'returns nil for suspended account' do
+      account = Fabricate(:account, suspended_at: 10.days.ago)
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil with a domain block' do
+      account = Fabricate(:account, domain: 'host.example')
+      Fabricate(:domain_block, domain: account.domain, reject_media: true)
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil without an avatar remote url' do
+      account = Fabricate(:account, avatar_remote_url: '')
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil when avatar file name is present' do
+      stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
+      account = Fabricate(:account, avatar_remote_url: 'https://example.host/file', avatar_file_name: 'test.jpg')
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'reprocesses a remote avatar' do
+      stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
+      account = Fabricate(:account, avatar_remote_url: 'https://example.host/file')
+      account.update_column(:avatar_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+
+      result = worker.perform(account.id)
+
+      expect(result).to be(true)
+      expect(account.reload.avatar_file_name).to_not be_nil
     end
   end
 end
diff --git a/spec/workers/redownload_header_worker_spec.rb b/spec/workers/redownload_header_worker_spec.rb
index 767ae7a5ab..3b6f497bb8 100644
--- a/spec/workers/redownload_header_worker_spec.rb
+++ b/spec/workers/redownload_header_worker_spec.rb
@@ -5,9 +5,48 @@ require 'rails_helper'
 describe RedownloadHeaderWorker do
   let(:worker) { described_class.new }
 
-  describe 'perform' do
-    it 'runs without error for missing record' do
-      expect { worker.perform(nil) }.to_not raise_error
+  describe '#perform' do
+    it 'returns nil for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be_nil
+    end
+
+    it 'returns nil for suspended account' do
+      account = Fabricate(:account, suspended_at: 10.days.ago)
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil with a domain block' do
+      account = Fabricate(:account, domain: 'host.example')
+      Fabricate(:domain_block, domain: account.domain, reject_media: true)
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil without an header remote url' do
+      account = Fabricate(:account, header_remote_url: '')
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'returns nil when header file name is present' do
+      stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
+      account = Fabricate(:account, header_remote_url: 'https://example.host/file', header_file_name: 'test.jpg')
+
+      expect(worker.perform(account.id)).to be_nil
+    end
+
+    it 'reprocesses a remote header' do
+      stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
+      account = Fabricate(:account, header_remote_url: 'https://example.host/file')
+      account.update_column(:header_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+
+      result = worker.perform(account.id)
+
+      expect(result).to be(true)
+      expect(account.reload.header_file_name).to_not be_nil
     end
   end
 end
diff --git a/spec/workers/redownload_media_worker_spec.rb b/spec/workers/redownload_media_worker_spec.rb
new file mode 100644
index 0000000000..cd561d148b
--- /dev/null
+++ b/spec/workers/redownload_media_worker_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe RedownloadMediaWorker do
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    it 'returns nil for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be_nil
+    end
+
+    it 'returns nil without a remote_url' do
+      media_attachment = Fabricate(:media_attachment, remote_url: '')
+
+      result = worker.perform(media_attachment.id)
+
+      expect(result).to be_nil
+    end
+
+    context 'with a valid remote url' do
+      let(:url) { 'https://example.host/file.txt' }
+
+      before { stub_request(:get, url).to_return(status: 200) }
+
+      it 'processes downloads for valid record' do
+        media_attachment = Fabricate(:media_attachment, remote_url: url)
+
+        worker.perform(media_attachment.id)
+
+        expect(a_request(:get, url)).to have_been_made
+      end
+    end
+  end
+end
diff --git a/spec/workers/removal_worker_spec.rb b/spec/workers/removal_worker_spec.rb
new file mode 100644
index 0000000000..5071e882b6
--- /dev/null
+++ b/spec/workers/removal_worker_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe RemovalWorker do
+  let(:worker) { described_class.new }
+  let(:service) { instance_double(RemoveStatusService, call: true) }
+
+  describe '#perform' do
+    before do
+      allow(RemoveStatusService).to receive(:new).and_return(service)
+    end
+
+    let(:status) { Fabricate(:status) }
+
+    it 'sends the status to the service' do
+      worker.perform(status.id)
+
+      expect(service).to have_received(:call).with(status)
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123)
+
+      expect(result).to be(true)
+    end
+  end
+end
diff --git a/spec/workers/scheduler/self_destruct_scheduler_spec.rb b/spec/workers/scheduler/self_destruct_scheduler_spec.rb
new file mode 100644
index 0000000000..2bf5783571
--- /dev/null
+++ b/spec/workers/scheduler/self_destruct_scheduler_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Scheduler::SelfDestructScheduler do
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    let!(:account) { Fabricate(:account, domain: nil, suspended_at: nil) }
+
+    context 'when not in self destruct mode' do
+      before do
+        allow(SelfDestructHelper).to receive(:self_destruct?).and_return(false)
+      end
+
+      it 'returns without processing' do
+        worker.perform
+
+        expect(account.reload.suspended_at).to be_nil
+      end
+    end
+
+    context 'when in self-destruct mode' do
+      before do
+        allow(SelfDestructHelper).to receive(:self_destruct?).and_return(true)
+      end
+
+      context 'when sidekiq is overwhelmed' do
+        before do
+          stats = instance_double(Sidekiq::Stats, enqueued: described_class::MAX_ENQUEUED**2)
+          allow(Sidekiq::Stats).to receive(:new).and_return(stats)
+        end
+
+        it 'returns without processing' do
+          worker.perform
+
+          expect(account.reload.suspended_at).to be_nil
+        end
+      end
+
+      context 'when sidekiq is operational' do
+        it 'suspends local non-suspended accounts' do
+          worker.perform
+
+          expect(account.reload.suspended_at).to_not be_nil
+        end
+
+        it 'suspends local suspended accounts marked for deletion' do
+          account.update(suspended_at: 10.days.ago)
+          deletion_request = Fabricate(:account_deletion_request, account: account)
+
+          worker.perform
+
+          expect(account.reload.suspended_at).to be > 1.day.ago
+          expect { deletion_request.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/workers/webhooks/delivery_worker_spec.rb b/spec/workers/webhooks/delivery_worker_spec.rb
index daf8a3e285..6a5483d1d4 100644
--- a/spec/workers/webhooks/delivery_worker_spec.rb
+++ b/spec/workers/webhooks/delivery_worker_spec.rb
@@ -5,9 +5,21 @@ require 'rails_helper'
 describe Webhooks::DeliveryWorker do
   let(:worker) { described_class.new }
 
-  describe 'perform' do
-    it 'runs without error' do
-      expect { worker.perform(nil, nil) }.to_not raise_error
+  describe '#perform' do
+    let(:webhook) { Fabricate(:webhook) }
+
+    it 'reprocesses and updates the webhook' do
+      stub_request(:post, webhook.url).to_return(status: 200, body: '')
+
+      worker.perform(webhook.id, 'body')
+
+      expect(a_request(:post, webhook.url)).to have_been_made.at_least_once
+    end
+
+    it 'returns true for non-existent record' do
+      result = worker.perform(123_123_123, '')
+
+      expect(result).to be(true)
     end
   end
 end
diff --git a/streaming/index.js b/streaming/index.js
index d726371818..1c12a83fe5 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -2,6 +2,7 @@
 
 const fs = require('fs');
 const http = require('http');
+const path = require('path');
 const url = require('url');
 
 const dotenv = require('dotenv');
@@ -17,8 +18,11 @@ const WebSocket = require('ws');
 
 const environment = process.env.NODE_ENV || 'development';
 
+// Correctly detect and load .env or .env.production file based on environment:
+const dotenvFile = environment === 'production' ? '.env.production' : '.env';
+
 dotenv.config({
-  path: environment === 'production' ? '.env.production' : '.env',
+  path: path.resolve(__dirname, path.join('..', dotenvFile))
 });
 
 log.level = process.env.LOG_LEVEL || 'verbose';
diff --git a/streaming/package.json b/streaming/package.json
new file mode 100644
index 0000000000..52245aeebb
--- /dev/null
+++ b/streaming/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@mastodon/streaming",
+  "license": "AGPL-3.0-or-later",
+  "packageManager": "yarn@4.0.2",
+  "engines": {
+    "node": ">=18"
+  },
+  "description": "Mastodon's Streaming Server",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mastodon/mastodon.git"
+  },
+  "scripts": {
+    "start": "node ./index.js"
+  },
+  "dependencies": {
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
+    "ioredis": "^5.3.2",
+    "jsdom": "^23.0.0",
+    "npmlog": "^7.0.1",
+    "pg": "^8.5.0",
+    "pg-connection-string": "^2.6.0",
+    "prom-client": "^15.0.0",
+    "uuid": "^9.0.0",
+    "ws": "^8.12.1"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.17",
+    "@types/npmlog": "^7.0.0",
+    "@types/pg": "^8.6.6",
+    "@types/uuid": "^9.0.0"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.7",
+    "utf-8-validate": "^6.0.3"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 5efe322df3..719aefa247 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -981,14 +981,14 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.3"
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f960faed3975c8454c52d2b5d85daf0c9a27677b248d7933882e59b10202ade2a98c7b925ce0bae2b8eb4d66eb5d63a5588c1090d54eaa4cd235533d71228ff3
+  checksum: bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b
   languageName: node
   linkType: hard
 
@@ -1200,8 +1200,8 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.3"
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.4"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -1211,7 +1211,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 111fc412cc3968402183086879e1625ad4b869309f2e5aa33498a71ba700d3196c151d506977b5b535e8ff2c42c0731d59bfbfcb158ecddeeb3c49d5d4a58c0a
+  checksum: 6ac29012550cdd10b65ec43fef0c7f43904ec458c43d597f627d8f52807413e57ea94e3986dbace576d734e67c2d09be5e43e77c72567d18f8c4ac5e19844625
   languageName: node
   linkType: hard
 
@@ -1483,11 +1483,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.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.2
-  resolution: "@babel/runtime@npm:7.23.2"
+  version: 7.23.4
+  resolution: "@babel/runtime@npm:7.23.4"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 271fcfad8574269d9967b8a1c03f2e1eab108a52ad7c96ed136eee0b11f46156f1186637bd5e79a4207163db9a00413cd70a6428e137b982d0ee8ab85eb9f438
+  checksum: db2bf183cd0119599b903ca51ca0aeea8e0ab478a16be1aae10dd90473ed614159d3e5adfdd8f8f3d840402428ce0d90b5c01aae95da9e45a2dd83e02d85ca27
   languageName: node
   linkType: hard
 
@@ -1743,10 +1743,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.53.0":
-  version: 8.53.0
-  resolution: "@eslint/js@npm:8.53.0"
-  checksum: d29f6c207b2f6dc4ef174d16a3c07b0d3a17ca3d805680496ff267edd773e3bac41db4e7dcab622ca1970d892535bd19671e2a756d4eac75e96fd8c8dcdb619b
+"@eslint/js@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@eslint/js@npm:8.54.0"
+  checksum: d61fb4a0be6af2d8cb290121c329697664a75d6255a29926d5454fb02aeb02b87112f67fdf218d10abac42f90c570ac366126751baefc5405d0e017ed0c946c5
   languageName: node
   linkType: hard
 
@@ -1777,8 +1777,8 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.3
-  resolution: "@formatjs/cli@npm:6.2.3"
+  version: 6.2.4
+  resolution: "@formatjs/cli@npm:6.2.4"
   peerDependencies:
     vue: ^3.3.4
   peerDependenciesMeta:
@@ -1786,17 +1786,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 91eada7676333e2e647cbfbf9c0da88e4ca52e7b486dca73a7299594b0b0dea99de00e1b4110fac993633feb4bf5f26c97885b1a870dfd0ef95688d7f3234a03
-  languageName: node
-  linkType: hard
-
-"@formatjs/ecma402-abstract@npm:1.17.4":
-  version: 1.17.4
-  resolution: "@formatjs/ecma402-abstract@npm:1.17.4"
-  dependencies:
-    "@formatjs/intl-localematcher": "npm:0.5.1"
-    tslib: "npm:^2.4.0"
-  checksum: c24bf58cd3152ad64a29dfab185d1fde91e44423aabb041f332216b37a23256618efee1e252c0015e735bc688708ee279348e2a4a67a77f6cf918028848ef071
+  checksum: 3f6bbbc633a3a6ebd4e6fcfc3a9f889bc044043452cbc8f81abcaee97aaef991a778ae785d3b9d21ecc5f55b147eb0009b44520bb895fe244b4c14a36d9b05bd
   languageName: node
   linkType: hard
 
@@ -1819,17 +1809,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.2":
-  version: 2.7.2
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.2"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.17.4"
-    "@formatjs/icu-skeleton-parser": "npm:1.6.4"
-    tslib: "npm:^2.4.0"
-  checksum: c7a2f7daecec9ba36acda2c5b7ef21f515883b886d4d9965d83c93bc55fc604f56c1097d4641608633c32917aaa0b9b0c65c0d162723428249dc29271270a064
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-messageformat-parser@npm:2.7.3":
   version: 2.7.3
   resolution: "@formatjs/icu-messageformat-parser@npm:2.7.3"
@@ -1841,16 +1820,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.6.4":
-  version: 1.6.4
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.6.4"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.17.4"
-    tslib: "npm:^2.4.0"
-  checksum: 3688aad6d12fe677ef0ce3d6a3424c5bde9ed223dc49841de8dd33c547bdd2858f8bce4437fcc135048b4f92385374776ab48e39b3cc5063a45bdb1ce85ad2d4
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-skeleton-parser@npm:1.7.0":
   version: 1.7.0
   resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
@@ -1883,15 +1852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.5.1":
-  version: 0.5.1
-  resolution: "@formatjs/intl-localematcher@npm:0.5.1"
-  dependencies:
-    tslib: "npm:^2.4.0"
-  checksum: 2282db3e623d3f65681b6a2a2dbffc4f948b8411789f51af1b221610105f809ebec7f58f9afd5008e72c62ed5524c8c321f85c78cab0cffb632e20c0064b701b
-  languageName: node
-  linkType: hard
-
 "@formatjs/intl-localematcher@npm:0.5.2":
   version: 0.5.2
   resolution: "@formatjs/intl-localematcher@npm:0.5.2"
@@ -1932,26 +1892,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.8":
-  version: 3.13.8
-  resolution: "@formatjs/ts-transformer@npm:3.13.8"
-  dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.2"
-    "@types/json-stable-stringify": "npm:^1.0.32"
-    "@types/node": "npm:14 || 16 || 17"
-    chalk: "npm:^4.0.0"
-    json-stable-stringify: "npm:^1.0.1"
-    tslib: "npm:^2.4.0"
-    typescript: "npm:5"
-  peerDependencies:
-    ts-jest: ">=27"
-  peerDependenciesMeta:
-    ts-jest:
-      optional: true
-  checksum: 32b13b75732739ca016d9d654e5f40077cafa3ff2f924fbb5fd91155cd6af3292c5fee9be022bb224fb69d2ab60ed9cdda49ee83fbf9e1e8de470ee33ceae4f3
-  languageName: node
-  linkType: hard
-
 "@formatjs/ts-transformer@npm:3.13.9":
   version: 3.13.9
   resolution: "@formatjs/ts-transformer@npm:3.13.9"
@@ -2368,23 +2308,20 @@ __metadata:
     "@types/babel__core": "npm:^7.20.1"
     "@types/emoji-mart": "npm:^3.0.9"
     "@types/escape-html": "npm:^1.0.2"
-    "@types/express": "npm:^4.17.17"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/http-link-header": "npm:^1.0.3"
     "@types/intl": "npm:^1.2.0"
     "@types/jest": "npm:^29.5.2"
     "@types/js-yaml": "npm:^4.0.5"
     "@types/lodash": "npm:^4.14.195"
-    "@types/npmlog": "npm:^4.1.4"
     "@types/object-assign": "npm:^4.0.30"
-    "@types/pg": "npm:^8.6.6"
     "@types/prop-types": "npm:^15.7.5"
     "@types/punycode": "npm:^2.1.0"
     "@types/react": "npm:^18.2.7"
     "@types/react-dom": "npm:^18.2.4"
     "@types/react-helmet": "npm:^6.1.6"
     "@types/react-immutable-proptypes": "npm:^2.1.0"
-    "@types/react-motion": "npm:^0.0.37"
+    "@types/react-motion": "npm:^0.0.39"
     "@types/react-overlays": "npm:^3.1.0"
     "@types/react-router": "npm:^5.1.20"
     "@types/react-router-dom": "npm:^5.3.3"
@@ -2396,7 +2333,6 @@ __metadata:
     "@types/react-toggle": "npm:^4.0.3"
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
-    "@types/uuid": "npm:^9.0.0"
     "@types/webpack": "npm:^4.41.33"
     "@types/yargs": "npm:^17.0.24"
     "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
@@ -2413,7 +2349,6 @@ __metadata:
     babel-plugin-preval: "npm:^5.1.0"
     babel-plugin-transform-react-remove-prop-types: "npm:^0.4.24"
     blurhash: "npm:^2.0.5"
-    bufferutil: "npm:^4.0.7"
     circular-dependency-plugin: "npm:^5.2.2"
     classnames: "npm:^2.3.2"
     cocoon-js-vanilla: "npm:^1.3.0"
@@ -2424,7 +2359,6 @@ __metadata:
     css-loader: "npm:^5.2.7"
     cssnano: "npm:^6.0.1"
     detect-passive-events: "npm:^2.0.3"
-    dotenv: "npm:^16.0.3"
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     escape-html: "npm:^1.0.3"
     eslint: "npm:^8.41.0"
@@ -2439,7 +2373,6 @@ __metadata:
     eslint-plugin-react: "npm:~7.33.0"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     exif-js: "npm:^2.3.0"
-    express: "npm:^4.18.2"
     favico.js: "npm:^0.3.10"
     file-loader: "npm:^6.2.0"
     font-awesome: "npm:^4.7.0"
@@ -2452,25 +2385,19 @@ __metadata:
     immutable: "npm:^4.3.0"
     imports-loader: "npm:^1.2.0"
     intl-messageformat: "npm:^10.3.5"
-    ioredis: "npm:^5.3.2"
     jest: "npm:^29.5.0"
     jest-environment-jsdom: "npm:^29.5.0"
     js-yaml: "npm:^4.1.0"
-    jsdom: "npm:^22.1.0"
     lint-staged: "npm:^15.0.0"
     lodash: "npm:^4.17.21"
     mark-loader: "npm:^0.1.6"
     marky: "npm:^1.2.5"
     mini-css-extract-plugin: "npm:^1.6.2"
     mkdirp: "npm:^3.0.1"
-    npmlog: "npm:^7.0.1"
     path-complete-extname: "npm:^1.0.0"
-    pg: "npm:^8.5.0"
-    pg-connection-string: "npm:^2.6.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
     prettier: "npm:^3.0.0"
-    prom-client: "npm:^15.0.0"
     prop-types: "npm:^15.8.1"
     punycode: "npm:^2.3.0"
     react: "npm:^18.2.0"
@@ -2514,8 +2441,6 @@ __metadata:
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:^5.0.4"
-    utf-8-validate: "npm:^6.0.3"
-    uuid: "npm:^9.0.0"
     webpack: "npm:^4.47.0"
     webpack-assets-manifest: "npm:^4.0.6"
     webpack-bundle-analyzer: "npm:^4.8.0"
@@ -2529,13 +2454,7 @@ __metadata:
     workbox-strategies: "npm:^7.0.0"
     workbox-webpack-plugin: "npm:^7.0.0"
     workbox-window: "npm:^7.0.0"
-    ws: "npm:^8.12.1"
     yargs: "npm:^17.7.2"
-  dependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
   peerDependenciesMeta:
     react:
       optional: true
@@ -2546,10 +2465,38 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@mastodon/streaming@workspace:streaming":
+  version: 0.0.0-use.local
+  resolution: "@mastodon/streaming@workspace:streaming"
+  dependencies:
+    "@types/express": "npm:^4.17.17"
+    "@types/npmlog": "npm:^7.0.0"
+    "@types/pg": "npm:^8.6.6"
+    "@types/uuid": "npm:^9.0.0"
+    bufferutil: "npm:^4.0.7"
+    dotenv: "npm:^16.0.3"
+    express: "npm:^4.18.2"
+    ioredis: "npm:^5.3.2"
+    jsdom: "npm:^23.0.0"
+    npmlog: "npm:^7.0.1"
+    pg: "npm:^8.5.0"
+    pg-connection-string: "npm:^2.6.0"
+    prom-client: "npm:^15.0.0"
+    utf-8-validate: "npm:^6.0.3"
+    uuid: "npm:^9.0.0"
+    ws: "npm:^8.12.1"
+  dependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  languageName: unknown
+  linkType: soft
+
 "@material-symbols/svg-600@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@material-symbols/svg-600@npm:0.14.0"
-  checksum: e6547a9a0b2072f4109f2e4e0863367ea2507efce740c427a8544100db02ffff52f33608aac1a355f4977e2c0b2ce6cdd6bfee9177bb13cee0b28418f948b5a5
+  version: 0.14.1
+  resolution: "@material-symbols/svg-600@npm:0.14.1"
+  checksum: fb5252285bbeccc45a4b131e8b165470b5b57e146bc7ea586eb82e580037d1218f6dad5fee4e6822c357041ff547f34c9c7432cce0a811b14f7e41d8ae23009b
   languageName: node
   linkType: hard
 
@@ -2975,8 +2922,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/react@npm:^14.0.0":
-  version: 14.1.0
-  resolution: "@testing-library/react@npm:14.1.0"
+  version: 14.1.2
+  resolution: "@testing-library/react@npm:14.1.2"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@testing-library/dom": "npm:^9.0.0"
@@ -2984,7 +2931,7 @@ __metadata:
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 357ad80b11bdd4b6d10d2fb1bf86d5b39fb457cf09293033cf42bcc7a95738a86a2b12b760ae15bad326da0b9c074ca015d2bbf0baae7da38fdbc7c808925820
+  checksum: b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
   languageName: node
   linkType: hard
 
@@ -3010,15 +2957,15 @@ __metadata:
   linkType: hard
 
 "@types/babel__core@npm:*, @types/babel__core@npm:^7.1.12, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7, @types/babel__core@npm:^7.20.1":
-  version: 7.20.4
-  resolution: "@types/babel__core@npm:7.20.4"
+  version: 7.20.5
+  resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
     "@babel/parser": "npm:^7.20.7"
     "@babel/types": "npm:^7.20.7"
     "@types/babel__generator": "npm:*"
     "@types/babel__template": "npm:*"
     "@types/babel__traverse": "npm:*"
-  checksum: 2adc7ec49de5f922271ce087cedee000de468a3e13f92b7b6254016bd8357298cb98e6d2b3c9defc69bb6e38e0c134ffe80776a8ce4e9fb167bbffcb4d7613b7
+  checksum: bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
   languageName: node
   linkType: hard
 
@@ -3060,30 +3007,30 @@ __metadata:
   linkType: hard
 
 "@types/body-parser@npm:*":
-  version: 1.19.4
-  resolution: "@types/body-parser@npm:1.19.4"
+  version: 1.19.5
+  resolution: "@types/body-parser@npm:1.19.5"
   dependencies:
     "@types/connect": "npm:*"
     "@types/node": "npm:*"
-  checksum: bec2b8a97861a960ee415f7ab3c2aeb7f4d779fd364d27ddee46057897ea571735f1f854f5ee41682964315d4e3699f62427998b9c21851d773398ef535f0612
+  checksum: aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
   languageName: node
   linkType: hard
 
 "@types/connect@npm:*":
-  version: 3.4.37
-  resolution: "@types/connect@npm:3.4.37"
+  version: 3.4.38
+  resolution: "@types/connect@npm:3.4.38"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 79fd5c32a8bb5c9548369e6da3221b6a820f3a8c5396d50f6f642712b9f4c1c881ef86bdf48994a4a279e81998563410b8843c5a10dde5521d5ef6a8ae944c3b
+  checksum: 2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
   languageName: node
   linkType: hard
 
 "@types/emoji-mart@npm:^3.0.9":
-  version: 3.0.12
-  resolution: "@types/emoji-mart@npm:3.0.12"
+  version: 3.0.13
+  resolution: "@types/emoji-mart@npm:3.0.13"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 146abafe3ce9f4954c7f6ed3603bdc5a897b2d6b99dd9da6065ef597a9a6a59fb914e907decbda29b661216ddf3da8bb34a28d50f3d6929efce2b3c42e73b085
+  checksum: 840f920c3242e1d274f0102e67cb2d00434e1fd370e0bcc8983b43b6b62322b01e3ddcd5fb078c60883e613530a7c70b8c40060624897543cd4da9441ca81486
   languageName: node
   linkType: hard
 
@@ -3119,14 +3066,14 @@ __metadata:
   linkType: hard
 
 "@types/express-serve-static-core@npm:^4.17.33":
-  version: 4.17.39
-  resolution: "@types/express-serve-static-core@npm:4.17.39"
+  version: 4.17.41
+  resolution: "@types/express-serve-static-core@npm:4.17.41"
   dependencies:
     "@types/node": "npm:*"
     "@types/qs": "npm:*"
     "@types/range-parser": "npm:*"
     "@types/send": "npm:*"
-  checksum: b23b005fddd2ba3f7142ec9713f06b5582c7712cdf99c3419d3972364903b348a103c3264d9a761d6497140e3b89bd416454684c4bdeff206b4c59b86e96428a
+  checksum: dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
   languageName: node
   linkType: hard
 
@@ -3179,9 +3126,9 @@ __metadata:
   linkType: hard
 
 "@types/http-errors@npm:*":
-  version: 2.0.3
-  resolution: "@types/http-errors@npm:2.0.3"
-  checksum: 717ce3e8f49a1facb7130fed934108fa8a51ab02089a1049c782e353e0e08e79bdfaac054c2a94db14ea400302e523276387363aa820eaf0031af8ba5d2941dc
+  version: 2.0.4
+  resolution: "@types/http-errors@npm:2.0.4"
+  checksum: 494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
   languageName: node
   linkType: hard
 
@@ -3227,12 +3174,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:^29.5.2":
-  version: 29.5.8
-  resolution: "@types/jest@npm:29.5.8"
+  version: 29.5.10
+  resolution: "@types/jest@npm:29.5.10"
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: a28e7827ea7e1a2aace6a386868fa6b8402c162d6c71570aed2c29d3745ddc22ceef6899a20643071817905d3c57b670a7992fc8760bff65939351fd4dc481cf
+  checksum: b46171d59d12a5f69bbe710f65eaf59a8073337c6b4a67dff8158575caec53f1c61f8a7d645b34d6ac3c4ea398acd30f0c5d1c4a131c0c918798019264a3397d
   languageName: node
   linkType: hard
 
@@ -3276,23 +3223,23 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.14.201
-  resolution: "@types/lodash@npm:4.14.201"
-  checksum: 14dc43787296c429433d7d034ed47c5ac24b92217056f80a0e6c990449120b9c9c1058918188945fb88353c0c8333c5c36dccc40c51edbd39b05d2169ab2e0ad
+  version: 4.14.202
+  resolution: "@types/lodash@npm:4.14.202"
+  checksum: 6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
   languageName: node
   linkType: hard
 
 "@types/mime@npm:*":
-  version: 3.0.3
-  resolution: "@types/mime@npm:3.0.3"
-  checksum: cef99f8cdc42af9de698027c2a20ba5df12bc9a89dcf5513e70103ebb55e00c5f5c585d02411f4b42fde0e78488342f1b1d3e3546a59a3da42e95fdc616e01eb
+  version: 3.0.4
+  resolution: "@types/mime@npm:3.0.4"
+  checksum: db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
   languageName: node
   linkType: hard
 
 "@types/mime@npm:^1":
-  version: 1.3.4
-  resolution: "@types/mime@npm:1.3.4"
-  checksum: a0a16d26c0e70a1b133e26e7c46b70b3136b7e894396bdb7de1c642f4ac87fdbbba26bf56cf73f001312289d89de4f1c06ab745d9445850df45a5a802564c4d6
+  version: 1.3.5
+  resolution: "@types/mime@npm:1.3.5"
+  checksum: c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
   languageName: node
   linkType: hard
 
@@ -3333,12 +3280,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/npmlog@npm:^4.1.4":
-  version: 4.1.6
-  resolution: "@types/npmlog@npm:4.1.6"
+"@types/npmlog@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@types/npmlog@npm:7.0.0"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 432bfb14b29a383e095e099b2ddff4266051b43bc6c7ea242d10194acde2f1181a1e967bbb543f07979dd77743ead1954abac1128ec78cc2b86a5f7ea841ddcb
+  checksum: e94cb1d7dc6b1251d58d0a3cbf0c5b9e9b7c7649774cf816b9277fc10e1a09e65f2854357c4972d04d477f8beca3c8accb5e8546d594776e59e35ddfee79aff2
   languageName: node
   linkType: hard
 
@@ -3375,16 +3322,16 @@ __metadata:
   linkType: hard
 
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
-  version: 15.7.10
-  resolution: "@types/prop-types@npm:15.7.10"
-  checksum: 964348d05cdf7399260b3179fbd1462b23d7452dc39fbccb319e54ed6ffafb0a01c0a62c3e6f7c944a635c7a4ad5c99d62c4787c9c4b74e2ec07aebaf6cfedc1
+  version: 15.7.11
+  resolution: "@types/prop-types@npm:15.7.11"
+  checksum: e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132
   languageName: node
   linkType: hard
 
 "@types/punycode@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@types/punycode@npm:2.1.2"
-  checksum: 4a748533bde61097f205638b3acc2c3b0e25382d2c35a2e3b60c33c904afbad158ef778ae3e1b3f3c84edd7b04b6d9fa049f2832210c308d3fee77ba7b637cb9
+  version: 2.1.3
+  resolution: "@types/punycode@npm:2.1.3"
+  checksum: c4babd33d0ed010017bc2d44a15b322b1e2997b9bb335020c26a58ac855e176d337536fa0ca84aa1b0c6d7008799566d4d5430a083d123ac6bbcc59c451b9cfc
   languageName: node
   linkType: hard
 
@@ -3396,25 +3343,25 @@ __metadata:
   linkType: hard
 
 "@types/qs@npm:*":
-  version: 6.9.9
-  resolution: "@types/qs@npm:6.9.9"
-  checksum: aede2a4181a49ae8548a1354bac3f8235cb0c5aab066b10875a3e68e88a199e220f4284e7e2bb75a3c18e5d4ff6abe1a6ce0389ef31b63952cc45e0f4d885ba0
+  version: 6.9.10
+  resolution: "@types/qs@npm:6.9.10"
+  checksum: 6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
   languageName: node
   linkType: hard
 
 "@types/range-parser@npm:*":
-  version: 1.2.6
-  resolution: "@types/range-parser@npm:1.2.6"
-  checksum: 46e7fffc54cdacc8fb0cd576f8f9a6436453f0176205d6ec55434a460c7677e78e688673426d5db5e480501b2943ba08a16ececa3a354c222093551c7217fb8f
+  version: 1.2.7
+  resolution: "@types/range-parser@npm:1.2.7"
+  checksum: 361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
   languageName: node
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.15
-  resolution: "@types/react-dom@npm:18.2.15"
+  version: 18.2.17
+  resolution: "@types/react-dom@npm:18.2.17"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 70e86f15f69f89b8f179139ab2e8a8aa9765e742789f5dd5a46fec40d4300ada8fe3349cceda42b9964a018982d7ccb7d791b47f781966c992bfd37da909fbd3
+  checksum: 33b53078ed7e9e0cfc4dc691e938f7db1cc06353bc345947b41b581c3efe2b980c9e4eb6460dbf5ddc521dd91959194c970221a2bd4bfad9d23ebce338e12938
   languageName: node
   linkType: hard
 
@@ -3437,12 +3384,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-motion@npm:^0.0.37":
-  version: 0.0.37
-  resolution: "@types/react-motion@npm:0.0.37"
+"@types/react-motion@npm:^0.0.39":
+  version: 0.0.39
+  resolution: "@types/react-motion@npm:0.0.39"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 387f60636d9bdd2e765ce94db969cf762a62495e32807f88380748a74e9beeb3d8e17c3ec334dab8040244ea62e7954d5f4d4bdbdd0ecc8985eb4a6ce465b61c
+  checksum: 0dfcde777576b3c3289b4dbf2a5085decf71aba6d543697f4c1069d02ed3b543792a253692bd98870af04112c92469328a4fdb93988f93af2e099de8f2c9bc2e
   languageName: node
   linkType: hard
 
@@ -3504,11 +3451,11 @@ __metadata:
   linkType: hard
 
 "@types/react-test-renderer@npm:^18.0.0":
-  version: 18.0.6
-  resolution: "@types/react-test-renderer@npm:18.0.6"
+  version: 18.0.7
+  resolution: "@types/react-test-renderer@npm:18.0.7"
   dependencies:
     "@types/react": "npm:*"
-  checksum: f490d4379e8d095f8fa91700ceb37d0fe5a96d7cc0c51e9d7127fc3d2dc4e37a382dd6215b295b300037985cb8938cb5088130102ad14b79e4622e7e520c5a3b
+  checksum: 45cbe963354acee2ab090979d856763c84f59ef7b63477d1fef5d0fd52760b69aa67bbd205fbd3bd36264620fce72c8e407735a9f2009c40ca50da59b0058c34
   languageName: node
   linkType: hard
 
@@ -3540,13 +3487,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.37
-  resolution: "@types/react@npm:18.2.37"
+  version: 18.2.38
+  resolution: "@types/react@npm:18.2.38"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 79dd5d23da05bec54e7423ca17096e345eb8fd80a3bf8dd916bb5cdd60677d27c298523aa5b245d090fcc4ec100cfd58c1af4631fbac709d0a9d8be75f9d78a9
+  checksum: 56edd4756081b677e38ee23ad6d340658c5e2468785cb20968318cec357e1ea7ccf3ecd9534981741192dd1b894200acfaf0f1551b4795c6077668f6afc19345
   languageName: node
   linkType: hard
 
@@ -3591,23 +3538,23 @@ __metadata:
   linkType: hard
 
 "@types/send@npm:*":
-  version: 0.17.3
-  resolution: "@types/send@npm:0.17.3"
+  version: 0.17.4
+  resolution: "@types/send@npm:0.17.4"
   dependencies:
     "@types/mime": "npm:^1"
     "@types/node": "npm:*"
-  checksum: 773a0cb55ea03eefbe9a0e6d42114e0f84968db30954a131aae9ba7e9ab984a4776915447ebdeab4412d7f11750126614b0b75e99413f75810045bdb3196554a
+  checksum: 7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
   languageName: node
   linkType: hard
 
 "@types/serve-static@npm:*":
-  version: 1.15.4
-  resolution: "@types/serve-static@npm:1.15.4"
+  version: 1.15.5
+  resolution: "@types/serve-static@npm:1.15.5"
   dependencies:
     "@types/http-errors": "npm:*"
     "@types/mime": "npm:*"
     "@types/node": "npm:*"
-  checksum: 061b38993bf8f2b5033f57147c8ec90e1d1a0d6f734958ceb531ba7cc31192fd272c999cdbc57ede8672787e3aa171ec142dc65a467c04078e43823e7476eb49
+  checksum: 811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
   languageName: node
   linkType: hard
 
@@ -3688,8 +3635,8 @@ __metadata:
   linkType: hard
 
 "@types/webpack@npm:^4.41.33":
-  version: 4.41.36
-  resolution: "@types/webpack@npm:4.41.36"
+  version: 4.41.38
+  resolution: "@types/webpack@npm:4.41.38"
   dependencies:
     "@types/node": "npm:*"
     "@types/tapable": "npm:^1"
@@ -3697,7 +3644,7 @@ __metadata:
     "@types/webpack-sources": "npm:*"
     anymatch: "npm:^3.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 9e9021049b8f7482ec7c45e95d7c1da3604ee04481d7550421ed58f201f66edb8eb6c26b85be94ce3f761874cdbb8b570827becdaf5acdb1897aba9b7f226252
+  checksum: 5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
   languageName: node
   linkType: hard
 
@@ -3709,23 +3656,23 @@ __metadata:
   linkType: hard
 
 "@types/yargs@npm:^17.0.24, @types/yargs@npm:^17.0.8":
-  version: 17.0.31
-  resolution: "@types/yargs@npm:17.0.31"
+  version: 17.0.32
+  resolution: "@types/yargs@npm:17.0.32"
   dependencies:
     "@types/yargs-parser": "npm:*"
-  checksum: 1e04df99bd0ad8ac8b3748b6ac0e99a9a4efe20b9cd8eab69ac9503fe87ab9bec312ad56982e969cdb0e2c0679431434ad571f6934049adb15fa35b22810c867
+  checksum: 2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
   languageName: node
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.10.0"
+  version: 6.11.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.11.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.10.0"
-    "@typescript-eslint/type-utils": "npm:6.10.0"
-    "@typescript-eslint/utils": "npm:6.10.0"
-    "@typescript-eslint/visitor-keys": "npm:6.10.0"
+    "@typescript-eslint/scope-manager": "npm:6.11.0"
+    "@typescript-eslint/type-utils": "npm:6.11.0"
+    "@typescript-eslint/utils": "npm:6.11.0"
+    "@typescript-eslint/visitor-keys": "npm:6.11.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3738,44 +3685,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: f50b17cb753afbfc99549d38585eba8558949b977eb4661dd584e73ee946b3dbe944c9e3b12a233fa06b5e1c7d101730ac88a00c7a91b0a7f1e2c37a98e13c7a
+  checksum: 6645aa09b9d51c5e3ea781eaf74da75b94f83f3e2d7b3dd988d5ce7eb82dd87e3509471cf2ee8c6b2428d907df5f1b02f29dbd04f54c2653f9566c8c4ce98009
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/parser@npm:6.10.0"
+  version: 6.11.0
+  resolution: "@typescript-eslint/parser@npm:6.11.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.10.0"
-    "@typescript-eslint/types": "npm:6.10.0"
-    "@typescript-eslint/typescript-estree": "npm:6.10.0"
-    "@typescript-eslint/visitor-keys": "npm:6.10.0"
+    "@typescript-eslint/scope-manager": "npm:6.11.0"
+    "@typescript-eslint/types": "npm:6.11.0"
+    "@typescript-eslint/typescript-estree": "npm:6.11.0"
+    "@typescript-eslint/visitor-keys": "npm:6.11.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: fd86c31dfdde03636393a3a9cf16716856bb506923069f34d87af14fac363a33578f47476a15d272e4d7a764de00fd905ee11361cc06b81b302a9fa8ebe4c23c
+  checksum: e7caeb20069102e21f468fc0dbe7ff6fb6b1efa9e72f4c9f39d4a865ed0633f39130b593ef9ae8f394ca1d70563e15410faf30a482a97809951eaac6ed3a67da
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.10.0"
+"@typescript-eslint/scope-manager@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.10.0"
-    "@typescript-eslint/visitor-keys": "npm:6.10.0"
-  checksum: a5fbee770d763852a7f426b950d495529139f1629fdcb30136c93f787acd82236db4272f78dff1d05a3a10a6406472ae95ae94ab75cfb618a06d75b8cc536cbf
+    "@typescript-eslint/types": "npm:6.11.0"
+    "@typescript-eslint/visitor-keys": "npm:6.11.0"
+  checksum: d8999e2d1a4cbde8a79df5e3ec416f0e3db9532d39f2f4bb5a0ebdf954ae75c183d3277579ba05268fe2c88e88ef87f0fa12f02bb8d95d9e67d92e411241f3a3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/type-utils@npm:6.10.0"
+"@typescript-eslint/type-utils@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/type-utils@npm:6.11.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.10.0"
-    "@typescript-eslint/utils": "npm:6.10.0"
+    "@typescript-eslint/typescript-estree": "npm:6.11.0"
+    "@typescript-eslint/utils": "npm:6.11.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3783,23 +3730,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: f7c425d4da4d53d78b3d6630216dc1f2809f8dcaed62dc3cf12252102a53103a2aa39a160b310ca1cedebf87b8c339013be0c2360710c7c836b775374730c10e
+  checksum: ff68f2e052b8d688f1dc1a0050746704c8e0ab6263b47f1f52da73a7d251678e4950af23a95e1cd8e3fcea2457e6e5294ddbe01d29dafa2fdfb5b11ed9452a3f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/types@npm:6.10.0"
-  checksum: 30f47de625405b3729db6d26a0376d98628bd966c70ca01fab1adcef91bba810d27ce643d844e42d1cc77bb2c6277e62efe278a090da63ba748dfe5710c4757b
+"@typescript-eslint/types@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/types@npm:6.11.0"
+  checksum: 23182813db39a5e9b9bcc1e85306c953f7b8b22d3885e41fcac0bd725c170fbcb70f4ce55633678cc5921dcf062fa0e55635eb39480c118a4411a00354820223
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.10.0"
+"@typescript-eslint/typescript-estree@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.10.0"
-    "@typescript-eslint/visitor-keys": "npm:6.10.0"
+    "@typescript-eslint/types": "npm:6.11.0"
+    "@typescript-eslint/visitor-keys": "npm:6.11.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3808,34 +3755,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ca28ca5a55e2d431c649ad093e4a4302f2b37c430bbeebbe622b05c727fd14dab136aead5a96848499d3ff4d187889733f8871b8dd5205d19bed4a260ad74544
+  checksum: 3e183e554e1bc74f065da3015f7137eb40c262f989c547701b1e3f4f20134e574e56b749288cd00d77b9d1ddb705546613c2457661ffc63b6060ffa97ba3aac8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.10.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/utils@npm:6.10.0"
+"@typescript-eslint/utils@npm:6.11.0, @typescript-eslint/utils@npm:^6.5.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/utils@npm:6.11.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.10.0"
-    "@typescript-eslint/types": "npm:6.10.0"
-    "@typescript-eslint/typescript-estree": "npm:6.10.0"
+    "@typescript-eslint/scope-manager": "npm:6.11.0"
+    "@typescript-eslint/types": "npm:6.11.0"
+    "@typescript-eslint/typescript-estree": "npm:6.11.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 809a1d08b154f76ed7a99edddf872369f6ed93987cea19a18cb9f12b8390bddcff9138d9d94955545da54488d59e0001054bec13baf6d858a1761b059480b887
+  checksum: c91eb4578607959acc2b43ddc791571682e45601a19b25d5d120786ed4af607656f83c5c1fa71972e549ddfb5542acf2f7d443ae93b32ee28192c22c106b8883
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.10.0"
+"@typescript-eslint/visitor-keys@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.11.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.10.0"
+    "@typescript-eslint/types": "npm:6.11.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: f9223c148655ce00bb17db8aa92ee964e62c75d15095893e0b4d653c60a4033f456329b06de3eab4b404d8df359904f0dd6e3c8c842885c6d130e28ccd95ce03
+  checksum: 5f48329422b7f286196661d39e93e9defd7c5cf80e6c84c8d03459853f5d9f86a5e91c5e80ea572dcdb907ebbe503bbcc77aeb8b468c294b2aa7b3ccfc81cb88
   languageName: node
   linkType: hard
 
@@ -4694,13 +4641,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.1
-  resolution: "axios@npm:1.6.1"
+  version: 1.6.2
+  resolution: "axios@npm:1.6.2"
   dependencies:
     follow-redirects: "npm:^1.15.0"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: ca2c6f56659a7f19e4a99082f549fe151952f6fd8aa72ed148559ab2d6a32ce37cd5dc72ce6d4d3cd91f0c1e2617c7c95c20077e5e244a79f319a6c0ce41204f
+  checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d
   languageName: node
   linkType: hard
 
@@ -6003,9 +5950,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.33.2
-  resolution: "core-js@npm:3.33.2"
-  checksum: d6a56ad3e134846c805ce936788dd58cb51e861f173ed1f830979735d7865ea6f6a5a437076c36c8d8b842ba0384d052998f160774a8da7712f0f51df60167fe
+  version: 3.33.3
+  resolution: "core-js@npm:3.33.3"
+  checksum: 08abdc9470c8228b9d09f61e62ab312738681202c4c34e9638889125b304b235f34c4fe22e9d41c20906ac0fcc807dca57c5ff7d6b90021bf64e8fe23461d9ab
   languageName: node
   linkType: hard
 
@@ -6430,14 +6377,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "data-urls@npm:4.0.0"
+"data-urls@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "data-urls@npm:5.0.0"
   dependencies:
-    abab: "npm:^2.0.6"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^12.0.0"
-  checksum: 928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766
+    whatwg-mimetype: "npm:^4.0.0"
+    whatwg-url: "npm:^14.0.0"
+  checksum: 1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+  languageName: node
+  linkType: hard
+
+"debounce@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "debounce@npm:1.2.1"
+  checksum: 6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
   languageName: node
   linkType: hard
 
@@ -7402,11 +7355,11 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.11.2
-  resolution: "eslint-plugin-formatjs@npm:4.11.2"
+  version: 4.11.3
+  resolution: "eslint-plugin-formatjs@npm:4.11.3"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.2"
-    "@formatjs/ts-transformer": "npm:3.13.8"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+    "@formatjs/ts-transformer": "npm:3.13.9"
     "@types/eslint": "npm:7 || 8"
     "@types/picomatch": "npm:^2.3.0"
     "@typescript-eslint/utils": "npm:^6.5.0"
@@ -7418,7 +7371,7 @@ __metadata:
     unicode-emoji-utils: "npm:^1.1.1"
   peerDependencies:
     eslint: 7 || 8
-  checksum: f5a6bffd9c65b9ce765be74d384618e543388720036b070d69d93c00b8c2bfded543141affc7793bf402f2c9177e2bbc395a7d1e8b806a40bfde1744c282a13c
+  checksum: 66481e0b5af5738bdb2b164ac1c74216c5c26f7c7400456a58387e71424bb30554aef39da43ce29bfd551f7dad678818d9af029022edadc4e1024349339f6984
   languageName: node
   linkType: hard
 
@@ -7585,13 +7538,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.53.0
-  resolution: "eslint@npm:8.53.0"
+  version: 8.54.0
+  resolution: "eslint@npm:8.54.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.3"
-    "@eslint/js": "npm:8.53.0"
+    "@eslint/js": "npm:8.54.0"
     "@humanwhocodes/config-array": "npm:^0.11.13"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -7628,7 +7581,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: c5cd0049488c0463dab7d97466767ca5a1d0b3b59d0a223122683dc8039ecea30b27867fb9e38906b4c1ab9d09ece8a802a6c540d8905016f1cc4b4bb27329af
+  checksum: 4f205f832bdbd0218cde374b067791f4f76d7abe8de86b2dc849c273899051126d912ebf71531ee49b8eeaa22cad77febdc8f2876698dc2a76e84a8cb976af22
   languageName: node
   linkType: hard
 
@@ -8921,6 +8874,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "html-encoding-sniffer@npm:4.0.0"
+  dependencies:
+    whatwg-encoding: "npm:^3.1.1"
+  checksum: 523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140
+  languageName: node
+  linkType: hard
+
 "html-entities@npm:^1.3.1":
   version: 1.4.0
   resolution: "html-entities@npm:1.4.0"
@@ -8928,7 +8890,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-escaper@npm:^2.0.0":
+"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
   version: 2.0.2
   resolution: "html-escaper@npm:2.0.2"
   checksum: 208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
@@ -9056,7 +9018,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1":
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
   version: 7.0.2
   resolution: "https-proxy-agent@npm:7.0.2"
   dependencies:
@@ -10674,39 +10636,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^22.1.0":
-  version: 22.1.0
-  resolution: "jsdom@npm:22.1.0"
+"jsdom@npm:^23.0.0":
+  version: 23.0.0
+  resolution: "jsdom@npm:23.0.0"
   dependencies:
-    abab: "npm:^2.0.6"
     cssstyle: "npm:^3.0.0"
-    data-urls: "npm:^4.0.0"
+    data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
-    domexception: "npm:^4.0.0"
     form-data: "npm:^4.0.0"
-    html-encoding-sniffer: "npm:^3.0.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.1"
+    html-encoding-sniffer: "npm:^4.0.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.2"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.4"
+    nwsapi: "npm:^2.2.7"
     parse5: "npm:^7.1.2"
     rrweb-cssom: "npm:^0.6.0"
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^4.1.2"
-    w3c-xmlserializer: "npm:^4.0.0"
+    tough-cookie: "npm:^4.1.3"
+    w3c-xmlserializer: "npm:^5.0.0"
     webidl-conversions: "npm:^7.0.0"
-    whatwg-encoding: "npm:^2.0.0"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^12.0.1"
-    ws: "npm:^8.13.0"
-    xml-name-validator: "npm:^4.0.0"
+    whatwg-encoding: "npm:^3.1.1"
+    whatwg-mimetype: "npm:^4.0.0"
+    whatwg-url: "npm:^14.0.0"
+    ws: "npm:^8.14.2"
+    xml-name-validator: "npm:^5.0.0"
   peerDependencies:
-    canvas: ^2.5.0
+    canvas: ^3.0.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d
+  checksum: 2c876a02de49e0ed6b667a4eb9b08b8e76ac189a5571ff97791cc9564e713259314deea6d657cc7f59fc30af41b900e7d833c95017e576dfcaf25f32565722af
   languageName: node
   linkType: hard
 
@@ -11057,20 +11017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.escape@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "lodash.escape@npm:4.0.1"
-  checksum: 90ade409cec05b6869090476952fdfb84d4d87b1ff4a0e03ebd590f980d9a1248d93ba14579f10d80c6429e4d6af13ba137c28db64cae6dadb71442e54a3ad2b
-  languageName: node
-  linkType: hard
-
-"lodash.flatten@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.flatten@npm:4.4.0"
-  checksum: 97e8f0d6b61fe4723c02ad0c6e67e51784c4a2c48f56ef283483e556ad01594cf9cec9c773e177bbbdbdb5d19e99b09d2487cb6b6e5dc405c2693e93b125bd3a
-  languageName: node
-  linkType: hard
-
 "lodash.get@npm:^4.0":
   version: 4.4.2
   resolution: "lodash.get@npm:4.4.2"
@@ -11085,13 +11031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.invokemap@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.invokemap@npm:4.6.0"
-  checksum: 2bcc5f4b8782a316d55ff139215eb797f576f0f6d3db2755ebba7b35fd6061f8cbe81702a72a30bc6d70073a5dcc461f7570eaddcc9184c2e42ec3023645c6a1
-  languageName: node
-  linkType: hard
-
 "lodash.isarguments@npm:^3.1.0":
   version: 3.1.0
   resolution: "lodash.isarguments@npm:3.1.0"
@@ -11134,13 +11073,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.pullall@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.pullall@npm:4.2.0"
-  checksum: b129e8d879258c7db04a7dc1c23dd9e37c52f63a04e105faa8d2ab55e97b5a170d5e15cffbb732a36e7f48c4345c07b6fbddfe50e1f5ec301492b6f64a92040c
-  languageName: node
-  linkType: hard
-
 "lodash.sortby@npm:^4.7.0":
   version: 4.7.0
   resolution: "lodash.sortby@npm:4.7.0"
@@ -11162,13 +11094,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.uniqby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.uniqby@npm:4.7.0"
-  checksum: c505c0de20ca759599a2ba38710e8fb95ff2d2028e24d86c901ef2c74be8056518571b9b754bfb75053b2818d30dd02243e4a4621a6940c206bbb3f7626db656
-  languageName: node
-  linkType: hard
-
 "lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
@@ -12089,7 +12014,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.4":
+"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
   checksum: 44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
@@ -13529,7 +13454,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0":
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: 14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
@@ -13823,17 +13748,17 @@ __metadata:
   linkType: hard
 
 "react-redux-loading-bar@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "react-redux-loading-bar@npm:5.0.4"
+  version: 5.0.5
+  resolution: "react-redux-loading-bar@npm:5.0.5"
   dependencies:
     prop-types: "npm:^15.7.2"
     react-lifecycles-compat: "npm:^3.0.4"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-    react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
-    redux: ^3.0.0 || ^4.0.0
-  checksum: 11eea2ef6dfae232e278eceb83d07f9f57a2ece3ef23ce888dccf24964b669c9ee83a6db12b1f3c757b5b3410f7a7ccda96a4b4216c4ad9b42bf831ccea7a4a2
+    react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+    redux: ^3.0.0 || ^4.0.0 || ^5.0.0
+  checksum: 0dbac046c5b8b6bd209ccfc25ccc55dc9158cd737b42b68fd1900dfe46a59c9c7e2b0082d8901b749e7cf2d7e23074590aae74f350a814f205105f47895a6214
   languageName: node
   linkType: hard
 
@@ -16317,7 +16242,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.1.2":
+"tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3":
   version: 4.1.3
   resolution: "tough-cookie@npm:4.1.3"
   dependencies:
@@ -16347,12 +16272,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "tr46@npm:4.1.1"
+"tr46@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "tr46@npm:5.0.0"
   dependencies:
-    punycode: "npm:^2.3.0"
-  checksum: 92085dcf186f56a49ba4124a581d9ae6a5d0cd4878107c34e2e670b9ddc49da85e4950084bb3e75015195cc23f37ae1c02d45064e94dd6018f5e789aa51d93a8
+    punycode: "npm:^2.3.1"
+  checksum: 1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee
   languageName: node
   linkType: hard
 
@@ -16526,22 +16451,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.2.2
-  resolution: "typescript@npm:5.2.2"
+  version: 5.3.2
+  resolution: "typescript@npm:5.3.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07
+  checksum: d7dbe1fbe19039e36a65468ea64b5d338c976550394ba576b7af9c68ed40c0bc5d12ecce390e4b94b287a09a71bd3229f19c2d5680611f35b7c53a3898791159
   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.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin<compat/typescript>::version=5.2.2&hash=f3b441"
+  version: 5.3.2
+  resolution: "typescript@patch:typescript@npm%3A5.3.2#optional!builtin<compat/typescript>::version=5.3.2&hash=e012d7"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5
+  checksum: 73c8bad74e732d93211c9d77f28b03307e2f5fc6a0afc73f4b783261ab567686a16d6ae958bdaef383a00be1b0b8c8b6741dd6ca3d13af4963fa7e47456d49c7
   languageName: node
   linkType: hard
 
@@ -16967,6 +16892,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"w3c-xmlserializer@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "w3c-xmlserializer@npm:5.0.0"
+  dependencies:
+    xml-name-validator: "npm:^5.0.0"
+  checksum: 8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b
+  languageName: node
+  linkType: hard
+
 "walker@npm:^1.0.8":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
@@ -17070,29 +17004,25 @@ __metadata:
   linkType: hard
 
 "webpack-bundle-analyzer@npm:^4.8.0":
-  version: 4.9.1
-  resolution: "webpack-bundle-analyzer@npm:4.9.1"
+  version: 4.10.1
+  resolution: "webpack-bundle-analyzer@npm:4.10.1"
   dependencies:
     "@discoveryjs/json-ext": "npm:0.5.7"
     acorn: "npm:^8.0.4"
     acorn-walk: "npm:^8.0.0"
     commander: "npm:^7.2.0"
+    debounce: "npm:^1.2.1"
     escape-string-regexp: "npm:^4.0.0"
     gzip-size: "npm:^6.0.0"
+    html-escaper: "npm:^2.0.2"
     is-plain-object: "npm:^5.0.0"
-    lodash.debounce: "npm:^4.0.8"
-    lodash.escape: "npm:^4.0.1"
-    lodash.flatten: "npm:^4.4.0"
-    lodash.invokemap: "npm:^4.6.0"
-    lodash.pullall: "npm:^4.2.0"
-    lodash.uniqby: "npm:^4.7.0"
     opener: "npm:^1.5.2"
     picocolors: "npm:^1.0.0"
     sirv: "npm:^2.0.3"
     ws: "npm:^7.3.1"
   bin:
     webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: dd047c306471e6c389d6d4156ff22402e587140310a065a6191ee380f8251063f73a8ec6ac6d977c1cd634dbb717e2522b5d0b6cc9b0e847d4f15737fd9c65c9
+  checksum: 6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd
   languageName: node
   linkType: hard
 
@@ -17278,6 +17208,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-encoding@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "whatwg-encoding@npm:3.1.1"
+  dependencies:
+    iconv-lite: "npm:0.6.3"
+  checksum: 273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e
+  languageName: node
+  linkType: hard
+
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
@@ -17285,6 +17224,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -17295,13 +17241,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^12.0.0, whatwg-url@npm:^12.0.1":
-  version: 12.0.1
-  resolution: "whatwg-url@npm:12.0.1"
+"whatwg-url@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "whatwg-url@npm:14.0.0"
   dependencies:
-    tr46: "npm:^4.1.1"
+    tr46: "npm:^5.0.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: 99f506b2c996704fa0fc5c70d8e5e27dce15492db2921c99cf319a8d56cb61641f5c06089f63e1ab1983de9fd6a63c3c112a90cdb5fe352d7a846979b10df566
+  checksum: ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9
   languageName: node
   linkType: hard
 
@@ -17736,7 +17682,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.13.0":
+"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2":
   version: 8.14.2
   resolution: "ws@npm:8.14.2"
   peerDependencies:
@@ -17758,6 +17704,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml-name-validator@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "xml-name-validator@npm:5.0.0"
+  checksum: 3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5
+  languageName: node
+  linkType: hard
+
 "xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"