Merge remote-tracking branch 'upstream/main'

2024-03-19 13:41:44 +01:00 · 2024-03-19 13:41:44 +01:00 · 95a990fb6d
commit 95a990fb6d
parent ffae506e12 caee5e4d6a
332 changed files with 4189 additions and 2409 deletions
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@ -70,7 +70,7 @@ services:
        hard: -1

  libretranslate:
-    image: libretranslate/libretranslate:v1.5.5
+    image: libretranslate/libretranslate:v1.5.6
    restart: unless-stopped
    volumes:
      - lt-data:/home/libretranslate/.local
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@ -52,7 +52,7 @@ jobs:

      # Create or update the pull request
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6.0.1
+        uses: peter-evans/create-pull-request@v6.0.2
        with:
          commit-message: 'New Crowdin translations'
          title: 'New Crowdin Translations (automated)'
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@ -1,13 +0,0 @@
-# This configuration was generated by
-# `haml-lint --auto-gen-config`
-# on 2024-01-09 11:30:07 -0500 using Haml-Lint version 0.53.0.
-# The point is for the user to remove these configuration records
-# one by one as the lints are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of Haml-Lint, may require this file to be generated again.
-
-linters:
-  # Offense count: 1
-  LineLength:
-    exclude:
-      - 'app/views/admin/roles/_form.html.haml'
--- a/1
+++ b/1
@ -59,6 +59,7 @@ gem 'http', '~> 5.1'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
 gem 'idn-ruby', require: 'idn'
+gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -350,8 +350,11 @@ GEM
      rainbow (>= 2.2.2, < 4.0)
      terminal-table (>= 1.5.1)
    idn-ruby (0.1.5)
+    inline_svg (1.9.0)
+      activesupport (>= 3.0)
+      nokogiri (>= 1.6)
    io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
      rdoc
      reline (>= 0.4.2)
    jmespath (1.6.2)
@ -372,7 +375,7 @@ GEM
    json-ld-preloaded (3.3.0)
      json-ld (~> 3.3)
      rdf (~> 3.3)
-    json-schema (4.1.1)
+    json-schema (4.2.0)
      addressable (>= 2.8)
    jsonapi-renderer (0.2.2)
    jwt (2.7.1)
@ -455,7 +458,7 @@ GEM
    net-smtp (0.4.0.1)
      net-protocol
    nio4r (2.5.9)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    nsa (0.3.0)
@ -607,7 +610,7 @@ GEM
    redlock (1.3.2)
      redis (>= 3.0.0, < 6.0)
    regexp_parser (2.9.0)
-    reline (0.4.2)
+    reline (0.4.3)
      io-console (~> 0.5)
    request_store (1.5.1)
      rack (>= 1.4)
@ -622,16 +625,16 @@ GEM
      chunky_png (~> 1.0)
      rqrcode_core (~> 1.0)
    rqrcode_core (1.2.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
    rspec-github (2.4.0)
      rspec-core (~> 3.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
    rspec-rails (6.1.1)
      actionpack (>= 6.1)
      activesupport (>= 6.1)
@ -645,7 +648,7 @@ GEM
      rspec-expectations (~> 3.0)
      rspec-mocks (~> 3.0)
      sidekiq (>= 5, < 8)
-    rspec-support (3.12.1)
+    rspec-support (3.13.1)
    rubocop (1.60.2)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
@ -865,6 +868,7 @@ DEPENDENCIES
  httplog (~> 1.6.2)
  i18n-tasks (~> 1.0)
  idn-ruby
+  inline_svg
  irb (~> 1.8)
  json-ld
  json-ld-preloaded (~> 3.2)
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@ -1,6 +1,9 @@
 # frozen_string_literal: true

 class ActivityPub::BaseController < Api::BaseController
+  include SignatureVerification
+  include AccountOwnedConcern
+
  skip_before_action :require_authenticated_user!
  skip_before_action :require_not_suspended!
  skip_around_action :set_locale
--- a/app/controllers/activitypub/claims_controller.rb
+++ b/app/controllers/activitypub/claims_controller.rb
@ -1,9 +1,6 @@
 # frozen_string_literal: true

 class ActivityPub::ClaimsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
  skip_before_action :authenticate_user!

  before_action :require_account_signature!
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@ -1,9 +1,6 @@
 # frozen_string_literal: true

 class ActivityPub::CollectionsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
  vary_by -> { 'Signature' if authorized_fetch_mode? }

  before_action :require_account_signature!, if: :authorized_fetch_mode?
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@ -1,9 +1,6 @@
 # frozen_string_literal: true

 class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
  vary_by -> { 'Signature' if authorized_fetch_mode? }

  before_action :require_account_signature!
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@ -1,9 +1,7 @@
 # frozen_string_literal: true

 class ActivityPub::InboxesController < ActivityPub::BaseController
-  include SignatureVerification
  include JsonLdHelper
-  include AccountOwnedConcern

  before_action :skip_unknown_actor_activity
  before_action :require_actor_signature!
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@ -3,9 +3,6 @@
 class ActivityPub::OutboxesController < ActivityPub::BaseController
  LIMIT = 20

-  include SignatureVerification
-  include AccountOwnedConcern
-
  vary_by -> { 'Signature' if authorized_fetch_mode? || page_requested? }

  before_action :require_account_signature!, if: :authorized_fetch_mode?
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@ -1,9 +1,7 @@
 # frozen_string_literal: true

 class ActivityPub::RepliesController < ActivityPub::BaseController
-  include SignatureVerification
  include Authorization
-  include AccountOwnedConcern

  DESCENDANTS_LIMIT = 60

--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@ -104,6 +104,10 @@ class Api::BaseController < ApplicationController

  private

+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
  def pagination_options_invalid?
    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
  end
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@ -41,10 +41,6 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_account_followers_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@ -41,10 +41,6 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_account_following_index_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@ -35,10 +35,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
    params.slice(:limit, *AccountStatusesFilter::KEYS).permit(:limit, *AccountStatusesFilter::KEYS).merge(core_params)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_account_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@ -125,10 +125,6 @@ class Api::V1::Admin::AccountsController < Api::BaseController
    translated_params
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_accounts_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@ -65,10 +65,6 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
    @canonical_email_block = CanonicalEmailBlock.find(params[:id])
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_canonical_email_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@ -61,10 +61,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
    DomainAllow.all
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@ -72,10 +72,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
    params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@ -58,10 +58,6 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
    params.permit(:domain, :allow_with_approval)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_email_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/ip_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@ -63,10 +63,6 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
    params.permit(:ip, :severity, :comment, :expires_in)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_ip_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@ -89,10 +89,6 @@ class Api::V1::Admin::ReportsController < Api::BaseController
    params.permit(*FILTER_PARAMS)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_reports_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@ -44,10 +44,6 @@ class Api::V1::Admin::TagsController < Api::BaseController
    params.permit(:display_name, :trendable, :usable, :listable)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_tags_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
@ -42,10 +42,6 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
    @providers = PreviewCardProvider.all.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_admin_trends_links_preview_card_providers_url(pagination_params(max_id: pagination_max_id)) if records_continue?
  end
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@ -28,10 +28,6 @@ class Api::V1::BlocksController < Api::BaseController
                               )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@ -31,10 +31,6 @@ class Api::V1::BookmarksController < Api::BaseController
    current_account.bookmarks
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@ -53,10 +53,6 @@ class Api::V1::ConversationsController < Api::BaseController
                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_conversations_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@ -29,10 +29,6 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
    @encrypted_messages = @current_device.encrypted_messages.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_crypto_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@ -38,10 +38,6 @@ class Api::V1::DomainBlocksController < Api::BaseController
    current_account.domain_blocks
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_domain_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@ -28,10 +28,6 @@ class Api::V1::EndorsementsController < Api::BaseController
    current_account.endorsed_accounts.includes(:account_stat, :user).without_suspended
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    return if unlimited?

--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@ -31,10 +31,6 @@ class Api::V1::FavouritesController < Api::BaseController
    current_account.favourites
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_favourites_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@ -48,10 +48,6 @@ class Api::V1::FollowRequestsController < Api::BaseController
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_follow_requests_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/followed_tags_controller.rb
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@ -22,10 +22,6 @@ class Api::V1::FollowedTagsController < Api::BaseController
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_followed_tags_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@ -55,10 +55,6 @@ class Api::V1::Lists::AccountsController < Api::BaseController
    params.permit(account_ids: [])
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    return if unlimited?

--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@ -28,10 +28,6 @@ class Api::V1::MutesController < Api::BaseController
                             )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_mutes_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@ -53,10 +53,6 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
    @request = NotificationRequest.where(account: current_account).find(params[:id])
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
  end
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@ -58,10 +58,6 @@ class Api::V1::NotificationsController < Api::BaseController
    @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
  end
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@ -47,10 +47,6 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
    params.slice(:limit).permit(:limit).merge(core_params)
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@ -34,10 +34,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_status_favourited_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@ -30,10 +30,6 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
    )
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def next_path
    api_v1_status_reblogged_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
  end
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@ -5,10 +5,6 @@ class Api::V1::Timelines::BaseController < Api::BaseController

  private

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def pagination_collection
    @statuses
  end
--- a/app/controllers/api/v1/trends/links_controller.rb
+++ b/app/controllers/api/v1/trends/links_controller.rb
@ -34,10 +34,6 @@ class Api::V1::Trends::LinksController < Api::BaseController
    scope
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def pagination_params(core_params)
    params.slice(:limit).permit(:limit).merge(core_params)
  end
--- a/app/controllers/api/v1/trends/statuses_controller.rb
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@ -32,10 +32,6 @@ class Api::V1::Trends::StatusesController < Api::BaseController
    scope
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def pagination_params(core_params)
    params.slice(:limit).permit(:limit).merge(core_params)
  end
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@ -30,10 +30,6 @@ class Api::V1::Trends::TagsController < Api::BaseController
    Trends.tags.query.allowed
  end

-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
  def pagination_params(core_params)
    params.slice(:limit).permit(:limit).merge(core_params)
  end
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@ -6,6 +6,8 @@ class InstanceActorsController < ActivityPub::BaseController
  serialization_scope nil

  before_action :set_account
+
+  skip_before_action :authenticate_user! # From `AccountOwnedConcern`
  skip_before_action :require_functional!
  skip_before_action :update_user_sign_in

@ -16,6 +18,11 @@ class InstanceActorsController < ActivityPub::BaseController

  private

+  # Skips various `before_action` from `AccountOwnedConcern`
+  def account_required?
+    false
+  end
+
  def set_account
    @account = Account.representative
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -28,14 +28,6 @@ module ApplicationHelper
    number_to_human(number, **options)
  end

-  def active_nav_class(*paths)
-    paths.any? { |path| current_page?(path) } ? 'active' : ''
-  end
-
-  def show_landing_strip?
-    !user_signed_in? && !single_user_mode?
-  end
-
  def open_registrations?
    Setting.registrations_mode == 'open'
  end
@ -122,7 +114,7 @@ module ApplicationHelper
  end

  def check_icon
-    content_tag(:svg, tag.path('fill-rule': 'evenodd', 'clip-rule': 'evenodd', d: 'M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z'), xmlns: 'http://www.w3.org/2000/svg', viewBox: '0 0 20 20', fill: 'currentColor')
+    inline_svg_tag 'check.svg'
  end

  def visibility_icon(status)
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@ -24,12 +24,21 @@ module ContextHelper
    memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' },
    voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
    olm: {
-      'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId',
+      'toot' => 'http://joinmastodon.org/ns#',
+      'Device' => 'toot:Device',
+      'Ed25519Signature' => 'toot:Ed25519Signature',
+      'Ed25519Key' => 'toot:Ed25519Key',
+      'Curve25519Key' => 'toot:Curve25519Key',
+      'EncryptedMessage' => 'toot:EncryptedMessage',
+      'publicKeyBase64' => 'toot:publicKeyBase64',
+      'deviceId' => 'toot:deviceId',
      'claim' => { '@type' => '@id', '@id' => 'toot:claim' },
      'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' },
      'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' },
      'devices' => { '@type' => '@id', '@id' => 'toot:devices' },
-      'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText'
+      'messageFranking' => 'toot:messageFranking',
+      'messageType' => 'toot:messageType',
+      'cipherText' => 'toot:cipherText',
    },
    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
  }.freeze
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@ -4,14 +4,6 @@ module StatusesHelper
  EMBEDDED_CONTROLLER = 'statuses'
  EMBEDDED_ACTION = 'embed'

-  def link_to_newer(url)
-    link_to t('statuses.show_newer'), url, class: 'load-more load-gap'
-  end
-
-  def link_to_older(url)
-    link_to t('statuses.show_older'), url, class: 'load-more load-gap'
-  end
-
  def nothing_here(extra_classes = '')
    content_tag(:div, class: "nothing-here #{extra_classes}") do
      t('accounts.nothing_here')
--- a/app/javascript/images/check.svg
+++ b/app/javascript/images/check.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" />
+</svg>
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@ -12,8 +12,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';

-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
  return (dispatch, getState) => {
    dispatch(fetchBlocksRequest());
@ -90,11 +88,12 @@ export function expandBlocksFail(error) {

 export function initBlockModal(account) {
  return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
+    dispatch(openModal({
+      modalType: 'BLOCK',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
  };
 }
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@ -1,6 +1,8 @@
 import api, { getLinks } from '../api';

 import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+import { openModal } from './modal';
+

 export * from "./domain_blocks_typed";

@ -150,3 +152,12 @@ export function expandDomainBlocksFail(error) {
    error,
  };
 }
+
+export const initDomainBlockModal = account => dispatch => dispatch(openModal({
+  modalType: 'DOMAIN_BLOCK',
+  modalProps: {
+    domain: account.get('acct').split('@')[1],
+    acct: account.get('acct'),
+    accountId: account.get('id'),
+  },
+}));
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@ -12,10 +12,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';

-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
-
 export function fetchMutes() {
  return (dispatch, getState) => {
    dispatch(fetchMutesRequest());
@ -92,26 +88,12 @@ export function expandMutesFail(error) {

 export function initMuteModal(account) {
  return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'MUTE' }));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
-
-export function changeMuteDuration(duration) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_CHANGE_DURATION,
-      duration,
-    });
+    dispatch(openModal({
+      modalType: 'MUTE',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
  };
 }
--- a/app/javascript/mastodon/components/check_box.tsx
+++ b/app/javascript/mastodon/components/check_box.tsx
@ -0,0 +1,39 @@
+import classNames from 'classnames';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+
+import { Icon } from './icon';
+
+interface Props {
+  value: string;
+  checked: boolean;
+  name: string;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  label: React.ReactNode;
+}
+
+export const CheckBox: React.FC<Props> = ({
+  name,
+  value,
+  checked,
+  onChange,
+  label,
+}) => {
+  return (
+    <label className='check-box'>
+      <input
+        name={name}
+        type='checkbox'
+        value={value}
+        checked={checked}
+        onChange={onChange}
+      />
+
+      <span className={classNames('check-box__input', { checked })}>
+        {checked && <Icon id='check' icon={DoneIcon} />}
+      </span>
+
+      <span>{label}</span>
+    </label>
+  );
+};
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@ -102,7 +102,7 @@ const getUnitDelay = (units: string) => {
 };

 export const timeAgoString = (
-  intl: IntlShape,
+  intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>,
  date: Date,
  now: number,
  year: number,
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@ -209,7 +209,7 @@ class StatusActionBar extends ImmutablePureComponent {
    const { status, onBlockDomain } = this.props;
    const account = status.get('account');

-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
  };

  handleUnblockDomain = () => {
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@ -1,4 +1,4 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';

 import { connect } from 'react-redux';

@ -15,7 +15,7 @@ import {
  directCompose,
 } from '../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
  unblockDomain,
 } from '../actions/domain_blocks';
 import {
@ -253,15 +253,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
    dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
  },

-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
  },

  onUnblockDomain (domain) {
--- a/app/javascript/mastodon/features/account/components/domain_pill.jsx
+++ b/app/javascript/mastodon/features/account/components/domain_pill.jsx
@ -0,0 +1,86 @@
+import PropTypes from 'prop-types';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BadgeIcon from '@/material-icons/400-24px/badge.svg?react';
+import GlobeIcon from '@/material-icons/400-24px/globe.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainPill = ({ domain, username, isSelf }) => {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleExpandClick = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <>
+      <button className={classNames('account__domain-pill', { active: open })} ref={triggerRef} onClick={handleClick}>{domain}</button>
+
+      <Overlay show={open} rootClose onHide={handleClick} offset={[5, 5]} target={triggerRef}>
+        {({ props }) => (
+          <div {...props} className='account__domain-pill__popout dropdown-animation'>
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'><Icon icon={BadgeIcon} /></div>
+              <h3><FormattedMessage id='domain_pill.whats_in_a_handle' defaultMessage="What's in a handle?" /></h3>
+            </div>
+
+            <div className='account__domain-pill__popout__handle'>
+              <div className='account__domain-pill__popout__handle__label'>{isSelf ? <FormattedMessage id='domain_pill.your_handle' defaultMessage='Your handle:' /> : <FormattedMessage id='domain_pill.their_handle' defaultMessage='Their handle:' />}</div>
+              <div className='account__domain-pill__popout__handle__handle'>@{username}@{domain}</div>
+            </div>
+
+            <div className='account__domain-pill__popout__parts'>
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={AlternateEmailIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.username' defaultMessage='Username' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_username' defaultMessage='Your unique identifier on this server. It’s possible to find users with the same username on different servers.' /> : <FormattedMessage id='domain_pill.their_username' defaultMessage='Their unique identifier on their server. It’s possible to find users with the same username on different servers.' />}</p>
+                </div>
+              </div>
+
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={GlobeIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.server' defaultMessage='Server' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_server' defaultMessage='Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.' /> : <FormattedMessage id='domain_pill.their_server' defaultMessage='Their digital home, where all of their posts live.' />}</p>
+                </div>
+              </div>
+            </div>
+
+            <p>{isSelf ? <FormattedMessage id='domain_pill.who_you_are' defaultMessage='Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} /> : <FormattedMessage id='domain_pill.who_they_are' defaultMessage='Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} />}</p>
+
+            {expanded && (
+              <>
+                <p><FormattedMessage id='domain_pill.activitypub_like_language' defaultMessage='ActivityPub is like the language Mastodon speaks with other social networks.' /></p>
+                <p><FormattedMessage id='domain_pill.activitypub_lets_connect' defaultMessage='It lets you connect and interact with people not just on Mastodon, but across different social apps too.' /></p>
+              </>
+            )}
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
+
+DomainPill.propTypes = {
+  username: PropTypes.string.isRequired,
+  domain: PropTypes.string.isRequired,
+  isSelf: PropTypes.bool,
+};
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@ -25,13 +25,15 @@ import { IconButton } from 'mastodon/components/icon_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
-import { autoPlayGif, me, domain } from 'mastodon/initial_state';
+import { autoPlayGif, me, domain as localDomain } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';

 import AccountNoteContainer from '../containers/account_note_container';
 import FollowRequestNoteContainer from '../containers/follow_request_note_container';

+import { DomainPill } from './domain_pill';
+
 const messages = defineMessages({
  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
  follow: { id: 'account.follow', defaultMessage: 'Follow' },
@ -78,7 +80,7 @@ const messages = defineMessages({

 const titleFromAccount = account => {
  const displayName = account.get('display_name');
-  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${localDomain}` : account.get('acct');
  const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;

  return `${prefix} (@${acct})`;
@ -252,7 +254,7 @@ class Header extends ImmutablePureComponent {
  }

  render () {
-    const { account, hidden, intl, domain } = this.props;
+    const { account, hidden, intl } = this.props;
    const { signedIn, permissions } = this.context.identity;

    if (!account) {
@ -393,7 +395,8 @@ class Header extends ImmutablePureComponent {
    const displayNameHtml = { __html: account.get('display_name_html') };
    const fields          = account.get('fields');
    const isLocal         = account.get('acct').indexOf('@') === -1;
-    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const username        = account.get('acct').split('@')[0];
+    const domain          = isLocal ? localDomain : account.get('acct').split('@')[1];
    const isIndexable     = !account.get('noindex');

    const badges = [];
@ -438,7 +441,9 @@ class Header extends ImmutablePureComponent {
            <h1>
              <span dangerouslySetInnerHTML={displayNameHtml} />
              <small>
-                <span>@{acct}</span> {lockedIcon}
+                <span>@{username}<span className='invisible'>@{domain}</span></span>
+                <DomainPill username={username} domain={domain} isSelf={me === account.get('id')} />
+                {lockedIcon}
              </small>
            </h1>
          </div>
--- a/app/javascript/mastodon/features/account_timeline/components/header.jsx
+++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx
@ -72,11 +72,7 @@ class Header extends ImmutablePureComponent {
  };

  handleBlockDomain = () => {
-    const domain = this.props.account.get('acct').split('@')[1];
-
-    if (!domain) return;
-
-    this.props.onBlockDomain(domain);
+    this.props.onBlockDomain(this.props.account);
  };

  handleUnblockDomain = () => {
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@ -17,7 +17,7 @@ import {
  mentionCompose,
  directCompose,
 } from '../../../actions/compose';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
+import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
@ -140,15 +140,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    }
  },

-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
  },

  onUnblockDomain (domain) {
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@ -11,6 +11,7 @@ import { connect } from 'react-redux';

 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
@ -19,7 +20,6 @@ import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@ -112,7 +112,7 @@ class GettingStarted extends ImmutablePureComponent {

    if (showTrends) {
      navItems.push(
-        <ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
      );
    }

--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@ -159,7 +159,7 @@ class ActionBar extends PureComponent {
    const { status, onBlockDomain } = this.props;
    const account = status.get('account');

-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
  };

  handleUnblockDomain = () => {
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@ -304,7 +304,7 @@ class DetailedStatus extends ImmutablePureComponent {

            <div className='detailed-status__meta__line'>
              {reblogLink}
-              ·
+              {reblogLink && <>·</>}
              {favouriteLink}
            </div>
          </div>
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';

-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';

 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@ -34,7 +34,7 @@ import {
  directCompose,
 } from '../../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
  unblockDomain,
 } from '../../actions/domain_blocks';
 import {
@ -463,15 +463,8 @@ class Status extends ImmutablePureComponent {
    this.props.dispatch(unblockAccount(account.get('id')));
  };

-  handleBlockDomainClick = domain => {
-    this.props.dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => this.props.dispatch(blockDomain(domain)),
-      },
-    }));
+  handleBlockDomainClick = account => {
+    this.props.dispatch(initDomainBlockModal(account));
  };

  handleUnblockDomainClick = domain => {
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@ -1,100 +1,116 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';

-import { injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';

-import { connect } from 'react-redux';
+import classNames from 'classnames';

-import { blockAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { initReport } from '../../../actions/reports';
-import { Button } from '../../../components/button';
-import { makeGetAccount } from '../../../selectors';
+import { useDispatch } from 'react-redux';

-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';

-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
+export const BlockModal = ({ accountId, acct }) => {
+  const dispatch = useDispatch();
+  const [expanded, setExpanded] = useState(false);

-  return mapStateToProps;
-};
+  const domain = acct.split('@')[1];

-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);

-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);

-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-  };
-};
+  const handleToggleLearnMore = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);

-class BlockModal extends PureComponent {
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={BlockIcon} />
+          </div>

-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
+          <div>
+            <h1><FormattedMessage id='block_modal.title' defaultMessage='Block user?' /></h1>
+            <div>@{acct}</div>
+          </div>
        </div>

-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_will_know' defaultMessage="They can see that they're blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_see_posts' defaultMessage="They can't see your posts and you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='block_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mentions them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="They can't mention or follow you." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        {domain && (
+          <div className='safety-action-modal__bottom__collapsible'>
+            <div className='safety-action-modal__caveats'>
+              <FormattedMessage
+                id='block_modal.remote_users_caveat'
+                defaultMessage='We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.'
+                values={{ domain: <strong>{domain}</strong> }}
+              />
+            </div>
+          </div>
+        )}
+
+        <div className='safety-action-modal__actions'>
+          {domain && (
+            <button onClick={handleToggleLearnMore} className='link-button'>
+              {expanded ? <FormattedMessage id='block_modal.show_less' defaultMessage='Show less' /> : <FormattedMessage id='block_modal.show_more' defaultMessage='Show more' />}
+            </button>
+          )}
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
            <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
          </Button>
        </div>
      </div>
-    );
-  }
+    </div>
+  );
+};

-}
+BlockModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};

-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;
--- a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { blockDomain } from 'mastodon/actions/domain_blocks';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockDomain(domain));
+  }, [dispatch, domain]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={DomainDisabledIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='domain_block_modal.title' defaultMessage='Block domain?' /></h1>
+            <div>{domain}</div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_wont_know' defaultMessage="They won't know they've been blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_wont_see_posts' defaultMessage="You won't see posts or notifications from users on this server." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonRemoveIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_will_lose_followers' defaultMessage='All your followers from this server will be removed.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_cant_follow' defaultMessage='Nobody from this server can follow you.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={HistoryIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_can_interact_with_old_posts' defaultMessage='People from this server can interact with your old posts.' /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='domain_block_modal.block_account_instead' defaultMessage='Block @{name} instead' values={{ name: acct.split('@')[0] }} />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <Button onClick={handleClick}>
+            <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+DomainBlockModal.propTypes = {
+  domain: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@ -7,6 +7,7 @@ import Base from 'mastodon/components/modal_root';
 import {
  MuteModal,
  BlockModal,
+  DomainBlockModal,
  ReportModal,
  EmbedModal,
  ListEditor,
@ -41,6 +42,7 @@ export const MODAL_COMPONENTS = {
  'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
  'MUTE': MuteModal,
  'BLOCK': BlockModal,
+  'DOMAIN_BLOCK': DomainBlockModal,
  'REPORT': ReportModal,
  'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
  'EMBED': EmbedModal,
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@ -1,138 +1,154 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';

-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';

-import { connect } from 'react-redux';
+import classNames from 'classnames';

-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';

-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { CheckBox } from 'mastodon/components/check_box';
+import { Icon } from 'mastodon/components/icon';
+import { RadioButton } from 'mastodon/components/radio_button';

 const messages = defineMessages({
  minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
  hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
  days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+  hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
 });

-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['mutes', 'new', 'account']),
-    notifications: state.getIn(['mutes', 'new', 'notifications']),
-    muteDuration: state.getIn(['mutes', 'new', 'duration']),
-  };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+  <RadioButton
+    name={name}
+    value={value}
+    checked={value === currentValue}
+    onChange={onChange}
+    label={label}
+  />
+);
+
+RadioButtonLabel.propTypes = {
+  name: PropTypes.string,
+  value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node,
 };

-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications, muteDuration) {
-      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
-    },
+export const MuteModal = ({ accountId, acct }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [notifications, setNotifications] = useState(true);
+  const [muteDuration, setMuteDuration] = useState('0');
+  const [expanded, setExpanded] = useState(false);

-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(muteAccount(accountId, notifications, muteDuration));
+  }, [dispatch, accountId, notifications, muteDuration]);

-    onToggleNotifications() {
-      dispatch(toggleHideNotifications());
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);

-    onChangeMuteDuration(e) {
-      dispatch(changeMuteDuration(e.target.value));
-    },
-  };
-};
+  const handleToggleNotifications = useCallback(({ target }) => {
+    setNotifications(target.checked);
+  }, [setNotifications]);

-class MuteModal extends PureComponent {
+  const handleChangeMuteDuration = useCallback(({ target }) => {
+    setMuteDuration(target.value);
+  }, [setMuteDuration]);

-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    notifications: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onToggleNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    muteDuration: PropTypes.number.isRequired,
-    onChangeMuteDuration: PropTypes.func.isRequired,
-  };
+  const handleToggleSettings = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);

-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  toggleNotifications = () => {
-    this.props.onToggleNotifications();
-  };
-
-  changeMuteDuration = (e) => {
-    this.props.onChangeMuteDuration(e);
-  };
-
-  render () {
-    const { account, notifications, muteDuration, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal mute-modal'>
-        <div className='mute-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.mute.message'
-              defaultMessage='Are you sure you want to mute {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
-              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            </label>
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={VolumeOffIcon} />
          </div>
-          <div>
-            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>

-            <select value={muteDuration} onChange={this.changeMuteDuration}>
-              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
-              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-            </select>
+          <div>
+            <h1><FormattedMessage id='mute_modal.title' defaultMessage='Mute user?' /></h1>
+            <div>@{acct}</div>
          </div>
        </div>

-        <div className='mute-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_wont_know' defaultMessage="They won't know they've been muted." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_posts' defaultMessage="They can still see your posts, but you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mention them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_can_mention_and_follow' defaultMessage="They can mention and follow you, but you won't see them." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        <div className='safety-action-modal__bottom__collapsible'>
+          <div className='safety-action-modal__field-group'>
+            <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+          </div>
+
+          <div className='safety-action-modal__field-group'>
+            <CheckBox label={intl.formatMessage(messages.hideFromNotifications)} checked={notifications} onChange={handleToggleNotifications} />
+          </div>
+        </div>
+
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleToggleSettings} className='link-button'>
+            {expanded ? <FormattedMessage id='mute_modal.hide_options' defaultMessage='Hide options' /> : <FormattedMessage id='mute_modal.show_options' defaultMessage='Show options' />}
+          </button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
            <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
          </Button>
        </div>
      </div>
-    );
-  }
+    </div>
+  );
+};

-}
+MuteModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};

-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@ -118,6 +118,10 @@ export function BlockModal () {
  return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
 }

+export function DomainBlockModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
 export function ReportModal () {
  return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@ -119,9 +119,7 @@
  "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
  "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
  "confirmation_modal.cancel": "Kanselleer",
-  "confirmations.block.block_and_report": "Blokkeer en rapporteer",
  "confirmations.block.confirm": "Blokkeer",
-  "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
  "confirmations.cancel_follow_request.confirm": "Herroep versoek",
  "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
  "confirmations.delete.confirm": "Wis uit",
@ -129,7 +127,6 @@
  "confirmations.delete_list.confirm": "Wis uit",
  "confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
  "confirmations.discard_edit_media.confirm": "Gooi weg",
-  "confirmations.domain_block.confirm": "Blokkeer die hele domein",
  "confirmations.logout.confirm": "Teken Uit",
  "confirmations.logout.message": "Is jy seker jy wil uitteken?",
  "confirmations.reply.confirm": "Antwoord",
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@ -132,9 +132,7 @@
  "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
  "compose_form.spoiler.unmarked": "Texto no amagau",
  "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Blocar y Denunciar",
  "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
  "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
  "confirmations.delete.confirm": "Eliminar",
@ -143,13 +141,10 @@
  "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
  "confirmations.discard_edit_media.confirm": "Descartar",
  "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
-  "confirmations.domain_block.confirm": "Amagar dominio entero",
  "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
  "confirmations.logout.confirm": "Zarrar sesión",
  "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
-  "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
  "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
  "confirmations.reply.confirm": "Responder",
  "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
@ -323,9 +318,6 @@
  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
  "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
-  "mute_modal.indefinite": "Indefinida",
  "navigation_bar.about": "Sobre",
  "navigation_bar.blocks": "Usuarios blocaus",
  "navigation_bar.bookmarks": "Marcadors",
@ -500,7 +492,6 @@
  "status.delete": "Borrar",
  "status.detailed_status": "Vista de conversación detallada",
  "status.edit": "Editar",
-  "status.edited": "Editau {date}",
  "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
  "status.embed": "Incrustado",
  "status.filter": "Filtrar esta publicación",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
  "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
  "confirmation_modal.cancel": "إلغاء",
-  "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
  "confirmations.block.confirm": "حظر",
-  "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
  "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
  "confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
  "confirmations.delete.confirm": "حذف",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
  "confirmations.discard_edit_media.confirm": "تجاهل",
  "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
-  "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
  "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
  "confirmations.edit.confirm": "تعديل",
  "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
  "confirmations.logout.confirm": "خروج",
  "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
  "confirmations.mute.confirm": "أكتم",
-  "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
-  "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
  "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
  "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
  "confirmations.reply.confirm": "رد",
@ -399,9 +394,6 @@
  "loading_indicator.label": "جاري التحميل…",
  "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
  "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
-  "mute_modal.duration": "المدة",
-  "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
-  "mute_modal.indefinite": "إلى أجل غير مسمى",
  "navigation_bar.about": "عن",
  "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
  "navigation_bar.blocks": "الحسابات المحجوبة",
@ -646,7 +638,6 @@
  "status.direct": "إشارة خاصة لـ @{name}",
  "status.direct_indicator": "إشارة خاصة",
  "status.edit": "تعديل",
-  "status.edited": "عُدّل في {date}",
  "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
  "status.embed": "إدماج",
  "status.favourite": "فضّل",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -112,16 +112,13 @@
  "compose_form.poll.type": "Estilu",
  "compose_form.publish_form": "Artículu nuevu",
  "confirmation_modal.cancel": "Encaboxar",
-  "confirmations.block.block_and_report": "Bloquiar ya informar",
  "confirmations.block.confirm": "Bloquiar",
-  "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirala",
  "confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
  "confirmations.delete.confirm": "Desaniciar",
  "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
  "confirmations.delete_list.confirm": "Desaniciar",
  "confirmations.discard_edit_media.confirm": "Escartar",
-  "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
  "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
  "confirmations.logout.confirm": "Zarrar la sesión",
  "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
@ -277,8 +274,6 @@
  "lists.subheading": "Les tos llistes",
  "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
  "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
  "navigation_bar.about": "Tocante a",
  "navigation_bar.blocks": "Perfiles bloquiaos",
  "navigation_bar.bookmarks": "Marcadores",
@ -429,7 +424,6 @@
  "status.delete": "Desaniciar",
  "status.direct": "Mentar a @{name} per privao",
  "status.direct_indicator": "Mención privada",
-  "status.edited": "Editóse'l {date}",
  "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
  "status.embed": "Empotrar",
  "status.filter": "Peñerar esti artículu",
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Аб'ява",
  "attachments_list.unprocessed": "(неапрацаваны)",
  "audio.hide": "Схаваць аўдыя",
+  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
+  "block_modal.show_less": "Паказаць меньш",
+  "block_modal.show_more": "Паказаць больш",
+  "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
+  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць вашых допісаў, а вы — карыстальніка.",
+  "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
+  "block_modal.title": "Заблакіраваць карыстальніка?",
+  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
  "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
  "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
  "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
  "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
  "confirmation_modal.cancel": "Скасаваць",
-  "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
  "confirmations.block.confirm": "Заблакіраваць",
-  "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
  "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
  "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
  "confirmations.delete.confirm": "Выдаліць",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
  "confirmations.discard_edit_media.confirm": "Адмяніць",
  "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+  "confirmations.domain_block.confirm": "Заблакіраваць сервер",
  "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
  "confirmations.edit.confirm": "Рэдагаваць",
  "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
  "confirmations.logout.confirm": "Выйсці",
  "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
  "confirmations.mute.confirm": "Ігнараваць",
-  "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
-  "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
  "confirmations.redraft.confirm": "Выдаліць і перапісаць",
  "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
  "confirmations.reply.confirm": "Адказаць",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
  "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
  "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
+  "domain_block_modal.block": "Заблакіраваць сервер",
+  "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
+  "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
+  "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
+  "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
+  "domain_block_modal.title": "Заблакіраваць дамен?",
+  "domain_block_modal.you_will_lose_followers": "Усе падпісчыкі з гэтага сервера будуць выдаленыя.",
+  "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
+  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
+  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
+  "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
+  "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
+  "domain_pill.username": "Імя карыстальніка",
+  "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
+  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
+  "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
+  "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
  "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
  "embed.preview": "Вось як гэта будзе выглядаць:",
  "emoji_button.activity": "Актыўнасць",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Загрузка…",
  "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
-  "mute_modal.duration": "Працягласць",
-  "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
-  "mute_modal.indefinite": "Бестэрмінова",
+  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
+  "mute_modal.hide_options": "Схаваць опцыі",
+  "mute_modal.indefinite": "Пакуль я не прыбяру ігнараванне",
+  "mute_modal.show_options": "Паказаць опцыі",
+  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць вас і падпісацца на вас, але вы гэтага не ўбачыце.",
+  "mute_modal.they_wont_know": "Карыстальнік не будзе ведаць пра ігнараванне.",
+  "mute_modal.title": "Ігнараваць карыстальніка?",
+  "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
+  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
  "navigation_bar.about": "Пра нас",
  "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
  "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
@ -662,10 +693,11 @@
  "status.direct": "Згадаць асабіста @{name}",
  "status.direct_indicator": "Асабістае згадванне",
  "status.edit": "Рэдагаваць",
-  "status.edited": "Адрэдагавана {date}",
+  "status.edited": "Апошняе рэдагаванне {date}",
  "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
  "status.embed": "Убудаваць",
  "status.favourite": "Упадабанае",
+  "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
  "status.filter": "Фільтраваць гэты допіс",
  "status.filtered": "Адфільтравана",
  "status.hide": "Схаваць допіс",
@ -686,6 +718,7 @@
  "status.reblog": "Пашырыць",
  "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
  "status.reblogged_by": "{name} пашырыў(-ла)",
+  "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
  "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
  "status.redraft": "Выдаліць і паправіць",
  "status.remove_bookmark": "Выдаліць закладку",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Оповестяване",
  "attachments_list.unprocessed": "(необработено)",
  "audio.hide": "Скриване на звука",
+  "block_modal.remote_users_caveat": "Ще поискаме сървърът {domain} да почита решението ви. Съгласието обаче не се гарантира откак някои сървъри могат да боравят с блоковете по различен начин. Обществените публикации още може да се виждат от невлезли в системата потребители.",
+  "block_modal.show_less": "Повече на показ",
+  "block_modal.show_more": "По-малко на показ",
+  "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
+  "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.",
+  "block_modal.they_will_know": "Те могат да видят, че са блокирани.",
+  "block_modal.title": "Блокирате ли потребителя?",
+  "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
  "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
  "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
  "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
  "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
  "confirmation_modal.cancel": "Отказ",
-  "confirmations.block.block_and_report": "Блокиране и докладване",
  "confirmations.block.confirm": "Блокиране",
-  "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
  "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
  "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
  "confirmations.delete.confirm": "Изтриване",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
  "confirmations.discard_edit_media.confirm": "Отхвърляне",
  "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
-  "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+  "confirmations.domain_block.confirm": "Блокиране на сървър",
  "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
  "confirmations.edit.confirm": "Редактиране",
  "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
  "confirmations.logout.confirm": "Излизане",
  "confirmations.logout.message": "Наистина ли искате да излезете?",
  "confirmations.mute.confirm": "Заглушаване",
-  "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
-  "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
  "confirmations.redraft.confirm": "Изтриване и преработване",
  "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
  "confirmations.reply.confirm": "Отговор",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
  "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
  "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
+  "domain_block_modal.block": "Блокиране на сървър",
+  "domain_block_modal.block_account_instead": "Вместо това блокиране на @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Хората от този сървър могат да взаимодействат с ваши стари публикации.",
+  "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
+  "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
+  "domain_block_modal.title": "Блокирате ли домейн?",
+  "domain_block_modal.you_will_lose_followers": "Всичките ви последователи от този сървър ще се премахнат.",
+  "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
+  "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
+  "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
+  "domain_pill.server": "Сървър",
+  "domain_pill.their_handle": "Тяхната ръчка:",
+  "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
+  "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+  "domain_pill.username": "Потребителско име",
+  "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+  "domain_pill.who_they_are": "Откак ръчките казват кой кой е и къде е, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.who_you_are": "Тъй като вашата ръчка казва кои сте и къде сте, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.your_handle": "Вашата ръчка:",
+  "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
+  "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
  "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
  "embed.preview": "Ето как ще изглежда:",
  "emoji_button.activity": "Дейност",
@ -241,6 +266,7 @@
  "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
  "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
  "empty_column.mutes": "Още не сте заглушавали потребители.",
+  "empty_column.notification_requests": "Всичко е чисто! Тук няма нищо. Получавайки нови известия, те ще се появят тук според настройките ви.",
  "empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
  "empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
  "error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
@ -271,6 +297,8 @@
  "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
  "filter_modal.select_filter.title": "Филтриране на публ.",
  "filter_modal.title.status": "Филтриране на публ.",
+  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.title": "Филтрирани известия",
  "firehose.all": "Всичко",
  "firehose.local": "Този сървър",
  "firehose.remote": "Други сървъри",
@ -399,9 +427,15 @@
  "loading_indicator.label": "Зареждане…",
  "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
  "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
-  "mute_modal.duration": "Времетраене",
-  "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
-  "mute_modal.indefinite": "Неопределено",
+  "mute_modal.hide_from_notifications": "Скриване от известията",
+  "mute_modal.hide_options": "Скриване на възможностите",
+  "mute_modal.indefinite": "Докато премахна заглушаването им",
+  "mute_modal.show_options": "Показване на възможностите",
+  "mute_modal.they_can_mention_and_follow": "Могат да ви споменават и последват, но няма да ги виждате.",
+  "mute_modal.they_wont_know": "Няма да узнаят, че са били заглушени.",
+  "mute_modal.title": "Заглушавате ли потребител?",
+  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващи ги публикации.",
+  "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
  "navigation_bar.about": "Относно",
  "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
  "navigation_bar.blocks": "Блокирани потребители",
@ -439,7 +473,10 @@
  "notification.reblog": "{name} подсили ваша публикация",
  "notification.status": "{name} току-що публикува",
  "notification.update": "{name} промени публикация",
+  "notification_requests.accept": "Приемам",
+  "notification_requests.dismiss": "Отхвърлям",
  "notification_requests.notifications_from": "Известия от {name}",
+  "notification_requests.title": "Филтрирани известия",
  "notifications.clear": "Изчистване на известията",
  "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
  "notifications.column_settings.admin.report": "Нови доклади:",
@ -471,7 +508,15 @@
  "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
  "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
  "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
  "notifications.policy.filter_new_accounts_title": "Нови акаунти",
+  "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
+  "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
+  "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
+  "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+  "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
+  "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+  "notifications.policy.title": "Да се филтрират известия от…",
  "notifications_permission_banner.enable": "Включване на известията на работния плот",
  "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
  "notifications_permission_banner.title": "Никога не пропускайте нищо",
@ -609,7 +654,7 @@
  "search.quick_action.go_to_hashtag": "Към хаштаг {x}",
  "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
  "search.quick_action.status_search": "Съвпадение на публикации {x}",
-  "search.search_or_paste": "Търсене или поставяне на URL адрес",
+  "search.search_or_paste": "Търсене/поставяне на URL",
  "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
  "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
  "search_popout.language_code": "Код на езика по ISO",
@ -648,10 +693,11 @@
  "status.direct": "Частно споменаване на @{name}",
  "status.direct_indicator": "Частно споменаване",
  "status.edit": "Редактиране",
-  "status.edited": "Редактирано на {date}",
+  "status.edited": "Последно редактирано на {date}",
  "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
  "status.embed": "Вграждане",
  "status.favourite": "Любимо",
+  "status.favourites": "{count, plural, one {любимо} other {любими}}",
  "status.filter": "Филтриране на публ.",
  "status.filtered": "Филтрирано",
  "status.hide": "Скриване на публ.",
@ -672,6 +718,7 @@
  "status.reblog": "Подсилване",
  "status.reblog_private": "Подсилване с оригиналната видимост",
  "status.reblogged_by": "{name} подсили",
+  "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
  "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
  "status.redraft": "Изтриване и преначертаване",
  "status.remove_bookmark": "Премахване на отметката",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -148,9 +148,7 @@
  "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
  "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
  "confirmation_modal.cancel": "বাতিল করুন",
-  "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
  "confirmations.block.confirm": "ব্লক করুন",
-  "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
  "confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
  "confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
  "confirmations.delete.confirm": "মুছে ফেলুন",
@ -159,15 +157,12 @@
  "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
  "confirmations.discard_edit_media.confirm": "বাতিল করো",
  "confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
-  "confirmations.domain_block.confirm": "এই ডোমেন থেকে সব লুকান",
  "confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
  "confirmations.edit.confirm": "সম্পাদন",
  "confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
  "confirmations.logout.confirm": "প্রস্থান",
  "confirmations.logout.message": "আপনি লগ আউট করতে চান?",
  "confirmations.mute.confirm": "সরিয়ে ফেলুন",
-  "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.",
-  "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
  "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
  "confirmations.reply.confirm": "মতামত",
  "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
@ -302,9 +297,6 @@
  "lists.subheading": "আপনার তালিকা",
  "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
  "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
-  "mute_modal.duration": "সময়কাল",
-  "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
-  "mute_modal.indefinite": "অনির্দিষ্ট",
  "navigation_bar.about": "পরিচিতি",
  "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
  "navigation_bar.bookmarks": "বুকমার্ক",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -87,6 +87,8 @@
  "announcement.announcement": "Kemennad",
  "attachments_list.unprocessed": "(ket meret)",
  "audio.hide": "Kuzhat ar c'hleved",
+  "block_modal.show_less": "Diskouez nebeutoc'h",
+  "block_modal.show_more": "Diskouez muioc'h",
  "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
  "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
  "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@ -157,9 +159,7 @@
  "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
  "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
  "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
  "confirmations.block.confirm": "Stankañ",
-  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
  "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
  "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
  "confirmations.delete.confirm": "Dilemel",
@ -168,14 +168,11 @@
  "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
  "confirmations.discard_edit_media.confirm": "Nac'hañ",
  "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
-  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
  "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
  "confirmations.edit.confirm": "Kemmañ",
  "confirmations.logout.confirm": "Digevreañ",
  "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
  "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
-  "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
  "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
  "confirmations.reply.confirm": "Respont",
  "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
@ -198,6 +195,8 @@
  "dismissable_banner.dismiss": "Diverkañ",
  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.server": "Dafariad",
+  "domain_pill.username": "Anv-implijer",
  "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
  "embed.preview": "Setu penaos e teuio war wel :",
  "emoji_button.activity": "Obererezh",
@ -366,9 +365,6 @@
  "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
  "loading_indicator.label": "O kargañ…",
  "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
-  "mute_modal.duration": "Padelezh",
-  "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
-  "mute_modal.indefinite": "Amstrizh",
  "navigation_bar.about": "Diwar-benn",
  "navigation_bar.blocks": "Implijer·ezed·ien berzet",
  "navigation_bar.bookmarks": "Sinedoù",
@ -584,7 +580,7 @@
  "status.direct": "Menegiñ @{name} ent-prevez",
  "status.direct_indicator": "Meneg prevez",
  "status.edit": "Kemmañ",
-  "status.edited": "Aozet {date}",
+  "status.edited": "Kemmet da ziwezhañ d'an {date}",
  "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
  "status.embed": "Enframmañ",
  "status.favourite": "Muiañ-karet",
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@ -11,7 +11,6 @@
  "compose_form.spoiler.marked": "Text is hidden behind warning",
  "compose_form.spoiler.unmarked": "Text is not hidden",
  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
  "embed.instructions": "Embed this status on your website by copying the code below.",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Anunci",
  "attachments_list.unprocessed": "(sense processar)",
  "audio.hide": "Amaga l'àudio",
+  "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
+  "block_modal.show_less": "Mostra'n menys",
+  "block_modal.show_more": "Mostra'n més",
+  "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
+  "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
+  "block_modal.they_will_know": "Poden veure que els heu blocat.",
+  "block_modal.title": "Bloquem l'usuari?",
+  "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
  "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
  "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
  "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
  "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
  "confirmation_modal.cancel": "Cancel·la",
-  "confirmations.block.block_and_report": "Bloca i denuncia",
  "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Segur que vols blocar a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
  "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
  "confirmations.delete.confirm": "Elimina",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
  "confirmations.discard_edit_media.confirm": "Descarta",
  "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
-  "confirmations.domain_block.confirm": "Bloca el domini sencer",
+  "confirmations.domain_block.confirm": "Bloca el servidor",
  "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
  "confirmations.edit.confirm": "Edita",
  "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
  "confirmations.logout.confirm": "Tanca la sessió",
  "confirmations.logout.message": "Segur que vols tancar la sessió?",
  "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.",
-  "confirmations.mute.message": "Segur que vols silenciar {name}?",
  "confirmations.redraft.confirm": "Esborra i reescriu",
  "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
  "confirmations.reply.confirm": "Respon",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.",
  "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
  "dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.",
+  "domain_block_modal.block": "Bloca el servidor",
+  "domain_block_modal.block_account_instead": "En lloc d'això, bloca @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Els usuaris d'aquest servidor poden interactuar amb les vostres publicacions antigues.",
+  "domain_block_modal.they_cant_follow": "Ningú d'aquest servidor us pot seguir.",
+  "domain_block_modal.they_wont_know": "No sabran que són blocats.",
+  "domain_block_modal.title": "Bloquem el domini?",
+  "domain_block_modal.you_will_lose_followers": "S'eliminaran tots els vostres seguidors d'aquest servidor.",
+  "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
+  "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
+  "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "El seu identificador:",
+  "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
+  "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
+  "domain_pill.username": "Nom d'usuari",
+  "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
+  "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button>.",
+  "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button> poden interactuar amb vosaltres.",
+  "domain_pill.your_handle": "El vostre identificador:",
+  "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
+  "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
  "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
  "embed.preview": "Aquest aspecte tindrà:",
  "emoji_button.activity": "Activitat",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Es carrega…",
  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
  "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
-  "mute_modal.indefinite": "Indefinit",
+  "mute_modal.hide_from_notifications": "Amaga de les notificacions",
+  "mute_modal.hide_options": "Amaga les opcions",
+  "mute_modal.indefinite": "Fins que els deixi de silenciar",
+  "mute_modal.show_options": "Mostra les opcions",
+  "mute_modal.they_can_mention_and_follow": "Us poden esmentar i seguir, però no els veureu.",
+  "mute_modal.they_wont_know": "No sabran que són silenciats.",
+  "mute_modal.title": "Silenciem l'usuari?",
+  "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
+  "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
  "navigation_bar.about": "Quant a",
  "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
  "navigation_bar.blocks": "Usuaris blocats",
@ -662,10 +693,11 @@
  "status.direct": "Menciona privadament @{name}",
  "status.direct_indicator": "Menció privada",
  "status.edit": "Edita",
-  "status.edited": "Editat {date}",
+  "status.edited": "Darrera edició {date}",
  "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
  "status.embed": "Incrusta",
  "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favorits}}",
  "status.filter": "Filtra aquest tut",
  "status.filtered": "Filtrada",
  "status.hide": "Amaga el tut",
@ -686,6 +718,7 @@
  "status.reblog": "Impulsa",
  "status.reblog_private": "Impulsa amb la visibilitat original",
  "status.reblogged_by": "impulsat per {name}",
+  "status.reblogs": "{count, plural, one {# impuls} other {# impulsos}}",
  "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
  "status.redraft": "Esborra i reescriu",
  "status.remove_bookmark": "Elimina el marcador",
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
  "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
  "confirmation_modal.cancel": "هەڵوەشاندنەوه",
-  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
  "confirmations.block.confirm": "بلۆک",
-  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
  "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
  "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
  "confirmations.delete.confirm": "سڕینەوە",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
  "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
  "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
-  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
  "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
  "confirmations.edit.confirm": "دەستکاری",
  "confirmations.edit.message": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
  "confirmations.logout.confirm": "چوونە دەرەوە",
  "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
  "confirmations.mute.confirm": "بێدەنگ",
-  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
-  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
  "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
  "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
  "confirmations.reply.confirm": "وەڵام",
@ -370,9 +365,6 @@
  "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
  "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
  "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
-  "mute_modal.duration": "ماوە",
-  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
-  "mute_modal.indefinite": "نادیار",
  "navigation_bar.about": "دەربارە",
  "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
  "navigation_bar.bookmarks": "نیشانکراوەکان",
@ -559,7 +551,6 @@
  "status.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
  "status.direct_indicator": "ئاماژەی تایبەت",
  "status.edit": "دەستکاری",
-  "status.edited": "بەشداری {date}",
  "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
  "status.embed": "نیشتەجێ بکە",
  "status.filter": "ئەم پۆستە فلتەر بکە",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -86,21 +86,16 @@
  "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
  "compose_form.spoiler.unmarked": "Testu micca piattatu",
  "confirmation_modal.cancel": "Annullà",
-  "confirmations.block.block_and_report": "Bluccà è signalà",
  "confirmations.block.confirm": "Bluccà",
-  "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
  "confirmations.delete.confirm": "Toglie",
  "confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
  "confirmations.delete_list.confirm": "Toglie",
  "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
  "confirmations.discard_edit_media.confirm": "Scartà",
-  "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
  "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
  "confirmations.logout.confirm": "Scunnettassi",
  "confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
  "confirmations.mute.confirm": "Piattà",
-  "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.",
-  "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
  "confirmations.redraft.confirm": "Sguassà è riscrive",
  "confirmations.reply.confirm": "Risponde",
  "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
@ -226,9 +221,6 @@
  "lists.subheading": "E vo liste",
  "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
  "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
-  "mute_modal.indefinite": "Indifinita",
  "navigation_bar.blocks": "Utilizatori bluccati",
  "navigation_bar.bookmarks": "Segnalibri",
  "navigation_bar.community_timeline": "Linea pubblica lucale",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
  "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
  "confirmation_modal.cancel": "Zrušit",
-  "confirmations.block.block_and_report": "Blokovat a nahlásit",
  "confirmations.block.confirm": "Blokovat",
-  "confirmations.block.message": "Opravdu chcete blokovat {name}?",
  "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
  "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
  "confirmations.delete.confirm": "Smazat",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
  "confirmations.discard_edit_media.confirm": "Zahodit",
  "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
-  "confirmations.domain_block.confirm": "Blokovat celou doménu",
  "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
  "confirmations.edit.confirm": "Upravit",
  "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
  "confirmations.logout.confirm": "Odhlásit se",
  "confirmations.logout.message": "Opravdu se chcete odhlásit?",
  "confirmations.mute.confirm": "Skrýt",
-  "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
-  "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
  "confirmations.redraft.confirm": "Smazat a přepsat",
  "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
  "confirmations.reply.confirm": "Odpovědět",
@ -399,9 +394,6 @@
  "loading_indicator.label": "Načítání…",
  "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
  "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
-  "mute_modal.duration": "Trvání",
-  "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
-  "mute_modal.indefinite": "Neomezeně",
  "navigation_bar.about": "O aplikaci",
  "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
  "navigation_bar.blocks": "Blokovaní uživatelé",
@ -646,7 +638,6 @@
  "status.direct": "Soukromě zmínit @{name}",
  "status.direct_indicator": "Soukromá zmínka",
  "status.edit": "Upravit",
-  "status.edited": "Upraveno {date}",
  "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
  "status.embed": "Vložit na web",
  "status.favourite": "Oblíbit",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
  "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
  "confirmation_modal.cancel": "Diddymu",
-  "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
  "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
  "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
  "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
  "confirmations.delete.confirm": "Dileu",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
  "confirmations.discard_edit_media.confirm": "Dileu",
  "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Blocio parth cyfan",
  "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
  "confirmations.edit.confirm": "Golygu",
  "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
  "confirmations.logout.confirm": "Allgofnodi",
  "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
  "confirmations.mute.confirm": "Tewi",
-  "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
  "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
  "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
  "confirmations.reply.confirm": "Ateb",
@ -401,9 +396,6 @@
  "loading_indicator.label": "Yn llwytho…",
  "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
  "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
-  "mute_modal.duration": "Hyd",
-  "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
-  "mute_modal.indefinite": "Parhaus",
  "navigation_bar.about": "Ynghylch",
  "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
  "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@ -661,7 +653,6 @@
  "status.direct": "Crybwyll yn breifat @{name}",
  "status.direct_indicator": "Crybwyll preifat",
  "status.edit": "Golygu",
-  "status.edited": "Golygwyd {date}",
  "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
  "status.embed": "Mewnblannu",
  "status.favourite": "Hoffi",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Bekendtgørelse",
  "attachments_list.unprocessed": "(ubehandlet)",
  "audio.hide": "Skjul lyd",
+  "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis flere",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+  "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
+  "block_modal.title": "Blokér bruger?",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
  "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
  "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
  "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
  "confirmation_modal.cancel": "Afbryd",
-  "confirmations.block.block_and_report": "Blokér og Anmeld",
  "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
  "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
  "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
  "confirmations.delete.confirm": "Slet",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
  "confirmations.discard_edit_media.confirm": "Kassér",
  "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
-  "confirmations.domain_block.confirm": "Blokér hele domænet",
+  "confirmations.domain_block.confirm": "Blokér server",
  "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
  "confirmations.edit.confirm": "Redigér",
  "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
  "confirmations.logout.confirm": "Log ud",
  "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
  "confirmations.mute.confirm": "Skjul (mute)",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
-  "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
  "confirmations.redraft.confirm": "Slet og omformulér",
  "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
  "confirmations.reply.confirm": "Svar",
@ -205,6 +209,25 @@
  "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
  "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
  "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
+  "domain_block_modal.block": "Blokér server",
+  "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
+  "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
+  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.title": "Blokér domæne?",
+  "domain_block_modal.you_will_lose_followers": "Alle følgerne fra denne server fjernes.",
+  "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
+  "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deres handle:",
+  "domain_pill.username": "Brugernavn",
+  "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
+  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.your_handle": "Dit handle:",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+  "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
  "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
  "embed.preview": "Sådan kommer det til at se ud:",
  "emoji_button.activity": "Aktivitet",
@ -402,9 +425,15 @@
  "loading_indicator.label": "Indlæser…",
  "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
  "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
-  "mute_modal.duration": "Varighed",
-  "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
-  "mute_modal.indefinite": "Tidsubegrænset",
+  "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
+  "mute_modal.hide_options": "Skjul valgmuligheder",
+  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.show_options": "Vis valgmuligheder",
+  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+  "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+  "mute_modal.title": "Tavsgør bruger?",
+  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+  "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
  "navigation_bar.about": "Om",
  "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
  "navigation_bar.blocks": "Blokerede brugere",
@ -662,10 +691,11 @@
  "status.direct": "Privat omtale @{name}",
  "status.direct_indicator": "Privat omtale",
  "status.edit": "Redigér",
-  "status.edited": "Redigeret {date}",
+  "status.edited": "Senest redigeret {date}",
  "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
  "status.embed": "Indlejr",
  "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
  "status.filter": "Filtrér dette indlæg",
  "status.filtered": "Filtreret",
  "status.hide": "Skjul indlæg",
@ -686,6 +716,7 @@
  "status.reblog": "Fremhæv",
  "status.reblog_private": "Boost med oprindelig synlighed",
  "status.reblogged_by": "{name} fremhævede",
+  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
  "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
  "status.redraft": "Slet og omformulér",
  "status.remove_bookmark": "Fjern bogmærke",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Ankündigung",
  "attachments_list.unprocessed": "(ausstehend)",
  "audio.hide": "Audio ausblenden",
+  "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
+  "block_modal.show_less": "Weniger anzeigen",
+  "block_modal.show_more": "Mehr anzeigen",
+  "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
+  "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
+  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+  "block_modal.title": "Profil blockieren?",
+  "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
  "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
  "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
  "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
  "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
  "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
  "confirmations.block.confirm": "Blockieren",
-  "confirmations.block.message": "Möchtest du {name} wirklich blockieren?",
  "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
  "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
  "confirmations.delete.confirm": "Löschen",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
  "confirmations.discard_edit_media.confirm": "Verwerfen",
  "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
-  "confirmations.domain_block.confirm": "Domain blockieren",
+  "confirmations.domain_block.confirm": "Server blockieren",
  "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
  "confirmations.edit.confirm": "Bearbeiten",
  "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
  "confirmations.logout.confirm": "Abmelden",
  "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
  "confirmations.mute.confirm": "Stummschalten",
-  "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
-  "confirmations.mute.message": "Möchtest du {name} wirklich stummschalten?",
  "confirmations.redraft.confirm": "Löschen und neu erstellen",
  "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
  "confirmations.reply.confirm": "Antworten",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
  "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
  "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "domain_block_modal.block": "Server blockieren",
+  "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
+  "domain_block_modal.they_cant_follow": "Niemand von diesem Server wird dir folgen können.",
+  "domain_block_modal.they_wont_know": "Es wird nicht erkennbar sein, dass diese Domain blockiert wurde.",
+  "domain_block_modal.title": "Domain blockieren?",
+  "domain_block_modal.you_will_lose_followers": "Alle Follower von diesem Server werden entfernt.",
+  "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
+  "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
+  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deren Adresse:",
+  "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "domain_pill.username": "Profilname",
+  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.your_handle": "Deine Adresse:",
+  "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
  "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
  "embed.preview": "Vorschau:",
  "emoji_button.activity": "Aktivitäten",
@ -284,7 +309,7 @@
  "follow_suggestions.dismiss": "Nicht mehr anzeigen",
  "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
  "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
-  "follow_suggestions.hints.most_followed": "Dieses Profil wird von den meisten auf {domain} gefolgt.",
+  "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
  "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
  "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
  "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Wird geladen …",
  "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
  "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
-  "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?",
-  "mute_modal.indefinite": "Unbegrenzt",
+  "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
+  "mute_modal.hide_options": "Einstellungen ausblenden",
+  "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+  "mute_modal.show_options": "Einstellungen anzeigen",
+  "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
+  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+  "mute_modal.title": "Profil stummschalten?",
+  "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
  "navigation_bar.about": "Über",
  "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
  "navigation_bar.blocks": "Blockierte Profile",
@ -662,10 +693,11 @@
  "status.direct": "@{name} privat erwähnen",
  "status.direct_indicator": "Private Erwähnung",
  "status.edit": "Beitrag bearbeiten",
-  "status.edited": "Bearbeitet {date}",
+  "status.edited": "Zuletzt am {date} bearbeitet",
  "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
  "status.embed": "Beitrag per iFrame einbetten",
  "status.favourite": "Favorisieren",
+  "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
  "status.filter": "Beitrag filtern",
  "status.filtered": "Gefiltert",
  "status.hide": "Beitrag ausblenden",
@ -686,6 +718,7 @@
  "status.reblog": "Teilen",
  "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
  "status.reblogged_by": "{name} teilte",
+  "status.reblogs": "{count, plural, one {Mal geteilt} other {Mal geteilt}}",
  "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
  "status.redraft": "Löschen und neu erstellen",
  "status.remove_bookmark": "Lesezeichen entfernen",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -154,9 +154,7 @@
  "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
  "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
  "confirmation_modal.cancel": "Άκυρο",
-  "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
  "confirmations.block.confirm": "Αποκλεισμός",
-  "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
  "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
  "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
  "confirmations.delete.confirm": "Διαγραφή",
@ -165,15 +163,12 @@
  "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
  "confirmations.discard_edit_media.confirm": "Απόρριψη",
  "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
-  "confirmations.domain_block.confirm": "Αποκλεισμός ολόκληρου του τομέα",
  "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
  "confirmations.edit.confirm": "Επεξεργασία",
  "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
  "confirmations.logout.confirm": "Αποσύνδεση",
  "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
  "confirmations.mute.confirm": "Αποσιώπηση",
-  "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
-  "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
  "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
  "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
  "confirmations.reply.confirm": "Απάντησε",
@ -366,9 +361,6 @@
  "loading_indicator.label": "Φόρτωση…",
  "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
  "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
-  "mute_modal.duration": "Διάρκεια",
-  "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
-  "mute_modal.indefinite": "Επ᾽ αόριστον",
  "navigation_bar.about": "Σχετικά με",
  "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
  "navigation_bar.bookmarks": "Σελιδοδείκτες",
@ -586,7 +578,6 @@
  "status.direct": "Ιδιωτική επισήμανση @{name}",
  "status.direct_indicator": "Ιδιωτική επισήμανση",
  "status.edit": "Επεξεργασία",
-  "status.edited": "Επεξεργάστηκε στις {date}",
  "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
  "status.embed": "Ενσωμάτωσε",
  "status.favourite": "Αγαπημένα",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "Add content warning",
  "compose_form.spoiler_placeholder": "Content warning (optional)",
  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
  "confirmations.cancel_follow_request.confirm": "Withdraw request",
  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
  "confirmations.delete.confirm": "Delete",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
  "confirmations.discard_edit_media.confirm": "Discard",
  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
  "confirmations.edit.confirm": "Edit",
  "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
  "confirmations.logout.confirm": "Log out",
  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
  "confirmations.redraft.confirm": "Delete & redraft",
  "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
  "confirmations.reply.confirm": "Reply",
@ -393,9 +388,6 @@
  "loading_indicator.label": "Loading…",
  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
  "navigation_bar.about": "About",
  "navigation_bar.advanced_interface": "Open in advanced web interface",
  "navigation_bar.blocks": "Blocked users",
@ -640,7 +632,6 @@
  "status.direct": "Privately mention @{name}",
  "status.direct_indicator": "Private mention",
  "status.edit": "Edit",
-  "status.edited": "Edited {date}",
  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
  "status.embed": "Embed",
  "status.favourite": "Favourite",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Announcement",
  "attachments_list.unprocessed": "(unprocessed)",
  "audio.hide": "Hide audio",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
  "boost_modal.combo": "You can press {combo} to skip this next time",
  "bundle_column_error.copy_stacktrace": "Copy error report",
  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Add content warning",
  "compose_form.spoiler_placeholder": "Content warning (optional)",
  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
  "confirmations.cancel_follow_request.confirm": "Withdraw request",
  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
  "confirmations.delete.confirm": "Delete",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
  "confirmations.discard_edit_media.confirm": "Discard",
  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
  "confirmations.edit.confirm": "Edit",
  "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
  "confirmations.logout.confirm": "Log out",
  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
  "confirmations.redraft.confirm": "Delete & redraft",
  "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
  "confirmations.reply.confirm": "Reply",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
  "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
  "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
  "embed.instructions": "Embed this post on your website by copying the code below.",
  "embed.preview": "Here is what it will look like:",
  "emoji_button.activity": "Activity",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Loading…",
  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
  "navigation_bar.about": "About",
  "navigation_bar.advanced_interface": "Open in advanced web interface",
  "navigation_bar.blocks": "Blocked users",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -152,9 +152,7 @@
  "compose_form.spoiler.marked": "Forigi la averton de enhavo",
  "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
  "confirmation_modal.cancel": "Nuligi",
-  "confirmations.block.block_and_report": "Bloki kaj raporti",
  "confirmations.block.confirm": "Bloki",
-  "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
  "confirmations.cancel_follow_request.confirm": "Eksigi peton",
  "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
  "confirmations.delete.confirm": "Forigi",
@ -163,15 +161,12 @@
  "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
  "confirmations.discard_edit_media.confirm": "Forĵeti",
  "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
-  "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
  "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
  "confirmations.edit.confirm": "Redakti",
  "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
  "confirmations.logout.confirm": "Adiaŭi",
  "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
  "confirmations.mute.confirm": "Silentigi",
-  "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
-  "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
  "confirmations.redraft.confirm": "Forigi kaj reskribi",
  "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
  "confirmations.reply.confirm": "Respondi",
@ -380,9 +375,6 @@
  "loading_indicator.label": "Ŝargado…",
  "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
  "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
-  "mute_modal.duration": "Daŭro",
-  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
-  "mute_modal.indefinite": "Nedifinita",
  "navigation_bar.about": "Pri",
  "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
  "navigation_bar.blocks": "Blokitaj uzantoj",
@ -617,7 +609,6 @@
  "status.direct": "Private mencii @{name}",
  "status.direct_indicator": "Privata mencio",
  "status.edit": "Redakti",
-  "status.edited": "Redaktita {date}",
  "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
  "status.embed": "Enkorpigi",
  "status.favourite": "Ŝatata",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Anuncio",
  "attachments_list.unprocessed": "[sin procesar]",
  "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
  "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
  "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
  "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y denunciar",
  "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
  "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
  "confirmations.delete.confirm": "Eliminar",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
  "confirmations.discard_edit_media.confirm": "Descartar",
  "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
  "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
  "confirmations.edit.confirm": "Editar",
  "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
  "confirmations.logout.confirm": "Cerrar sesión",
  "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Se ocultarán los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a ésta, pero todavía esta cuenta podrá ver tus mensajes o seguirte.",
-  "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
  "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
  "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
  "confirmations.reply.confirm": "Responder",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Estos son los mensajes que están ganando popularidad en la web social, hoy mismo. Los mensajes más recientes con más adhesiones y marcados como favoritos obtienen más exposición.",
  "dismissable_banner.explore_tags": "Estas son etiquetas que están ganando popularidad en la web social, hoy mismo. Las etiquetas que son usadas por diferentes cuentas obtienen más exposición.",
  "dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de cuentas en la web social que las personas en {domain} siguen.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las cuentas de este servidor pueden interactuar con tus mensajes antiguos.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
  "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
  "embed.preview": "Así es cómo se verá:",
  "emoji_button.activity": "Actividad",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Cargando…",
  "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que fueron silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
  "navigation_bar.about": "Información",
  "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
  "navigation_bar.blocks": "Usuarios bloqueados",
@ -662,10 +693,11 @@
  "status.direct": "Mención privada a @{name}",
  "status.direct_indicator": "Mención privada",
  "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición: {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
  "status.embed": "Insertar",
  "status.favourite": "Marcar como favorito",
+  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
  "status.filter": "Filtrar este mensaje",
  "status.filtered": "Filtrado",
  "status.hide": "Ocultar mensaje",
@ -686,6 +718,7 @@
  "status.reblog": "Adherir",
  "status.reblog_private": "Adherir a la audiencia original",
  "status.reblogged_by": "{name} adhirió",
+  "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
  "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
  "status.redraft": "Eliminar mensaje original y editarlo",
  "status.remove_bookmark": "Quitar marcador",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Anuncio",
  "attachments_list.unprocessed": "(sin procesar)",
  "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
  "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
  "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Texto no oculto",
  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
  "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Denunciar",
  "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
  "confirmations.delete.confirm": "Eliminar",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
  "confirmations.discard_edit_media.confirm": "Descartar",
  "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
  "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
  "confirmations.edit.confirm": "Editar",
  "confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
  "confirmations.logout.confirm": "Cerrar sesión",
  "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
  "confirmations.redraft.confirm": "Borrar y volver a borrador",
  "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
  "confirmations.reply.confirm": "Responder",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Estas son las publicaciones que están en tendencia en la red ahora. Las publicaciones recientes con más impulsos y favoritos se muestran más arriba.",
  "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
  "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Todos tus seguidores de este servidor serán eliminados.",
+  "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
  "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
  "embed.preview": "Así es como se verá:",
  "emoji_button.activity": "Actividad",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Cargando…",
  "media_gallery.toggle_visible": "Cambiar visibilidad",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
  "navigation_bar.about": "Acerca de",
  "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
  "navigation_bar.blocks": "Usuarios bloqueados",
@ -662,10 +693,11 @@
  "status.direct": "Mención privada @{name}",
  "status.direct_indicator": "Mención privada",
  "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
  "status.embed": "Incrustado",
  "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
  "status.filter": "Filtrar esta publicación",
  "status.filtered": "Filtrado",
  "status.hide": "Ocultar toot",
@ -686,6 +718,7 @@
  "status.reblog": "Retootear",
  "status.reblog_private": "Implusar a la audiencia original",
  "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
  "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
  "status.redraft": "Borrar y volver a borrador",
  "status.remove_bookmark": "Eliminar marcador",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Anuncio",
  "attachments_list.unprocessed": "(sin procesar)",
  "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
  "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
  "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
  "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Reportar",
  "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
  "confirmations.delete.confirm": "Eliminar",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
  "confirmations.discard_edit_media.confirm": "Descartar",
  "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear todo el dominio",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
  "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
  "confirmations.edit.confirm": "Editar",
  "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
  "confirmations.logout.confirm": "Cerrar sesión",
  "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá sus publicaciones y las publicaciones que los mencionen, pero podrán seguir viendo tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Seguro que quieres silenciar a {name}?",
  "confirmations.redraft.confirm": "Borrar y volver a borrador",
  "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
  "confirmations.reply.confirm": "Responder",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
  "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
  "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
  "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
  "embed.preview": "Así es como se verá:",
  "emoji_button.activity": "Actividad",
@ -238,11 +263,11 @@
  "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
  "empty_column.hashtag": "No hay nada en este hashtag aún.",
  "empty_column.home": "¡Tu línea temporal está vacía! Sigue a más personas para rellenarla.",
-  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
-  "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
+  "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos estados, estos aparecerán aquí.",
+  "empty_column.lists": "No tienes ninguna lista. Cuando crees una, se mostrará aquí.",
  "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
-  "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
+  "empty_column.notifications": "Aún no tienes ninguna notificación. Cuando otras personas interactúen contigo, aparecerán aquí.",
  "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
  "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
  "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
@ -258,7 +283,7 @@
  "explore.trending_tags": "Etiquetas",
  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
  "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
-  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
  "filter_modal.added.expired_title": "¡Filtro caducado!",
  "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
  "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Cargando…",
  "media_gallery.toggle_visible": "Cambiar visibilidad",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
  "navigation_bar.about": "Acerca de",
  "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
  "navigation_bar.blocks": "Usuarios bloqueados",
@ -483,7 +514,7 @@
  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
  "notifications.policy.filter_not_following_title": "Personas que no sigues",
-  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
  "notifications.policy.title": "Filtrar notificaciones de…",
  "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
@ -662,10 +693,11 @@
  "status.direct": "Mención privada @{name}",
  "status.direct_indicator": "Mención privada",
  "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
  "status.embed": "Incrustado",
  "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
  "status.filter": "Filtrar esta publicación",
  "status.filtered": "Filtrado",
  "status.hide": "Ocultar publicación",
@ -686,6 +718,7 @@
  "status.reblog": "Impulsar",
  "status.reblog_private": "Impulsar a la audiencia original",
  "status.reblogged_by": "Impulsado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
  "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
  "status.redraft": "Borrar y volver a borrador",
  "status.remove_bookmark": "Eliminar marcador",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -89,6 +89,10 @@
  "announcement.announcement": "Teadaanne",
  "attachments_list.unprocessed": "(töötlemata)",
  "audio.hide": "Peida audio",
+  "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
+  "block_modal.show_less": "Kuva vähem",
+  "block_modal.show_more": "Kuva rohkem",
+  "block_modal.title": "Blokeeri kasutaja?",
  "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
  "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
  "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@ -160,9 +164,7 @@
  "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
  "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
  "confirmation_modal.cancel": "Katkesta",
-  "confirmations.block.block_and_report": "Blokeeri ja teata",
  "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
  "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
  "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
  "confirmations.delete.confirm": "Kustuta",
@ -171,15 +173,13 @@
  "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
  "confirmations.discard_edit_media.confirm": "Hülga",
  "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
-  "confirmations.domain_block.confirm": "Peida terve domeen",
+  "confirmations.domain_block.confirm": "Blokeeri server",
  "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
  "confirmations.edit.confirm": "Muuda",
  "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
  "confirmations.logout.confirm": "Välju",
  "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
  "confirmations.mute.confirm": "Vaigista",
-  "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.",
-  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
  "confirmations.redraft.confirm": "Kustuta & taasalusta",
  "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
  "confirmations.reply.confirm": "Vasta",
@ -205,6 +205,9 @@
  "dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.",
  "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
  "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
+  "domain_block_modal.block": "Blokeeri server",
+  "domain_pill.server": "Server",
+  "domain_pill.username": "Kasutajanimi",
  "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
  "embed.preview": "Nii näeb see välja:",
  "emoji_button.activity": "Tegevus",
@ -400,9 +403,8 @@
  "loading_indicator.label": "Laadimine…",
  "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
  "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
-  "mute_modal.duration": "Kestus",
-  "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
-  "mute_modal.indefinite": "Lõpmatu",
+  "mute_modal.hide_options": "Peida valikud",
+  "mute_modal.show_options": "Kuva valikud",
  "navigation_bar.about": "Teave",
  "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
  "navigation_bar.blocks": "Blokeeritud kasutajad",
@ -440,6 +442,8 @@
  "notification.reblog": "{name} jagas edasi postitust",
  "notification.status": "{name} just postitas",
  "notification.update": "{name} muutis postitust",
+  "notification_requests.accept": "Nõus",
+  "notification_requests.dismiss": "Hülga",
  "notifications.clear": "Puhasta teated",
  "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
  "notifications.column_settings.admin.report": "Uued teavitused:",
@ -471,6 +475,7 @@
  "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
  "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
  "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_new_accounts_title": "Uued kontod",
  "notifications_permission_banner.enable": "Luba töölaua märguanded",
  "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
  "notifications_permission_banner.title": "Ära jää millestki ilma",
@ -647,7 +652,6 @@
  "status.direct": "Maini privaatselt @{name}",
  "status.direct_indicator": "Privaatne mainimine",
  "status.edit": "Muuda",
-  "status.edited": "{date} muudetud",
  "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
  "status.embed": "Manustamine",
  "status.favourite": "Lemmik",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Iragarpena",
  "attachments_list.unprocessed": "(prozesatu gabe)",
  "audio.hide": "Ezkutatu audioa",
+  "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
+  "block_modal.show_less": "Erakutsi gutxiago",
+  "block_modal.show_more": "Erakutsi gehiago",
+  "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
+  "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
+  "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
+  "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
+  "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
  "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
  "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
  "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
  "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
  "confirmation_modal.cancel": "Utzi",
-  "confirmations.block.block_and_report": "Blokeatu eta salatu",
  "confirmations.block.confirm": "Blokeatu",
-  "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
  "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
  "confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
  "confirmations.delete.confirm": "Ezabatu",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
  "confirmations.discard_edit_media.confirm": "Baztertu",
  "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
-  "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
+  "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
  "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
  "confirmations.edit.confirm": "Editatu",
  "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
  "confirmations.logout.confirm": "Amaitu saioa",
  "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
  "confirmations.mute.confirm": "Mututu",
-  "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.",
-  "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
  "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
  "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
  "confirmations.reply.confirm": "Erantzun",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Hauek dira gaur egun lekua hartzen ari diren sare sozial osoaren argitalpenak. Bultzada eta gogoko gehien dituzten argitalpen berrienek sailkapen altuagoa dute.",
  "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
  "dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.",
+  "domain_block_modal.block": "Blokeatu zerbitzaria",
+  "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
+  "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
+  "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
+  "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
+  "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+  "domain_block_modal.you_will_lose_followers": "Zerbitzari honetako jarraitzaile guztiak kenduko dira.",
+  "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
+  "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
+  "domain_pill.server": "Zerbitzaria",
+  "domain_pill.their_handle": "Bere helbidea:",
+  "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
+  "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
+  "domain_pill.username": "Erabiltzaile-izena",
+  "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
+  "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, <button>ActivityPub darabilten plataformen</button> sare sozialeko jendearekin jar zaitezke harremanetan.",
+  "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea <button>ActivityPub darabilten plataformen</button> sare sozialen bitartez jar daiteke zurekin harremanetan.",
+  "domain_pill.your_handle": "Zure helbidea:",
+  "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
+  "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
  "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
  "embed.preview": "Hau da izango duen itxura:",
  "emoji_button.activity": "Jarduera",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Kargatzen…",
  "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
  "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
-  "mute_modal.duration": "Iraupena",
-  "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
-  "mute_modal.indefinite": "Zehaztu gabe",
+  "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
+  "mute_modal.hide_options": "Ezkutatu aukerak",
+  "mute_modal.indefinite": "Desmututua izan arte",
+  "mute_modal.show_options": "Erakutsi aukerak",
+  "mute_modal.they_can_mention_and_follow": "Aipa eta jarrai zaitzakete, baina ez dituzu ikusiko.",
+  "mute_modal.they_wont_know": "Ez dute jakingo mututuak izan direnik.",
+  "mute_modal.title": "Erabiltzailea mututu nahi duzu?",
+  "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
+  "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
  "navigation_bar.about": "Honi buruz",
  "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
  "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
@ -662,10 +693,11 @@
  "status.direct": "Aipatu pribatuki @{name}",
  "status.direct_indicator": "Aipamen pribatua",
  "status.edit": "Editatu",
-  "status.edited": "Editatua {date}",
+  "status.edited": "Azken edizioa: {date}",
  "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
  "status.embed": "Txertatu",
  "status.favourite": "Gogokoa",
+  "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
  "status.filter": "Iragazi bidalketa hau",
  "status.filtered": "Iragazita",
  "status.hide": "Tuta ezkutatu",
@ -686,6 +718,7 @@
  "status.reblog": "Bultzada",
  "status.reblog_private": "Bultzada jatorrizko hartzaileei",
  "status.reblogged_by": "{name}(r)en bultzada",
+  "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
  "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
  "status.redraft": "Ezabatu eta berridatzi",
  "status.remove_bookmark": "Kendu laster-marka",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
  "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
  "confirmation_modal.cancel": "لغو",
-  "confirmations.block.block_and_report": "انسداد و گزارش",
  "confirmations.block.confirm": "انسداد",
-  "confirmations.block.message": "مطمئنید که می‌خواهید {name} را مسدود کنید؟",
  "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
  "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
  "confirmations.delete.confirm": "حذف",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
  "confirmations.discard_edit_media.confirm": "دور انداختن",
  "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
-  "confirmations.domain_block.confirm": "انسداد تمام دامنه",
  "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
  "confirmations.edit.confirm": "ویرایش",
  "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
  "confirmations.logout.confirm": "خروج از حساب",
  "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
  "confirmations.mute.confirm": "خموش",
-  "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی‌گیری کنند.",
-  "confirmations.mute.message": "مطمئنید می‌خواهید {name} را بخموشانید؟",
  "confirmations.redraft.confirm": "حذف و بازنویسی",
  "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
  "confirmations.reply.confirm": "پاسخ",
@ -399,9 +394,6 @@
  "loading_indicator.label": "در حال بارگذاری…",
  "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
  "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
-  "mute_modal.duration": "مدت زمان",
-  "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کاربر؟",
-  "mute_modal.indefinite": "نامعلوم",
  "navigation_bar.about": "درباره",
  "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
  "navigation_bar.blocks": "کاربران مسدود شده",
@ -646,7 +638,6 @@
  "status.direct": "اشارهٔ خصوصی به ‪@{name}‬",
  "status.direct_indicator": "اشارهٔ خصوصی",
  "status.edit": "ویرایش",
-  "status.edited": "ویرایش شده در {date}",
  "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
  "status.embed": "جاسازی",
  "status.favourite": "برگزیده‌",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Tiedote",
  "attachments_list.unprocessed": "(käsittelemätön)",
  "audio.hide": "Piilota ääni",
+  "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
+  "block_modal.show_less": "Näytä vähemmän",
+  "block_modal.show_more": "Näytä enemmän",
+  "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+  "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+  "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
+  "block_modal.title": "Estetäänkö käyttäjä?",
+  "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
  "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
  "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
  "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
  "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
  "confirmation_modal.cancel": "Peruuta",
-  "confirmations.block.block_and_report": "Estä ja raportoi",
  "confirmations.block.confirm": "Estä",
-  "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
  "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
  "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
  "confirmations.delete.confirm": "Poista",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
  "confirmations.discard_edit_media.confirm": "Hylkää",
  "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
-  "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
+  "confirmations.domain_block.confirm": "Estä palvelin",
  "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
  "confirmations.edit.confirm": "Muokkaa",
  "confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
  "confirmations.logout.confirm": "Kirjaudu ulos",
  "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
  "confirmations.mute.confirm": "Mykistä",
-  "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
-  "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
  "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
  "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
  "confirmations.reply.confirm": "Vastaa",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
  "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "domain_block_modal.block": "Estä palvelin",
+  "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
+  "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+  "domain_block_modal.title": "Estetäänkö verkkotunnus?",
+  "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
+  "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
+  "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
+  "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
+  "domain_pill.server": "Palvelin",
+  "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+  "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
+  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+  "domain_pill.username": "Käyttäjänimi",
+  "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.your_handle": "Käyttäjänimesi:",
+  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
+  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
  "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
  "embed.preview": "Tältä se näyttää:",
  "emoji_button.activity": "Aktiviteetit",
@ -272,7 +297,7 @@
  "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
  "filter_modal.select_filter.title": "Suodata tämä julkaisu",
  "filter_modal.title.status": "Suodata julkaisu",
-  "filtered_notifications_banner.pending_requests": "Ilmoitukset, {count, plural, =0 {ei tänään} one {1 henkilö} other {# henkilöä}}",
+  "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
  "firehose.all": "Kaikki",
  "firehose.local": "Tämä palvelin",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Ladataan…",
  "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
  "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
-  "mute_modal.duration": "Kesto",
-  "mute_modal.hide_notifications": "Piilotetaanko tältä käyttäjältä tulevat ilmoitukset?",
-  "mute_modal.indefinite": "Ikuisesti",
+  "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
+  "mute_modal.hide_options": "Piilota valinnat",
+  "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
+  "mute_modal.show_options": "Näytä valinnat",
+  "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
+  "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+  "mute_modal.title": "Mykistetäänkö käyttäjä?",
+  "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
  "navigation_bar.about": "Tietoja",
  "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
  "navigation_bar.blocks": "Estetyt käyttäjät",
@ -483,7 +514,7 @@
  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
-  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaan tai jos seuraat lähettäjää",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
  "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
@ -662,10 +693,11 @@
  "status.direct": "Mainitse @{name} yksityisesti",
  "status.direct_indicator": "Yksityinen maininta",
  "status.edit": "Muokkaa",
-  "status.edited": "Muokattu {date}",
+  "status.edited": "Viimeksi muokattu {date}",
  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
  "status.embed": "Upota",
  "status.favourite": "Suosikki",
+  "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
  "status.filter": "Suodata tämä julkaisu",
  "status.filtered": "Suodatettu",
  "status.hide": "Piilota julkaisu",
@ -686,6 +718,7 @@
  "status.reblog": "Tehosta",
  "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
  "status.reblogged_by": "{name} tehosti",
+  "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
  "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
  "status.redraft": "Poista ja palauta muokattavaksi",
  "status.remove_bookmark": "Poista kirjanmerkki",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@ -106,16 +106,13 @@
  "compose_form.reply": "Tumugon",
  "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
  "confirmation_modal.cancel": "Pagpaliban",
-  "confirmations.block.block_and_report": "Harangan at i-ulat",
  "confirmations.block.confirm": "Harangan",
-  "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
  "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
  "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
  "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
  "confirmations.delete_list.confirm": "Tanggalin",
  "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
  "confirmations.discard_edit_media.confirm": "Ipagpaliban",
-  "confirmations.domain_block.confirm": "Harangan ang buong domain",
  "confirmations.edit.confirm": "Baguhin",
  "confirmations.reply.confirm": "Tumugon",
  "copy_icon_button.copied": "Sinipi sa clipboard",
@ -273,7 +270,6 @@
  "status.direct": "Palihim na banggitin si/ang @{name}",
  "status.direct_indicator": "Palihim na banggit",
  "status.edit": "Baguhin",
-  "status.edited": "Binago noong {date}",
  "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
  "status.history.created": "Nilikha ni/ng {name} {date}",
  "status.history.edited": "Binago ni/ng {name} {date}",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -89,6 +89,14 @@
  "announcement.announcement": "Kunngerð",
  "attachments_list.unprocessed": "(óviðgjørt)",
  "audio.hide": "Fjal ljóð",
+  "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
+  "block_modal.show_less": "Vís minni",
+  "block_modal.show_more": "Vís meiri",
+  "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
+  "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
+  "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
+  "block_modal.title": "Banna brúkara?",
+  "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
  "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
  "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
  "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@ -160,9 +168,7 @@
  "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
  "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
  "confirmation_modal.cancel": "Strika",
-  "confirmations.block.block_and_report": "Banna og melda",
  "confirmations.block.confirm": "Banna",
-  "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
  "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
  "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
  "confirmations.delete.confirm": "Strika",
@ -171,15 +177,13 @@
  "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
  "confirmations.discard_edit_media.confirm": "Vraka",
  "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
-  "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+  "confirmations.domain_block.confirm": "Banna ambætara",
  "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
  "confirmations.edit.confirm": "Rætta",
  "confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
  "confirmations.logout.confirm": "Rita út",
  "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
  "confirmations.mute.confirm": "Doyv",
-  "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
-  "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
  "confirmations.redraft.confirm": "Sletta og skriva umaftur",
  "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
  "confirmations.reply.confirm": "Svara",
@ -205,6 +209,27 @@
  "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.",
  "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
  "dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.",
+  "domain_block_modal.block": "Banna ambætara",
+  "domain_block_modal.block_account_instead": "Banna @{name} ístaðin",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá hesum ambætara kunnu svara tínum gomlu postum.",
+  "domain_block_modal.they_cant_follow": "Eingin frá hesum ambætara kann fylgja tær.",
+  "domain_block_modal.they_wont_know": "Tey vita ikki, at tey eru bannað.",
+  "domain_block_modal.title": "Banna økisnavni?",
+  "domain_block_modal.you_will_lose_followers": "Allir tínir fylgjarar á hesum ambætara hvørva.",
+  "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
+  "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
+  "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
+  "domain_pill.server": "Ambætari",
+  "domain_pill.their_handle": "Teirra hald:",
+  "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
+  "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+  "domain_pill.username": "Brúkaranavn",
+  "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
+  "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.your_handle": "Títt hald:",
+  "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
+  "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
  "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
  "embed.preview": "Soleiðis fer tað at síggja út:",
  "emoji_button.activity": "Virksemi",
@ -402,9 +427,15 @@
  "loading_indicator.label": "Innlesur…",
  "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
  "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
-  "mute_modal.duration": "Tíðarbil",
-  "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
-  "mute_modal.indefinite": "Óásett tíðarskeið",
+  "mute_modal.hide_from_notifications": "Fjal boð",
+  "mute_modal.hide_options": "Fjal valmøguleikar",
+  "mute_modal.indefinite": "Inntil eg tendri tey aftur",
+  "mute_modal.show_options": "Vís valmøguleikar",
+  "mute_modal.they_can_mention_and_follow": "Tey kunnu bæði nevna og fylgja tær, men tú sært ikki tey.",
+  "mute_modal.they_wont_know": "Tey vita ikki, at tey eru sløkt.",
+  "mute_modal.title": "Sløkk brúkara?",
+  "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
+  "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
  "navigation_bar.about": "Um",
  "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
  "navigation_bar.blocks": "Bannaðir brúkarar",
@ -662,10 +693,11 @@
  "status.direct": "Umrøð @{name} privat",
  "status.direct_indicator": "Privat umrøða",
  "status.edit": "Rætta",
-  "status.edited": "Rættað {date}",
+  "status.edited": "Seinast broytt {date}",
  "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
  "status.embed": "Legg inní",
  "status.favourite": "Dámdur postur",
+  "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
  "status.filter": "Filtrera hendan postin",
  "status.filtered": "Filtrerað",
  "status.hide": "Fjal post",
@ -686,6 +718,7 @@
  "status.reblog": "Stimbra",
  "status.reblog_private": "Stimbra við upprunasýni",
  "status.reblogged_by": "{name} stimbrað",
+  "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
  "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
  "status.redraft": "Strika & ger nýggja kladdu",
  "status.remove_bookmark": "Gloym",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@ -160,9 +160,7 @@
  "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
  "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
  "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
  "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
  "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
  "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
  "confirmations.delete.confirm": "Supprimer",
@ -171,15 +169,12 @@
  "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
  "confirmations.discard_edit_media.confirm": "Rejeter",
  "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
-  "confirmations.domain_block.confirm": "Bloquer ce domaine entier",
  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
  "confirmations.edit.confirm": "Éditer",
  "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
  "confirmations.logout.confirm": "Se déconnecter",
  "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
  "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
  "confirmations.redraft.confirm": "Supprimer et réécrire",
  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
  "confirmations.reply.confirm": "Répondre",
@ -271,6 +266,8 @@
  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
  "filter_modal.select_filter.title": "Filtrer cette publication",
  "filter_modal.title.status": "Filtrer une publication",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
  "firehose.all": "Tout",
  "firehose.local": "Ce serveur",
  "firehose.remote": "Autres serveurs",
@ -399,9 +396,6 @@
  "loading_indicator.label": "Chargement…",
  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
  "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
-  "mute_modal.indefinite": "Indéfinie",
  "navigation_bar.about": "À propos",
  "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
  "navigation_bar.blocks": "Comptes bloqués",
@ -646,7 +640,6 @@
  "status.direct": "Mention privée @{name}",
  "status.direct_indicator": "Mention privée",
  "status.edit": "Modifier",
-  "status.edited": "Modifiée le {date}",
  "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
  "status.embed": "Intégrer",
  "status.favourite": "Ajouter aux favoris",
--- a/Show more
+++ b/Show more