Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream

Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.
2024-11-22 07:08:07 +01:00 · 2024-11-03 20:51:58 +01:00 · 2024-11-03 20:51:58 +01:00 · f624ef2778
commit f624ef2778
parent e44a800887 b06fd54c30
201 changed files with 1941 additions and 736 deletions
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@ -124,7 +124,6 @@ jobs:
      fail-fast: false
      matrix:
        ruby-version:
          - '3.1'
          - '3.2'
          - '.ruby-version'
    steps:
@ -226,7 +225,6 @@ jobs:
      fail-fast: false
      matrix:
        ruby-version:
          - '3.1'
          - '3.2'
          - '.ruby-version'
    steps:
@ -305,7 +303,6 @@ jobs:
      fail-fast: false
      matrix:
        ruby-version:
          - '3.1'
          - '3.2'
          - '.ruby-version'
@ -422,7 +419,6 @@ jobs:
      fail-fast: false
      matrix:
        ruby-version:
          - '3.1'
          - '3.2'
          - '.ruby-version'
        search-image:
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-20.18
+22.11
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -8,7 +8,7 @@ AllCops:
    - lib/mastodon/migration_helpers.rb
  ExtraDetails: true
  NewCops: enable
-  TargetRubyVersion: 3.1 # Oldest supported ruby version
+  TargetRubyVersion: 3.2 # Oldest supported ruby version
 inherit_from:
  - .rubocop/layout.yml
--- a/4
+++ b/4
@ -15,7 +15,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 ARG RUBY_VERSION="3.3.5"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
-ARG NODE_MAJOR_VERSION="20"
+ARG NODE_MAJOR_VERSION="22"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
@ -191,7 +191,7 @@ FROM build AS libvips
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
-ARG VIPS_VERSION=8.15.5
+ARG VIPS_VERSION=8.16.0
 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
--- a/6
+++ b/6
@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
-ruby '>= 3.1.0'
+ruby '>= 3.2.0'
 gem 'propshaft'
 gem 'puma', '~> 6.3'
@ -16,10 +16,10 @@ gem 'pghero'
 gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'blurhash', '~> 0.1'
-gem 'fog-core', '<= 2.5.0'
+gem 'fog-core', '<= 2.6.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'jd-paperclip-azure', '~> 3.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
 gem 'ruby-vips', '~> 2.2', require: false
 gem 'active_model_serializers', '~> 0.10'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -10,35 +10,35 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.4.1)
+    actioncable (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.1.4.1)
+    actionmailbox (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      activejob (= 7.1.4.1)
+      activejob (= 7.1.4.2)
-      activerecord (= 7.1.4.1)
+      activerecord (= 7.1.4.2)
-      activestorage (= 7.1.4.1)
+      activestorage (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.4.1)
+    actionmailer (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      actionview (= 7.1.4.1)
+      actionview (= 7.1.4.2)
-      activejob (= 7.1.4.1)
+      activejob (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.4.1)
+    actionpack (7.1.4.2)
-      actionview (= 7.1.4.1)
+      actionview (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@ -46,15 +46,15 @@ GEM
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.4.1)
+    actiontext (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      activerecord (= 7.1.4.1)
+      activerecord (= 7.1.4.2)
-      activestorage (= 7.1.4.1)
+      activestorage (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.4.1)
+    actionview (7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@ -64,22 +64,22 @@ GEM
      activemodel (>= 4.1)
      case_transform (>= 0.2)
      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.4.1)
+    activejob (7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      globalid (>= 0.3.6)
-    activemodel (7.1.4.1)
+    activemodel (7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
-    activerecord (7.1.4.1)
+    activerecord (7.1.4.2)
-      activemodel (= 7.1.4.1)
+      activemodel (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      timeout (>= 0.4.0)
-    activestorage (7.1.4.1)
+    activestorage (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      activejob (= 7.1.4.1)
+      activejob (= 7.1.4.2)
-      activerecord (= 7.1.4.1)
+      activerecord (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      marcel (~> 1.0)
-    activesupport (7.1.4.1)
+    activesupport (7.1.4.2)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@ -100,8 +100,8 @@ GEM
    attr_required (1.0.2)
    awrence (1.2.1)
    aws-eventstream (1.3.0)
-    aws-partitions (1.992.0)
+    aws-partitions (1.997.0)
-    aws-sdk-core (3.210.0)
+    aws-sdk-core (3.211.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@ -113,16 +113,10 @@ GEM
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.0)
+    aws-sigv4 (1.10.1)
      aws-eventstream (~> 1, >= 1.0.2)
-    azure-storage-blob (2.0.3)
+    azure-blob (0.5.2)
-      azure-storage-common (~> 2.0)
+      rexml
      nokogiri (~> 1, >= 1.10.8)
    azure-storage-common (2.0.4)
      faraday (~> 1.0)
      faraday_middleware (~> 1.0, >= 1.0.0.rc1)
      net-http-persistent (~> 4.0)
      nokogiri (~> 1, >= 1.10.8)
    base64 (0.2.0)
    bcp47_spec (0.2.1)
    bcrypt (3.1.20)
@ -179,7 +173,7 @@ GEM
      bigdecimal
      rexml
    crass (1.0.6)
-    css_parser (1.19.0)
+    css_parser (1.19.1)
      addressable
    csv (3.3.0)
    database_cleaner-active_record (2.2.0)
@ -231,7 +225,7 @@ GEM
    erubi (1.13.0)
    et-orbi (1.2.11)
      tzinfo
-    excon (0.111.0)
+    excon (0.112.0)
    fabrication (2.31.0)
    faker (3.5.1)
      i18n (>= 1.8.11, < 2)
@ -258,11 +252,9 @@ GEM
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
    fast_blank (1.0.1)
    fastimage (2.3.1)
-    ffi (1.16.3)
+    ffi (1.17.0)
    ffi-compiler (1.3.2)
      ffi (>= 1.15.5)
      rake
@ -350,8 +342,12 @@ GEM
    irb (1.14.1)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jd-paperclip-azure (3.0.0)
      addressable (~> 2.5)
      azure-blob (~> 0.5.2)
      hashie (~> 5.0)
    jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.4)
    json-canonicalization (1.0.0)
    json-jwt (1.15.3.1)
      activesupport (>= 4.2)
@ -412,7 +408,7 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@ -424,10 +420,6 @@ GEM
    mario-redis-lock (1.2.1)
      redis (>= 3.0.5)
    matrix (0.4.2)
    md-paperclip-azure (2.2.0)
      addressable (~> 2.5)
      azure-storage-blob (~> 2.0.1)
      hashie (~> 5.0)
    memory_profiler (1.1.0)
    mime-types (3.6.0)
      logger
@ -436,15 +428,13 @@ GEM
    mini_mime (1.1.5)
    mini_portile2 (2.8.7)
    minitest (5.25.1)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
    multi_json (1.15.0)
    multipart-post (2.4.1)
    mutex_m (0.2.0)
    net-http (0.4.1)
      uri
-    net-http-persistent (4.0.2)
+    net-imap (0.5.0)
      connection_pool (~> 2.2)
    net-imap (0.4.15)
      date
      net-protocol
    net-ldap (0.19.0)
@ -639,20 +629,20 @@ GEM
    rackup (1.0.0)
      rack (< 3)
      webrick
-    rails (7.1.4.1)
+    rails (7.1.4.2)
-      actioncable (= 7.1.4.1)
+      actioncable (= 7.1.4.2)
-      actionmailbox (= 7.1.4.1)
+      actionmailbox (= 7.1.4.2)
-      actionmailer (= 7.1.4.1)
+      actionmailer (= 7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      actiontext (= 7.1.4.1)
+      actiontext (= 7.1.4.2)
-      actionview (= 7.1.4.1)
+      actionview (= 7.1.4.2)
-      activejob (= 7.1.4.1)
+      activejob (= 7.1.4.2)
-      activemodel (= 7.1.4.1)
+      activemodel (= 7.1.4.2)
-      activerecord (= 7.1.4.1)
+      activerecord (= 7.1.4.2)
-      activestorage (= 7.1.4.1)
+      activestorage (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      bundler (>= 1.15.0)
-      railties (= 7.1.4.1)
+      railties (= 7.1.4.2)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@ -664,12 +654,12 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+    rails-i18n (7.0.10)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
-    railties (7.1.4.1)
+    railties (7.1.4.2)
-      actionpack (= 7.1.4.1)
+      actionpack (= 7.1.4.2)
-      activesupport (= 7.1.4.1)
+      activesupport (= 7.1.4.2)
      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
@ -699,9 +689,9 @@ GEM
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
    rotp (6.3.0)
-    rouge (4.3.0)
+    rouge (4.4.0)
    rpam2 (4.0.2)
    rqrcode (2.2.0)
      chunky_png (~> 1.0)
@ -711,14 +701,14 @@ GEM
      rspec-core (~> 3.13.0)
      rspec-expectations (~> 3.13.0)
      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
    rspec-github (2.4.0)
      rspec-core (~> 3.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
    rspec-rails (7.0.1)
@ -752,12 +742,12 @@ GEM
    rubocop-performance (1.22.1)
      rubocop (>= 1.48.1, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.27.0)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.52.0, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.1.0)
+    rubocop-rspec (3.2.0)
      rubocop (~> 1.61)
    rubocop-rspec_rails (2.30.0)
      rubocop (~> 1.61)
@ -782,7 +772,7 @@ GEM
    scenic (1.8.0)
      activerecord (>= 4.0.0)
      railties (>= 4.0.0)
-    selenium-webdriver (4.25.0)
+    selenium-webdriver (4.26.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@ -823,7 +813,7 @@ GEM
    stoplight (4.1.0)
      redlock (~> 1.0)
    stringio (3.1.1)
-    strong_migrations (2.0.1)
+    strong_migrations (2.0.2)
      activerecord (>= 6.1)
    swd (1.3.0)
      activesupport (>= 3)
@ -903,7 +893,7 @@ GEM
    xorcist (1.1.3)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
 PLATFORMS
  ruby
@ -943,7 +933,7 @@ DEPENDENCIES
  fast_blank (~> 1.0)
  fastimage
  flatware-rspec
-  fog-core (<= 2.5.0)
+  fog-core (<= 2.6.0)
  fog-openstack (~> 1.0)
  haml-rails (~> 2.0)
  haml_lint
@ -958,6 +948,7 @@ DEPENDENCIES
  idn-ruby
  inline_svg
  irb (~> 1.8)
  jd-paperclip-azure (~> 3.0)
  json-ld
  json-ld-preloaded (~> 3.2)
  json-schema (~> 5.0)
@ -969,7 +960,6 @@ DEPENDENCIES
  lograge (~> 0.12)
  mail (~> 2.8)
  mario-redis-lock (~> 1.2)
  md-paperclip-azure (~> 2.2)
  memory_profiler
  mime-types (~> 3.6.0)
  net-http (~> 0.4.0)
--- a/README.md
+++ b/README.md
@ -85,7 +85,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 - **PostgreSQL** 12+
 - **Redis** 4+
- **Ruby** 3.1+
+- **Ruby** 3.2+
 - **Node.js** 18+
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, and **Scalingo**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@ -41,11 +41,11 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
    end
  end
-  def outbox_url(**kwargs)
+  def outbox_url(**)
    if params[:account_username].present?
-      account_outbox_url(@account, **kwargs)
+      account_outbox_url(@account, **)
    else
-      instance_actor_outbox_url(**kwargs)
+      instance_actor_outbox_url(**)
    end
  end
--- a/app/controllers/admin/trends/links_controller.rb
+++ b/app/controllers/admin/trends/links_controller.rb
@ -4,7 +4,7 @@ class Admin::Trends::LinksController < Admin::BaseController
  def index
    authorize :preview_card, :review?
-    @locales       = PreviewCardTrend.pluck('distinct language')
+    @locales       = PreviewCardTrend.locales
    @preview_cards = filtered_preview_cards.page(params[:page])
    @form          = Trends::PreviewCardBatch.new
  end
--- a/app/controllers/admin/trends/statuses_controller.rb
+++ b/app/controllers/admin/trends/statuses_controller.rb
@ -4,7 +4,7 @@ class Admin::Trends::StatusesController < Admin::BaseController
  def index
    authorize [:admin, :status], :review?
-    @locales  = StatusTrend.pluck('distinct language')
+    @locales  = StatusTrend.locales
    @statuses = filtered_statuses.page(params[:page])
    @form     = Trends::StatusBatch.new
  end
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@ -106,8 +106,8 @@ class Api::V1::AccountsController < Api::BaseController
    render json: { error: I18n.t('accounts.self_follow_error') }, status: 403 if current_user.account.id == @account.id
  end
-  def relationships(**options)
+  def relationships(**)
-    AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
+    AccountRelationshipsPresenter.new([@account], current_user.account_id, **)
  end
  def account_ids
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@ -28,8 +28,8 @@ class Api::V1::FollowRequestsController < Api::BaseController
    @account ||= Account.find(params[:id])
  end
-  def relationships(**options)
+  def relationships(**)
-    AccountRelationshipsPresenter.new([account], current_user.account_id, **options)
+    AccountRelationshipsPresenter.new([account], current_user.account_id, **)
  end
  def load_accounts
--- a/app/controllers/oauth/userinfo_controller.rb
+++ b/app/controllers/oauth/userinfo_controller.rb
@ -0,0 +1,11 @@
 # frozen_string_literal: true
 class Oauth::UserinfoController < Api::BaseController
  before_action -> { doorkeeper_authorize! :profile }, only: [:show]
  before_action :require_user!
  def show
    @account = current_account
    render json: @account, serializer: OauthUserinfoSerializer
  end
 end
--- a/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@ -27,8 +27,15 @@ module FormattingHelper
  module_function :extract_status_plain_text
  def status_content_format(status)
    MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
      span.add_attributes(
        'app.formatter.content.type' => 'status',
        'app.formatter.content.origin' => status.local? ? 'local' : 'remote'
      )
      html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []), content_type: status.content_type)
    end
  end
  def rss_status_content_format(status)
    prerender_custom_emojis(
@ -39,8 +46,15 @@ module FormattingHelper
  end
  def account_bio_format(account)
    MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
      span.add_attributes(
        'app.formatter.content.type' => 'account_bio',
        'app.formatter.content.origin' => account.local? ? 'local' : 'remote'
      )
      html_aware_format(account.note, account.local?)
    end
  end
  def account_field_value_format(field, with_rel_me: true)
    if field.verified? && !field.account.local?
--- a/app/helpers/media_component_helper.rb
+++ b/app/helpers/media_component_helper.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module MediaComponentHelper
-  def render_video_component(status, **options)
+  def render_video_component(status, **)
    video = status.ordered_media_attachments.first
    meta = video.file.meta || {}
@ -18,14 +18,14 @@ module MediaComponentHelper
      media: [
        serialize_media_attachment(video),
      ].as_json,
-    }.merge(**options)
+    }.merge(**)
    react_component :video, component_params do
      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
    end
  end
-  def render_audio_component(status, **options)
+  def render_audio_component(status, **)
    audio = status.ordered_media_attachments.first
    meta = audio.file.meta || {}
@ -38,19 +38,19 @@ module MediaComponentHelper
      foregroundColor: meta.dig('colors', 'foreground'),
      accentColor: meta.dig('colors', 'accent'),
      duration: meta.dig('original', 'duration'),
-    }.merge(**options)
+    }.merge(**)
    react_component :audio, component_params do
      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
    end
  end
-  def render_media_gallery_component(status, **options)
+  def render_media_gallery_component(status, **)
    component_params = {
      sensitive: sensitive_viewer?(status, current_account),
      autoplay: prefers_autoplay?,
      media: status.ordered_media_attachments.map { |a| serialize_media_attachment(a).as_json },
-    }.merge(**options)
+    }.merge(**)
    react_component :media_gallery, component_params do
      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@ -14,8 +14,8 @@ module RoutingHelper
    end
  end
-  def full_asset_url(source, **options)
+  def full_asset_url(source, **)
-    source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
+    source = ActionController::Base.helpers.asset_url(source, **) unless use_storage?
    URI.join(asset_host, source).to_s
  end
@ -24,12 +24,12 @@ module RoutingHelper
    Rails.configuration.action_controller.asset_host || root_url
  end
-  def frontend_asset_path(source, **options)
+  def frontend_asset_path(source, **)
-    asset_pack_path("media/#{source}", **options)
+    asset_pack_path("media/#{source}", **)
  end
-  def frontend_asset_url(source, **options)
+  def frontend_asset_url(source, **)
-    full_asset_url(frontend_asset_path(source, **options))
+    full_asset_url(frontend_asset_path(source, **))
  end
  def use_storage?
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@ -41,12 +41,14 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
 class Poll extends ImmutablePureComponent {
  static propTypes = {
    identity: identityContextPropShape,
-    poll: ImmutablePropTypes.map,
+    poll: ImmutablePropTypes.map.isRequired,
    status: ImmutablePropTypes.map.isRequired,
    lang: PropTypes.string,
    intl: PropTypes.object.isRequired,
    disabled: PropTypes.bool,
    refresh: PropTypes.func,
    onVote: PropTypes.func,
    onInteractionModal: PropTypes.func,
  };
  state = {
@ -117,7 +119,11 @@ class Poll extends ImmutablePureComponent {
      return;
    }
    if (this.props.identity.signedIn) {
      this.props.onVote(Object.keys(this.state.selected));
    } else {
      this.props.onInteractionModal('vote', this.props.status);
    }
  };
  handleRefresh = () => {
@ -232,7 +238,7 @@ class Poll extends ImmutablePureComponent {
        </ul>
        <div className='poll__footer'>
-          {!showResults && <button className='button button-secondary' disabled={disabled || !this.props.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
+          {!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
          {!showResults && <><button className='poll__link' onClick={this.handleReveal}><FormattedMessage id='poll.reveal' defaultMessage='See results' /></button> · </>}
          {showResults && !this.props.disabled && <><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </>}
          {votesCount}
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@ -245,7 +245,7 @@ class StatusContent extends PureComponent {
    );
    const poll = !!status.get('poll') && (
-      <PollContainer pollId={status.get('poll')} lang={language} />
+      <PollContainer pollId={status.get('poll')} status={status} lang={language} />
    );
    if (this.props.onClick) {
--- a/app/javascript/mastodon/containers/poll_container.js
+++ b/app/javascript/mastodon/containers/poll_container.js
@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 import { debounce } from 'lodash';
 import { openModal } from 'mastodon/actions/modal';
 import { fetchPoll, vote } from 'mastodon/actions/polls';
 import Poll from 'mastodon/components/poll';
@ -17,6 +18,17 @@ const mapDispatchToProps = (dispatch, { pollId }) => ({
  onVote (choices) {
    dispatch(vote(pollId, choices));
  },
  onInteractionModal (type, status) {
    dispatch(openModal({
      modalType: 'INTERACTION',
      modalProps: {
        type,
        accountId: status.getIn(['account', 'id']),
        url: status.get('uri'),
      },
    }));
  }
 });
 const mapStateToProps = (state, { pollId }) => ({
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 import { throttle, escapeRegExp } from 'lodash';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@ -340,7 +341,7 @@ class InteractionModal extends React.PureComponent {
  static propTypes = {
    displayNameHtml: PropTypes.string,
    url: PropTypes.string,
-    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
+    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow', 'vote']),
    onSignupClick: PropTypes.func.isRequired,
    signupUrl: PropTypes.string.isRequired,
  };
@ -377,6 +378,11 @@ class InteractionModal extends React.PureComponent {
      title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
      actionDescription = <FormattedMessage id='interaction_modal.description.follow' defaultMessage='With an account on Mastodon, you can follow {name} to receive their posts in your home feed.' values={{ name }} />;
      break;
    case 'vote':
      icon = <Icon id='tasks' icon={InsertChartIcon} />;
      title = <FormattedMessage id='interaction_modal.title.vote' defaultMessage="Vote in {name}'s poll" values={{ name }} />;
      actionDescription = <FormattedMessage id='interaction_modal.description.vote' defaultMessage='With an account on Mastodon, you can vote in this poll.' />;
      break;
    }
    let signupButton;
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@ -152,7 +152,7 @@ export const DetailedStatus: React.FC<{
    media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
  } else if (status.get('media_attachments').size > 0) {
    if (
-      ['image', 'gifv'].includes(
+      ['image', 'gifv', 'unknown'].includes(
        status.getIn(['media_attachments', 0, 'type']) as string,
      ) ||
      status.get('media_attachments').size > 1
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -301,7 +301,6 @@
  "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
  "filter_modal.select_filter.title": "تصفية هذا المنشور",
  "filter_modal.title.status": "تصفية منشور",
  "filter_warning.matches_filter": "يطابق عامل التصفية \"{title}\"",
  "filtered_notifications_banner.title": "الإشعارات المصفاة",
  "firehose.all": "الكل",
  "firehose.local": "هذا الخادم",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -214,6 +214,7 @@
  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
  "hashtag.follow": "Siguir a la etiqueta",
  "hashtag.unfollow": "Dexar de siguir a la etiqueta",
  "hints.threads.replies_may_be_missing": "Ye posible que falten les rempuestes d'otros sirvidores.",
  "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
  "home.column_settings.show_replies": "Amosar les rempuestes",
  "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@ -98,6 +98,8 @@
  "block_modal.title": "Заблакіраваць карыстальніка?",
  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
  "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
  "boost_modal.reblog": "Пашырыць допіс?",
  "boost_modal.undo_reblog": "Прыбраць допіс?",
  "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
  "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
  "bundle_column_error.error.title": "Халера!",
@ -156,6 +158,7 @@
  "compose_form.poll.duration": "Працягласць апытання",
  "compose_form.poll.multiple": "Множны выбар",
  "compose_form.poll.option_placeholder": "Варыянт {number}",
  "compose_form.poll.single": "Адзін варыянт",
  "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
  "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
  "compose_form.poll.type": "Стыль",
@ -194,6 +197,7 @@
  "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
  "content_warning.hide": "Схаваць допіс",
  "content_warning.show": "Усё адно паказаць",
  "content_warning.show_more": "Паказаць усё роўна",
  "conversation.delete": "Выдаліць размову",
  "conversation.mark_as_read": "Адзначыць прачытаным",
  "conversation.open": "Прагледзець размову",
@ -219,6 +223,8 @@
  "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
  "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
  "domain_block_modal.title": "Заблакіраваць дамен?",
  "domain_block_modal.you_will_lose_num_followers": "Вы страціце {followersCount, plural, one {{followersCountDisplay} падпісчыка} other {{followersCountDisplay} падпісчыкаў}} і {followingCount, plural, one {{followingCountDisplay} чалавека, на якога падпісаны} other {{followingCountDisplay} людзей, на якіх падпісаны}}.",
  "domain_block_modal.you_will_lose_relationships": "Вы страціце ўсех падпісчыкаў і людзей на якіх падпісаны на гэтым.",
  "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
@ -300,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
  "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
  "filter_modal.title.status": "Фільтраваць допіс",
-  "filter_warning.matches_filter": "Адпавядае фільтру \"{title}\"",
+  "filter_warning.matches_filter": "Адпавядае фільтру \"<span>{title}</span>\"",
  "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
  "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
  "firehose.all": "Усе",
@ -350,6 +356,9 @@
  "hashtag.follow": "Падпісацца на хэштэг",
  "hashtag.unfollow": "Адпісацца ад хэштэга",
  "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
  "hints.profiles.followers_may_be_missing": "Падпісчыкі гэтага профілю могуць адсутнічаць.",
  "hints.profiles.follows_may_be_missing": "Падпіскі гэтага профілю могуць адсутнічаць.",
  "hints.profiles.posts_may_be_missing": "Некаторыя допісы гэтага профілю могуць адсутнічаць.",
  "home.column_settings.show_reblogs": "Паказваць пашырэнні",
  "home.column_settings.show_replies": "Паказваць адказы",
  "home.hide_announcements": "Схаваць аб'явы",
@ -434,6 +443,7 @@
  "lists.subheading": "Вашыя спісы",
  "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
  "loading_indicator.label": "Загрузка…",
  "media_gallery.hide": "Схаваць",
  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
  "mute_modal.hide_options": "Схаваць опцыі",
@ -479,11 +489,13 @@
  "notification.favourite": "Ваш допіс упадабаны {name}",
  "notification.follow": "{name} падпісаўся на вас",
  "notification.follow_request": "{name} адправіў запыт на падпіску",
  "notification.follow_request.name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}} запыталіся падпісацца на вас",
  "notification.label.mention": "Згадванне",
  "notification.label.private_mention": "Асабістае згадванне",
  "notification.label.private_reply": "Асабісты адказ",
  "notification.label.reply": "Адказ",
  "notification.mention": "Згадванне",
  "notification.mentioned_you": "{name} згадаў вас",
  "notification.moderation-warning.learn_more": "Даведацца больш",
  "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
  "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
@ -496,6 +508,7 @@
  "notification.own_poll": "Ваша апытанне скончылася",
  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
  "notification.reblog": "{name} пашырыў ваш допіс",
  "notification.reblog.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a> абагулілі ваш допіс",
  "notification.relationships_severance_event": "Страціў сувязь з {name}",
  "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
  "notification.relationships_severance_event.domain_block": "Адміністратар з {from} заблакіраваў {target}, у тым ліку {followersCount} вашых падпісчыка(-аў) і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}.",
@ -525,6 +538,7 @@
  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
  "notifications.column_settings.follow": "Новыя падпісчыкі:",
  "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
  "notifications.column_settings.group": "Аб'яднаць апавяшчэнні ад падпісчыкаў",
  "notifications.column_settings.mention": "Згадванні:",
  "notifications.column_settings.poll": "Вынікі апытання:",
  "notifications.column_settings.push": "Push-апавяшчэнні",
@ -743,6 +757,7 @@
  "status.edit": "Рэдагаваць",
  "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": "Фільтраваць гэты допіс",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -171,6 +171,7 @@
  "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
  "confirmations.unfollow.confirm": "Diheuliañ",
  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
  "content_warning.show_more": "Diskouez muioc'h",
  "conversation.delete": "Dilemel ar gaozeadenn",
  "conversation.mark_as_read": "Merkañ evel lennet",
  "conversation.open": "Gwelout ar gaozeadenn",
@ -249,6 +250,7 @@
  "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
  "filter_modal.select_filter.title": "Silañ an toud-mañ",
  "filter_modal.title.status": "Silañ un toud",
  "filter_warning.matches_filter": "A glot gant ar sil “<span>{title}</span>”",
  "firehose.all": "Pep tra",
  "firehose.local": "Ar servijer-mañ",
  "firehose.remote": "Servijerioù all",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "Durada de l'enquesta",
  "compose_form.poll.multiple": "Opcions múltiples",
  "compose_form.poll.option_placeholder": "Opció {number}",
  "compose_form.poll.single": "Única opció",
  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
  "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
  "compose_form.poll.type": "Estil",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
  "content_warning.hide": "Amaga la publicació",
  "content_warning.show": "Mostra-la igualment",
  "content_warning.show_more": "Mostra'n més",
  "conversation.delete": "Elimina la conversa",
  "conversation.mark_as_read": "Marca com a llegida",
  "conversation.open": "Mostra la conversa",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
  "filter_modal.select_filter.title": "Filtra aquest tut",
  "filter_modal.title.status": "Filtra un tut",
-  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
  "filtered_notifications_banner.title": "Notificacions filtrades",
  "firehose.all": "Tots",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre els seus tuts en la teva línia de temps d'Inici.",
  "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquest tut per a compartir-lo amb els teus seguidors.",
  "interaction_modal.description.reply": "Amb un compte a Mastodon, pots respondre aquest tut.",
  "interaction_modal.description.vote": "Si teniu compte a Mastodon, podeu votar aquesta enquesta.",
  "interaction_modal.login.action": "Torna a l'inici",
  "interaction_modal.login.prompt": "Domini del teu servidor domèstic, p.ex. mastodon.social",
  "interaction_modal.no_account_yet": "No a Mastodon?",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "Segueix {name}",
  "interaction_modal.title.reblog": "Impulsa el tut de {name}",
  "interaction_modal.title.reply": "Respon al tut de {name}",
  "interaction_modal.title.vote": "Voteu l'enquesta de {name}",
  "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
  "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
@ -507,6 +511,7 @@
  "notification.favourite": "{name} ha afavorit el teu tut",
  "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han afavorit la vostra publicació",
  "notification.follow": "{name} et segueix",
  "notification.follow.name_and_others": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> us han seguit",
  "notification.follow_request": "{name} ha sol·licitat de seguir-te",
  "notification.follow_request.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} han demanat de seguir-vos",
  "notification.label.mention": "Menció",
@ -565,6 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
  "notifications.column_settings.follow": "Nous seguidors:",
  "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
  "notifications.column_settings.group": "Agrupa",
  "notifications.column_settings.mention": "Mencions:",
  "notifications.column_settings.poll": "Resultats de l’enquesta:",
  "notifications.column_settings.push": "Notificacions push",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -13,7 +13,7 @@
  "about.rules": "Rheolau'r gweinydd",
  "account.account_note_header": "Nodyn personol",
  "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Awtomataidd",
  "account.badges.group": "Grŵp",
  "account.block": "Blocio @{name}",
  "account.block_domain": "Blocio parth {domain}",
@ -36,7 +36,7 @@
  "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
  "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
  "account.following": "Yn dilyn",
-  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter}}}",
+  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter} arall}}",
  "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
  "account.go_to_profile": "Mynd i'r proffil",
  "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@ -62,7 +62,7 @@
  "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
  "account.share": "Rhannwch broffil @{name}",
  "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
+  "account.statuses_counter": "{count, plural, one {{counter} postiad} two {{counter} bostiad} few {{counter} phostiad} many {{counter} postiad} other {{counter} postiad}}",
  "account.unblock": "Dadflocio @{name}",
  "account.unblock_domain": "Dadflocio parth {domain}",
  "account.unblock_short": "Dadflocio",
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
  "content_warning.hide": "Cuddio'r postiad",
  "content_warning.show": "Dangos beth bynnag",
  "content_warning.show_more": "Dangos rhagor",
  "conversation.delete": "Dileu sgwrs",
  "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
  "conversation.open": "Gweld sgwrs",
@ -305,8 +306,8 @@
  "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
  "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
  "filter_modal.title.status": "Hidlo postiad",
-  "filter_warning.matches_filter": "Yn cydweddu'r hidlydd “{title}”",
+  "filter_warning.matches_filter": "Yn cyd-fynd â'r hidlydd “ <span>{title}</span> ”",
-  "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
+  "filtered_notifications_banner.pending_requests": "Oddi wrth {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
  "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
  "firehose.all": "Popeth",
  "firehose.local": "Gweinydd hwn",
@ -349,12 +350,12 @@
  "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
  "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{cyfrif, lluosog, un {{counter} cyfranogwr} arall {{counter} cyfranogwr}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} cyfranogwr} other {{counter} cyfranogwr}}",
  "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
-  "hashtag.counter_by_uses_today": "{cyfrif, lluosog, un {{counter} postiad} arall {{counter} postiad}} heddiw",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
  "hashtag.follow": "Dilyn hashnod",
  "hashtag.unfollow": "Dad-ddilyn hashnod",
-  "hashtags.and_other": "…a {count, plural, other {# more}}",
+  "hashtags.and_other": "…a {count, plural, other {# arall}}",
  "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
  "hints.profiles.follows_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
  "hints.profiles.posts_may_be_missing": "Mae'n bosibl bod rhai postiadau y proffil hwn ar goll.",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich ffrwd gartref.",
  "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
  "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
  "interaction_modal.description.vote": "Gyda chyfrif ar Mastodon, gallwch bleidleisio yn y bleidlais hon.",
  "interaction_modal.login.action": "Mynd i'm ffrwd gartref",
  "interaction_modal.login.prompt": "Parth eich gweinydd cartref, e.e. mastodon.social",
  "interaction_modal.no_account_yet": "Dim ar Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Dilyn {name}",
  "interaction_modal.title.reblog": "Hybu postiad {name}",
  "interaction_modal.title.reply": "Ymateb i bostiad {name}",
  "interaction_modal.title.vote": "Pleidleisiwch ym mhleidlais {name}",
  "intervals.full.days": "{number, plural, one {# diwrnod} two {# ddiwrnod} other {# diwrnod}}",
  "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
  "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
@ -442,7 +445,7 @@
  "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
  "link_preview.author": "Gan {name}",
  "link_preview.more_from_author": "Mwy gan {name}",
-  "link_preview.shares": "{count, plural, one {{counter} ostiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
+  "link_preview.shares": "{count, plural, one {{counter} postiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
  "lists.account.add": "Ychwanegu at restr",
  "lists.account.remove": "Tynnu o'r rhestr",
  "lists.delete": "Dileu rhestr",
@ -499,18 +502,18 @@
  "navigation_bar.security": "Diogelwch",
  "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
  "notification.admin.report": "Adroddwyd ar {name} {target}",
-  "notification.admin.report_account": "{name} reported {count, plural, one {un postiad} other {# postiad}} from {target} for {category}",
+  "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}",
-  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# phost} other {# postiad}} gan {target}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}",
  "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
  "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
  "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # eraill}}",
+  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}",
  "notification.favourite": "Ffafriodd {name} eich postiad",
-  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
+  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# arall}}</a> eich postiad",
  "notification.follow": "Dilynodd {name} chi",
-  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# other} two {# others} few {# others} many {# others} other {# others}}</a> nawr yn eich dilyn chi",
+  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# arall} two {# arall} few {# arall} many {# others} other {# arall}}</a> nawr yn eich dilyn chi",
  "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# other} other {# others}} wedi gofyn i'ch dilyn chi",
+  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# arall} other {# arall}} wedi gofyn i'ch dilyn chi",
  "notification.label.mention": "Crybwyll",
  "notification.label.private_mention": "Crybwyll preifat",
  "notification.label.private_reply": "Ateb preifat",
@ -529,7 +532,7 @@
  "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
  "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
  "notification.reblog": "Hybodd {name} eich post",
-  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# other} other {# others}}</a> wedi hybu eich postiad",
+  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
  "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
  "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
  "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
@ -538,9 +541,9 @@
  "notification.status": "{name} newydd ei bostio",
  "notification.update": "Golygodd {name} bostiad",
  "notification_requests.accept": "Derbyn",
-  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais…} other {Derbyn # cais…}}",
-  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Derbyn cais} other {Derbyn cais}}",
-  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {one notification request} other {# notification requests}}. Ydych chi'n siŵr eich bod am barhau?",
+  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysiad} other {# cais hysbysiad}}. Ydych chi'n siŵr eich bod am barhau?",
  "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
  "notification_requests.confirm_dismiss_multiple.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Fyddwch chi ddim yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. Ydych chi'n yn siŵr eich bod am fwrw ymlaen?",
@ -689,7 +692,7 @@
  "relative_time.minutes": "{number} munud",
  "relative_time.seconds": "{number} eiliad",
  "relative_time.today": "heddiw",
-  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
+  "reply_indicator.attachments": "{count, plural, one {# atodiad} other {# atodiad}}",
  "reply_indicator.cancel": "Canslo",
  "reply_indicator.poll": "Arolwg",
  "report.block": "Blocio",
@ -732,7 +735,7 @@
  "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
  "report.unfollow": "Dad-ddilyn @{name}",
  "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich ffrwd gartref mwyach, dad-ddilynwch nhw.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} other {{count} postiad}} wedi'i atodi",
  "report_notification.categories.legal": "Cyfreithiol",
  "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
  "report_notification.categories.other": "Arall",
@ -812,7 +815,7 @@
  "status.reblog": "Hybu",
  "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
  "status.reblogged_by": "Hybodd {name}",
-  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
+  "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
  "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
  "status.redraft": "Dileu ac ailddrafftio",
  "status.remove_bookmark": "Tynnu nod tudalen",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -196,6 +196,7 @@
  "confirmations.unfollow.title": "Følg ikke længere bruger?",
  "content_warning.hide": "Skjul indlæg",
  "content_warning.show": "Vis alligevel",
  "content_warning.show_more": "Vis flere",
  "conversation.delete": "Slet samtale",
  "conversation.mark_as_read": "Markér som læst",
  "conversation.open": "Vis samtale",
@ -304,7 +305,7 @@
  "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
  "filter_modal.select_filter.title": "Filtrér dette indlæg",
  "filter_modal.title.status": "Filtrér et indlæg",
-  "filter_warning.matches_filter": "Matcher filteret “{title}”",
+  "filter_warning.matches_filter": "Matcher filteret “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
  "filtered_notifications_banner.title": "Filtrerede notifikationer",
  "firehose.all": "Alle",
@ -384,6 +385,7 @@
  "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
  "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
  "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
  "interaction_modal.description.vote": "Med en konto på Mastodon kan man deltage i denne afstemning.",
  "interaction_modal.login.action": "Gå til hjemmeserver",
  "interaction_modal.login.prompt": "Hjemmeserverdomænet, f.eks. mastodon.social",
  "interaction_modal.no_account_yet": "Ikke på Mastodon?",
@ -395,6 +397,7 @@
  "interaction_modal.title.follow": "Følg {name}",
  "interaction_modal.title.reblog": "Boost {name}s indlæg",
  "interaction_modal.title.reply": "Besvar {name}s indlæg",
  "interaction_modal.title.vote": "Deltag i {name}s afstemning",
  "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
  "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
  "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Profil entfolgen?",
  "content_warning.hide": "Beitrag ausblenden",
  "content_warning.show": "Trotzdem anzeigen",
  "content_warning.show_more": "Mehr anzeigen",
  "conversation.delete": "Unterhaltung löschen",
  "conversation.mark_as_read": "Als gelesen markieren",
  "conversation.open": "Unterhaltung anzeigen",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
  "filter_modal.select_filter.title": "Diesen Beitrag filtern",
  "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „<span>{title}</span>“",
  "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
  "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
  "firehose.all": "Alles",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
  "interaction_modal.description.reblog": "Mit einem Mastodon-Konto kannst du die Reichweite dieses Beitrags erhöhen, indem du ihn mit deinen Followern teilst.",
  "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.",
  "interaction_modal.description.vote": "Mit einem Mastodon-Konto kannst du an dieser Umfrage teilnehmen.",
  "interaction_modal.login.action": "Zurück zur Startseite",
  "interaction_modal.login.prompt": "Adresse deines Servers, z. B. mastodon.social",
  "interaction_modal.no_account_yet": "Nicht auf Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Folge {name}",
  "interaction_modal.title.reblog": "Beitrag von {name} teilen",
  "interaction_modal.title.reply": "Auf Beitrag von {name} antworten",
  "interaction_modal.title.vote": "An der Umfrage von {name} teilnehmen",
  "intervals.full.days": "{number, plural, one {# Tag} other {# Tage}}",
  "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
  "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
@ -598,15 +601,15 @@
  "notifications.policy.filter": "Filtern",
  "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
  "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
-  "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
+  "notifications.policy.filter_limited_accounts_title": "moderierten Konten",
  "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
-  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_new_accounts_title": "neuen Konten",
  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
  "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
  "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
  "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
  "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
-  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.filter_private_mentions_title": "unerwünschten privaten Erwähnungen",
  "notifications.policy.title": "Benachrichtigungen verwalten von …",
  "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
  "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -304,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
  "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
  "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “{title}”",
  "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
  "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
  "firehose.all": "Όλα",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -304,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
  "filter_modal.select_filter.title": "Filter this post",
  "filter_modal.title.status": "Filter a post",
  "filter_warning.matches_filter": "Matches filter “{title}”",
  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
  "filtered_notifications_banner.title": "Filtered notifications",
  "firehose.all": "All",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -386,6 +386,7 @@
  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
  "interaction_modal.description.vote": "With an account on Mastodon, you can vote in this poll.",
  "interaction_modal.login.action": "Take me home",
  "interaction_modal.login.prompt": "Domain of your home server, e.g. mastodon.social",
  "interaction_modal.no_account_yet": "Not on Mastodon?",
@ -397,6 +398,7 @@
  "interaction_modal.title.follow": "Follow {name}",
  "interaction_modal.title.reblog": "Boost {name}'s post",
  "interaction_modal.title.reply": "Reply to {name}'s post",
  "interaction_modal.title.vote": "Vote in {name}'s poll",
  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -2,7 +2,7 @@
  "about.blocks": "Administritaj serviloj",
  "about.contact": "Kontakto:",
  "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
+  "about.domain_blocks.no_reason_available": "Kialo ne disponeblas",
  "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
  "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
  "about.domain_blocks.silenced.title": "Limigita",
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
  "content_warning.hide": "Kaŝi afiŝon",
  "content_warning.show": "Montri ĉiukaze",
  "content_warning.show_more": "Montri pli",
  "conversation.delete": "Forigi konversacion",
  "conversation.mark_as_read": "Marku kiel legita",
  "conversation.open": "Vidi konversacion",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
  "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
  "filter_modal.title.status": "Filtri afiŝon",
-  "filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
+  "filter_warning.matches_filter": "Filtrilo de kongruoj “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
  "filtered_notifications_banner.title": "Filtritaj sciigoj",
  "firehose.all": "Ĉiuj",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
  "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
  "interaction_modal.description.vote": "Kun konto ĉe Mastodon, vi povas voĉdoni en ĉi tiu balotenketo.",
  "interaction_modal.login.action": "Prenu min hejmen",
  "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
  "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Sekvi {name}",
  "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
  "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
  "interaction_modal.title.vote": "Voĉdonu en la balotenketo de {name}",
  "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
  "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutoj}}",
@ -526,7 +529,7 @@
  "notification.moderation_warning.action_sensitive": "Viaj afiŝoj estos markitaj kiel sentemaj ekde nun.",
  "notification.moderation_warning.action_silence": "Via konto estis limigita.",
  "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
-  "notification.own_poll": "Via enketo finiĝis",
+  "notification.own_poll": "Via balotenketo finiĝitis",
  "notification.poll": "Balotenketo, en kiu vi voĉdonis, finiĝis",
  "notification.reblog": "{name} diskonigis vian afiŝon",
  "notification.reblog.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> diskonigis vian afiŝon",
@ -567,7 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Rapida filtrila breto",
  "notifications.column_settings.follow": "Novaj sekvantoj:",
  "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
-  "notifications.column_settings.group": "Grupo",
+  "notifications.column_settings.group": "Grupigi",
  "notifications.column_settings.mention": "Mencioj:",
  "notifications.column_settings.poll": "Balotenketaj rezultoj:",
  "notifications.column_settings.push": "Puŝsciigoj",
@ -658,7 +661,7 @@
  "poll.total_people": "{count, plural, one {# homo} other {# homoj}}",
  "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
  "poll.vote": "Voĉdoni",
-  "poll.voted": "Vi elektis por ĉi tiu respondo",
+  "poll.voted": "Vi voĉdonis por ĉi tiu respondo",
  "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
  "poll_button.add_poll": "Aldoni balotenketon",
  "poll_button.remove_poll": "Forigi balotenketon",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
  "content_warning.hide": "Ocultar mensaje",
  "content_warning.show": "Mostrar de todos modos",
  "content_warning.show_more": "Mostrar más",
  "conversation.delete": "Eliminar conversación",
  "conversation.mark_as_read": "Marcar como leída",
  "conversation.open": "Ver conversación",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
  "filter_modal.select_filter.title": "Filtrar este mensaje",
  "filter_modal.title.status": "Filtrar un mensaje",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
  "filtered_notifications_banner.title": "Notificaciones filtradas",
  "firehose.all": "Todos",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Con una cuenta en Mastodon, podés seguir a {name} para recibir sus mensajes en tu línea temporal principal.",
  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
  "interaction_modal.description.reply": "Con una cuenta en Mastodon, podés responder a este mensaje.",
  "interaction_modal.description.vote": "Con una cuenta en Mastodon, podés votar en esta encuesta.",
  "interaction_modal.login.action": "Llevame al comienzo",
  "interaction_modal.login.prompt": "Dominio de su servidor de inicio, p. ej., mastodon.social",
  "interaction_modal.no_account_yet": "¿No tenés cuenta en Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seguir a {name}",
  "interaction_modal.title.reblog": "Adherir al mensaje de {name}",
  "interaction_modal.title.reply": "Responder al mensaje de {name}",
  "interaction_modal.title.vote": "Votá en la encuesta de {name}",
  "intervals.full.days": "{number, plural, one {# día} other {# días}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@ -856,7 +859,7 @@
  "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
  "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
  "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
  "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
  "upload_form.edit": "Editar",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
  "content_warning.hide": "Ocultar publicación",
  "content_warning.show": "Mostrar de todos modos",
  "content_warning.show_more": "Mostrar más",
  "conversation.delete": "Borrar conversación",
  "conversation.mark_as_read": "Marcar como leído",
  "conversation.open": "Ver conversación",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
  "filter_modal.select_filter.title": "Filtrar esta publicación",
  "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# people}} que puede que tú conozcas",
  "filtered_notifications_banner.title": "Notificaciones filtradas",
  "firehose.all": "Todas",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
  "interaction_modal.login.action": "Ir a Inicio",
  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo: mastodon.social",
  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seguir a {name}",
  "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
  "interaction_modal.title.reply": "Responder la publicación de {name}",
  "interaction_modal.title.vote": "Votar en la encuesta de {name}",
  "intervals.full.days": "{number, plural, one {# día} other {# días}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
  "content_warning.hide": "Ocultar publicación",
  "content_warning.show": "Mostrar de todos modos",
  "content_warning.show_more": "Mostrar más",
  "conversation.delete": "Borrar conversación",
  "conversation.mark_as_read": "Marcar como leído",
  "conversation.open": "Ver conversación",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
  "filter_modal.select_filter.title": "Filtrar esta publicación",
  "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
  "filtered_notifications_banner.title": "Notificaciones filtradas",
  "firehose.all": "Todas",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
  "interaction_modal.login.action": "Ir a Inicio",
  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo mastodon.social",
  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seguir a {name}",
  "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
  "interaction_modal.title.reply": "Responder a la publicación de {name}",
  "interaction_modal.title.vote": "Vota en la encuesta de {name}",
  "intervals.full.days": "{number, plural, one {# día} other {# días}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@ -567,7 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
  "notifications.column_settings.follow": "Nuevos seguidores:",
  "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
-  "notifications.column_settings.group": "Grupo",
+  "notifications.column_settings.group": "Agrupar",
  "notifications.column_settings.mention": "Menciones:",
  "notifications.column_settings.poll": "Resultados de la votación:",
  "notifications.column_settings.push": "Notificaciones push",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "Küsitluse kestus",
  "compose_form.poll.multiple": "Mitu vastust",
  "compose_form.poll.option_placeholder": "Valik {number}",
  "compose_form.poll.single": "Üks valik",
  "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
  "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
  "compose_form.poll.type": "Stiil",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
  "content_warning.hide": "Peida postitus",
  "content_warning.show": "Näita ikkagi",
  "content_warning.show_more": "Näita rohkem",
  "conversation.delete": "Kustuta vestlus",
  "conversation.mark_as_read": "Märgi loetuks",
  "conversation.open": "Vaata vestlust",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
  "filter_modal.select_filter.title": "Filtreeri seda postitust",
  "filter_modal.title.status": "Postituse filtreerimine",
-  "filter_warning.matches_filter": "Sobib filtriga “{title}”",
+  "filter_warning.matches_filter": "Sobib filtriga “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Mitte üheltki inimeselt} one {Ühelt inimeselt} other {# inimeselt}}, keda võid teada",
  "filtered_notifications_banner.title": "Filtreeritud teavitused",
  "firehose.all": "Kõik",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.",
  "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.",
  "interaction_modal.description.reply": "Mastodoni kontoga saad sellele postitusele vastata.",
  "interaction_modal.description.vote": "Mastodoni kontoga saad sellest küsitlusest osa võtta.",
  "interaction_modal.login.action": "Vii mind avalehele",
  "interaction_modal.login.prompt": "Sinu koduserveri domeen, näiteks mastodon.social",
  "interaction_modal.no_account_yet": "Pole Mastodonis?",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "Jälgi kontot {name}",
  "interaction_modal.title.reblog": "Jaga {name} postitust",
  "interaction_modal.title.reply": "Vasta kasutaja {name} postitusele",
  "interaction_modal.title.vote": "Hääleta {name} küsitluses",
  "intervals.full.days": "{number, plural, one {# päev} other {# päeva}}",
  "intervals.full.hours": "{number, plural, one {# tund} other {# tundi}}",
  "intervals.full.minutes": "{number, plural, one {# minut} other {# minutit}}",
@ -507,6 +511,7 @@
  "notification.favourite": "{name} märkis su postituse lemmikuks",
  "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> märkis su postituse lemmikuks",
  "notification.follow": "{name} alustas su jälgimist",
  "notification.follow.name_and_others": "{name} ja veel {count, plural, one {# kasutaja} other {# kasutajat}} hakkas sind jälgima",
  "notification.follow_request": "{name} soovib sind jälgida",
  "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} taotles sinu jälgimist",
  "notification.label.mention": "Mainimine",
@ -565,6 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
  "notifications.column_settings.follow": "Uued jälgijad:",
  "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
  "notifications.column_settings.group": "Grupp",
  "notifications.column_settings.mention": "Mainimised:",
  "notifications.column_settings.poll": "Küsitluse tulemused:",
  "notifications.column_settings.push": "Push teated",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -302,7 +302,6 @@
  "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
  "filter_modal.select_filter.title": "Iragazi bidalketa hau",
  "filter_modal.title.status": "Iragazi bidalketa bat",
  "filter_warning.matches_filter": "“{title}” iragazkiarekin bat dator",
  "filtered_notifications_banner.pending_requests": "Ezagutu dezakezun {count, plural, =0 {inoren} one {pertsona baten} other {# pertsonen}}",
  "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
  "firehose.all": "Guztiak",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "مدت نظرسنجی",
  "compose_form.poll.multiple": "چند گزینه‌ای",
  "compose_form.poll.option_placeholder": "گزینهٔ {number}",
  "compose_form.poll.single": "تک گزینه‌ای",
  "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
  "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
  "compose_form.poll.type": "سبک",
@ -195,7 +196,7 @@
  "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
  "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
  "content_warning.hide": "نهفتن فرسته",
-  "content_warning.show": "نمایش به هر روی",
+  "content_warning.show": "در هر صورت نشان داده شود",
  "conversation.delete": "حذف گفتگو",
  "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
  "conversation.open": "دیدن گفتگو",
@ -221,6 +222,7 @@
  "domain_block_modal.they_cant_follow": "هیچ‌کسی از این کارساز نمی‌تواند پیتان بگیرد.",
  "domain_block_modal.they_wont_know": "نخواهند دانست که مسدود شده‌اند.",
  "domain_block_modal.title": "انسداد دامنه؟",
  "domain_block_modal.you_will_lose_num_followers": "تعداد {followersCount, plural,other {{followersCount}}} پی‌گیرنده و {followingCount, plural,other {{followingCount}}} شخص پی‌گرفته شده را از دست خواهید داد.",
  "domain_block_modal.you_will_lose_relationships": "شما تمام پیگیرکنندگان و افرادی که از این کارساز پیگیری می‌کنید را از دست خواهید داد.",
  "domain_block_modal.you_wont_see_posts": "فرسته‌ها یا آگاهی‌ها از کاربران روی این کارساز را نخواهید دید.",
  "domain_pill.activitypub_lets_connect": "این به شما اجازه می‌دهد تا نه تنها در ماستودون، بلکه در برنامه‌های اجتماعی مختلف نیز با افراد ارتباط برقرار کرده و تعامل داشته باشید.",
@ -302,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "استفاده از یک دستهً موجود یا ایجاد دسته‌ای جدید",
  "filter_modal.select_filter.title": "پالایش این فرسته",
  "filter_modal.title.status": "پالایش یک فرسته",
  "filter_warning.matches_filter": "مطابق با پالایهٔ «{title}»",
  "filtered_notifications_banner.pending_requests": "از {count, plural, =0 {هیچ‌کسی} one {فردی} other {# نفر}} که ممکن است بشناسید",
  "filtered_notifications_banner.title": "آگاهی‌های پالوده",
  "firehose.all": "همه",
@ -367,6 +368,7 @@
  "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
  "home.pending_critical_update.title": "به‌روز رسانی امنیتی بحرانی موجود است!",
  "home.show_announcements": "نمایش اعلامیه‌ها",
  "ignore_notifications_modal.filter_instead": "به جایش پالوده شود",
  "ignore_notifications_modal.ignore": "چشم‌پوشی از آگاهی‌ها",
  "ignore_notifications_modal.limited_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های نظارت شده؟",
  "ignore_notifications_modal.new_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های جدید؟",
@ -428,6 +430,8 @@
  "lightbox.close": "بستن",
  "lightbox.next": "بعدی",
  "lightbox.previous": "قبلی",
  "lightbox.zoom_in": "بزرگ‌نمایی به اندازهٔ اصلی",
  "lightbox.zoom_out": "بزرگ نمایی برای برازش",
  "limited_account_hint.action": "به هر روی نمایه نشان داده شود",
  "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.",
  "link_preview.author": "از {name}",
@ -455,6 +459,7 @@
  "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": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
@ -494,6 +499,7 @@
  "notification.favourite": "{name} فرسته‌تان را برگزید",
  "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
  "notification.follow": "‫{name}‬ پی‌گیرتان شد",
  "notification.follow.name_and_others": "{name} و <a>{count, plural, other {#}} نفر دیگر</a> پیتان گرفتند",
  "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
  "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
  "notification.label.mention": "اشاره",
@ -501,6 +507,7 @@
  "notification.label.private_reply": "پاسخ خصوصی",
  "notification.label.reply": "پاسخ",
  "notification.mention": "اشاره",
  "notification.mentioned_you": "‫{name}‬ از شما نام برد",
  "notification.moderation-warning.learn_more": "بیشتر بدانید",
  "notification.moderation_warning": "هشداری مدیریتی گرفته‌اید",
  "notification.moderation_warning.action_delete_statuses": "برخی از فرسته‌هایتان برداشته شدند.",
@ -519,7 +526,10 @@
  "notification.status": "{name} چیزی فرستاد",
  "notification.update": "{name} فرسته‌ای را ویرایش کرد",
  "notification_requests.accept": "پذیرش",
  "notification_requests.confirm_accept_multiple.button": "پذیرش {count, plural,one {درخواست} other {درخواست‌ها}}",
  "notification_requests.confirm_accept_multiple.message": "در حال پذیرش {count, plural,one {یک}other {#}} درخواست آگاهی هستید. مطمئنید که می‌خواهید ادامه دهید؟",
  "notification_requests.confirm_accept_multiple.title": "پذیرش درخواست‌های آگاهی؟",
  "notification_requests.confirm_dismiss_multiple.button": "رد {count, plural,one {درخواست} other {درخواست‌ها}}",
  "notification_requests.confirm_dismiss_multiple.title": "رد کردن درخواست‌های آگاهی؟",
  "notification_requests.dismiss": "دورانداختن",
  "notification_requests.edit_selection": "ویرایش",
@ -540,6 +550,7 @@
  "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
  "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
  "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
  "notifications.column_settings.group": "گروه",
  "notifications.column_settings.mention": "اشاره‌ها:",
  "notifications.column_settings.poll": "نتایج نظرسنجی:",
  "notifications.column_settings.push": "آگاهی‌های ارسالی",
@ -595,7 +606,7 @@
  "onboarding.profile.discoverable_hint": "خواسته‌اید روی ماستودون کشف شوید. ممکن است فرسته‌هایتان در نتیحهٔ جست‌وجوها و فرسته‌های داغ ظاهر شده و نمایه‌تان به افرادی با علایق مشابهتان پیشنهاد شود.",
  "onboarding.profile.display_name": "نام نمایشی",
  "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
-  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌ّای شخصی سازی بیش‌تری نیز دارد کامل کنید.",
+  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌های شخصی سازی بیش‌تری نیز دارد کامل کنید.",
  "onboarding.profile.note": "درباره شما",
  "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
  "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@ -760,6 +771,7 @@
  "status.edit": "ویرایش",
  "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": "پالایش این فرسته",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -158,7 +158,7 @@
  "compose_form.poll.duration": "Äänestyksen kesto",
  "compose_form.poll.multiple": "Monivalinta",
  "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
-  "compose_form.poll.single": "Yksittäisvalinta",
+  "compose_form.poll.single": "Yksi vaihtoehto",
  "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
  "compose_form.poll.switch_to_single": "Muuta äänestys yksittäisvalinnaksi",
  "compose_form.poll.type": "Tyyli",
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
  "content_warning.hide": "Piilota julkaisu",
  "content_warning.show": "Näytä kuitenkin",
  "content_warning.show_more": "Näytä lisää",
  "conversation.delete": "Poista keskustelu",
  "conversation.mark_as_read": "Merkitse luetuksi",
  "conversation.open": "Näytä keskustelu",
@ -305,7 +306,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",
-  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {Yhdeltä käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
  "firehose.all": "Kaikki",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
  "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
  "interaction_modal.description.reply": "Mastodon-tilillä voit vastata tähän julkaisuun.",
  "interaction_modal.description.vote": "Osallistuminen äänestykseen onnistuu Mastodon-tilillä.",
  "interaction_modal.login.action": "Siirry kotiin",
  "interaction_modal.login.prompt": "Kotipalvelimesi verkkotunnus, kuten mastodon.social",
  "interaction_modal.no_account_yet": "Etkö ole vielä Mastodonissa?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
  "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
  "interaction_modal.title.reply": "Vastaa käyttäjän {name} julkaisuun",
  "interaction_modal.title.vote": "Osallistu käyttäjän {name} äänestykseen",
  "intervals.full.days": "{number, plural, one {# päivä} other {# päivää}}",
  "intervals.full.hours": "{number, plural, one {# tunti} other {# tuntia}}",
  "intervals.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}}",
@ -436,8 +439,8 @@
  "lightbox.close": "Sulje",
  "lightbox.next": "Seuraava",
  "lightbox.previous": "Edellinen",
-  "lightbox.zoom_in": "Zoomaa todelliseen kokoon",
+  "lightbox.zoom_in": "Näytä todellisen kokoisena",
-  "lightbox.zoom_out": "Zoomaa mahtumaan",
+  "lightbox.zoom_out": "Näytä sovitettuna",
  "limited_account_hint.action": "Näytä profiili joka tapauksessa",
  "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
  "link_preview.author": "Tehnyt {name}",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@ -129,6 +129,7 @@
  "confirmations.discard_edit_media.confirm": "Ipagpaliban",
  "confirmations.edit.confirm": "Baguhin",
  "confirmations.reply.confirm": "Tumugon",
  "content_warning.show_more": "Magpakita ng higit pa",
  "conversation.mark_as_read": "Markahan bilang nabasa na",
  "conversation.open": "Tingnan ang pag-uusap",
  "copy_icon_button.copied": "Sinipi sa clipboard",
@ -190,6 +191,7 @@
  "explore.title": "Tuklasin",
  "explore.trending_links": "Mga balita",
  "filter_modal.select_filter.search": "Hanapin o gumawa",
  "filter_warning.matches_filter": "Tinutugma ang pangsala \"<span>{title}</span>\"",
  "firehose.all": "Lahat",
  "firehose.local": "Itong serbiro",
  "firehose.remote": "Ibang mga serbiro",
@ -218,6 +220,7 @@
  "interaction_modal.on_another_server": "Sa ibang serbiro",
  "interaction_modal.on_this_server": "Sa serbirong ito",
  "interaction_modal.title.follow": "Sundan si {name}",
  "interaction_modal.title.vote": "Bumoto sa botohan ni {name}",
  "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
  "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
@ -256,6 +259,7 @@
  "navigation_bar.search": "Maghanap",
  "notification.admin.report": "Iniulat ni {name} si {target}",
  "notification.follow": "Sinundan ka ni {name}",
  "notification.follow.name_and_others": "Sinundan ka ng/nina {name} at <a>{count,  plural, one {# iba pa} other {# na iba pa}}</a>",
  "notification.follow_request": "Hinihiling ni {name} na sundan ka",
  "notification.label.private_mention": "Palihim na banggit",
  "notification.mentioned_you": "Binanggit ka ni {name}",
@ -270,6 +274,7 @@
  "notifications.column_settings.alert": "Mga abiso sa Desktop",
  "notifications.column_settings.favourite": "Mga paborito:",
  "notifications.column_settings.follow": "Mga bagong tagasunod:",
  "notifications.column_settings.group": "Pangkat",
  "notifications.column_settings.poll": "Resulta ng botohan:",
  "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
  "notifications.column_settings.update": "Mga pagbago:",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
  "content_warning.hide": "Fjal post",
  "content_warning.show": "Vís kortini",
  "content_warning.show_more": "Vís meiri",
  "conversation.delete": "Strika samrøðu",
  "conversation.mark_as_read": "Merk sum lisið",
  "conversation.open": "Vís samrøðu",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
  "filter_modal.select_filter.title": "Filtrera hendan postin",
  "filter_modal.title.status": "Filtrera ein post",
-  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
  "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
  "firehose.all": "Allar",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
  "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
  "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.",
  "interaction_modal.description.vote": "Við eini kontu á Mastodon, so kanst tú atkvøða í hesi spurnarkanningini.",
  "interaction_modal.login.action": "Tak meg heim",
  "interaction_modal.login.prompt": "Navnaøki hjá tínum heimaambætara, t.d. mastodon.social",
  "interaction_modal.no_account_yet": "Ikki á Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Fylg {name}",
  "interaction_modal.title.reblog": "Stimbra postin hjá {name}",
  "interaction_modal.title.reply": "Svara postinum hjá {name}",
  "interaction_modal.title.vote": "Atkvøði í spurnarkanningini hjá {name}",
  "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
  "intervals.full.hours": "{number, plural, one {# tími} other {# tímar}}",
  "intervals.full.minutes": "{number, plural, one {# minuttur} other {# minuttir}}",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@ -305,7 +305,6 @@
  "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",
  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
  "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
  "filtered_notifications_banner.title": "Notifications filtrées",
  "firehose.all": "Tout",
@ -856,6 +855,7 @@
  "upload_form.description": "Décrire pour les malvoyants",
  "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
  "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
  "upload_form.edit": "Modifier",
  "upload_form.thumbnail": "Changer la vignette",
  "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -305,7 +305,6 @@
  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou créez-en une nouvelle",
  "filter_modal.select_filter.title": "Filtrer ce message",
  "filter_modal.title.status": "Filtrer un message",
  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
  "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
  "filtered_notifications_banner.title": "Notifications filtrées",
  "firehose.all": "Tout",
@ -856,6 +855,7 @@
  "upload_form.description": "Décrire pour les malvoyant·e·s",
  "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
  "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
  "upload_form.edit": "Modifier",
  "upload_form.thumbnail": "Changer la vignette",
  "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@ -304,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
  "filter_modal.select_filter.title": "Dit berjocht filterje",
  "filter_modal.title.status": "In berjocht filterje",
  "filter_warning.matches_filter": "Komt oerien mei filter ‘{title}’",
  "filtered_notifications_banner.pending_requests": "Fan {count, plural, =0 {net ien} one {ien persoan} other {# persoanen}} dy’t jo mooglik kinne",
  "filtered_notifications_banner.title": "Filtere meldingen",
  "firehose.all": "Alles",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Dílean an t-úsáideoir?",
  "content_warning.hide": "Folaigh postáil",
  "content_warning.show": "Taispeáin ar aon nós",
  "content_warning.show_more": "Taispeáin níos mó",
  "conversation.delete": "Scrios comhrá",
  "conversation.mark_as_read": "Marcáil mar léite",
  "conversation.open": "Féach ar comhrá",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
  "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
  "filter_modal.title.status": "Déan scagadh ar phostáil",
-  "filter_warning.matches_filter": "Meaitseálann an scagaire “{title}”",
+  "filter_warning.matches_filter": "Meaitseálann an scagaire “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b’fhéidir go bhfuil aithne agat orthu",
  "filtered_notifications_banner.title": "Fógraí scagtha",
  "firehose.all": "Gach",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "Faide a’ chunntais",
  "compose_form.poll.multiple": "Iomadh-roghainn",
  "compose_form.poll.option_placeholder": "Roghainn {number}",
  "compose_form.poll.single": "Aon taghadh",
  "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
  "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
  "compose_form.poll.type": "Stoidhle",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
  "content_warning.hide": "Falaich am post",
  "content_warning.show": "Seall e co-dhiù",
  "content_warning.show_more": "Seall barrachd dheth",
  "conversation.delete": "Sguab às an còmhradh",
  "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
  "conversation.open": "Seall an còmhradh",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
  "filter_modal.select_filter.title": "Criathraich am post seo",
  "filter_modal.title.status": "Criathraich post",
-  "filter_warning.matches_filter": "A’ maidseadh na criathraige “{title}”",
+  "filter_warning.matches_filter": "A’ maidseadh na criathraige “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil gin ann} one {O # neach} two {O # neach} few {O # daoine} other {O # duine}} air a bheil thu eòlach ’s dòcha",
  "filtered_notifications_banner.title": "Brathan criathraichte",
  "firehose.all": "Na h-uile",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
  "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
  "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.",
  "interaction_modal.description.vote": "Le cunntas air Mastodon, ’s urrainn dhut bhòtadh sa chunntas-bheachd seo.",
  "interaction_modal.login.action": "Thoir dhachaigh mi",
  "interaction_modal.login.prompt": "Àrainn-lìn an fhrithealaiche dachaigh agad, can ailbhean.co-shaoghal.net",
  "interaction_modal.no_account_yet": "Nach eil thu air Mastodon?",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "Lean {name}",
  "interaction_modal.title.reblog": "Brosnaich am post aig {name}",
  "interaction_modal.title.reply": "Freagair dhan phost aig {name}",
  "interaction_modal.title.vote": "Bhòt sa chunntas-bheachd aig {name}",
  "intervals.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
  "intervals.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}}",
  "intervals.full.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}}",
@ -461,7 +465,7 @@
  "media_gallery.hide": "Falaich",
  "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Falaich o na brathan",
-  "mute_modal.hide_options": "Roghainnean falaich",
+  "mute_modal.hide_options": "Falaich na roghainnean",
  "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
  "mute_modal.show_options": "Seall na roghainnean",
  "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
@ -507,6 +511,7 @@
  "notification.favourite": "Is annsa le {name} am post agad",
  "notification.favourite.name_and_others_with_link": "Is annsa le {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
  "notification.follow": "Tha {name} ’gad leantainn a-nis",
  "notification.follow.name_and_others": "Lean {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> thu",
  "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
  "notification.follow_request.name_and_others": "Dh’iarr {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} ’gad leantainn",
  "notification.label.mention": "Iomradh",
@ -565,6 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
  "notifications.column_settings.follow": "Luchd-leantainn ùr:",
  "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
  "notifications.column_settings.group": "Buidheann",
  "notifications.column_settings.mention": "Iomraidhean:",
  "notifications.column_settings.poll": "Toraidhean cunntais-bheachd:",
  "notifications.column_settings.push": "Brathan putaidh",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
  "content_warning.hide": "Agochar publicación",
  "content_warning.show": "Mostrar igualmente",
  "content_warning.show_more": "Mostrar máis",
  "conversation.delete": "Eliminar conversa",
  "conversation.mark_as_read": "Marcar como lido",
  "conversation.open": "Ver conversa",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
  "filter_modal.select_filter.title": "Filtrar esta publicación",
  "filter_modal.title.status": "Filtrar unha publicación",
-  "filter_warning.matches_filter": "Debido ao filtro “{title}”",
+  "filter_warning.matches_filter": "Concorda co filtro «<span>{title}</span>»",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que igual coñeces",
  "filtered_notifications_banner.title": "Notificacións filtradas",
  "firehose.all": "Todo",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.",
  "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
  "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.",
  "interaction_modal.description.vote": "Podes votar nesta enquisa se tes unha conta en Mastodon.",
  "interaction_modal.login.action": "Lévame ao inicio",
  "interaction_modal.login.prompt": "Dominio do teu servidor de inicio, ex. mastodon.social",
  "interaction_modal.no_account_yet": "Aínda non tes unha conta?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seguir a {name}",
  "interaction_modal.title.reblog": "Promover a publicación de {name}",
  "interaction_modal.title.reply": "Responder á publicación de {name}",
  "interaction_modal.title.vote": "Vota na enquisa de {name}",
  "intervals.full.days": "{number, plural,one {# día} other {# días}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@ -451,7 +454,7 @@
  "lists.exclusive": "Agocha estas publicacións no Inicio",
  "lists.new.create": "Engadir listaxe",
  "lists.new.title_placeholder": "Título da nova listaxe",
-  "lists.replies_policy.followed": "Toda usuaria seguida",
+  "lists.replies_policy.followed": "Calquera usuaria que siga",
  "lists.replies_policy.list": "Membros da lista",
  "lists.replies_policy.none": "Ninguén",
  "lists.replies_policy.title": "Mostrar respostas a:",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
  "content_warning.hide": "הסתרת חיצרוץ",
  "content_warning.show": "להציג בכל זאת",
  "content_warning.show_more": "הצג עוד",
  "conversation.delete": "מחיקת שיחה",
  "conversation.mark_as_read": "סמן כנקרא",
  "conversation.open": "צפו בשיחה",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
  "filter_modal.select_filter.title": "סינון ההודעה הזו",
  "filter_modal.title.status": "סנן הודעה",
-  "filter_warning.matches_filter": "תואם לסנן “{title}”",
+  "filter_warning.matches_filter": "תואם לסנן “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
  "filtered_notifications_banner.title": "התראות מסוננות",
  "firehose.all": "הכל",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
  "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
  "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
  "interaction_modal.description.vote": "עם חשבון מסטודון, ניתן להצביע בסקר.",
  "interaction_modal.login.action": "קח אותי לדף הבית",
  "interaction_modal.login.prompt": "שם השרת שלך, למשל mastodon.social",
  "interaction_modal.no_account_yet": "עדיין לא במסטודון?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "לעקוב אחרי {name}",
  "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
  "interaction_modal.title.reply": "תשובה לחצרוץ של {name}",
  "interaction_modal.title.vote": "הצביעו בסקר של {name}",
  "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
  "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
  "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
  "content_warning.hide": "Bejegyzés elrejtése",
  "content_warning.show": "Megjelenítés mindenképp",
  "content_warning.show_more": "Több megjelenítése",
  "conversation.delete": "Beszélgetés törlése",
  "conversation.mark_as_read": "Megjelölés olvasottként",
  "conversation.open": "Beszélgetés megtekintése",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
  "filter_modal.select_filter.title": "E bejegyzés szűrése",
  "filter_modal.title.status": "Egy bejegyzés szűrése",
-  "filter_warning.matches_filter": "Megfelel a szűrőnek: „{title}”",
+  "filter_warning.matches_filter": "Megfelel a szűrőnek: „<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {senkitől} one {egy valószínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
  "filtered_notifications_banner.title": "Szűrt értesítések",
  "firehose.all": "Összes",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
  "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
  "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
  "interaction_modal.description.vote": "Egy Mastodon fiókkal szavazhatsz ebben a szavazásban.",
  "interaction_modal.login.action": "Vigyen haza",
  "interaction_modal.login.prompt": "A saját kiszolgálód tartományneve, pl.: mastodon.social",
  "interaction_modal.no_account_yet": "Nem vagy Mastodonon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "{name} követése",
  "interaction_modal.title.reblog": "{name} bejegyzésének megtolása",
  "interaction_modal.title.reply": "Válasz {name} bejegyzésére",
  "interaction_modal.title.vote": "Szavazz {name} szavazásában",
  "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
  "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
  "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@ -304,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
  "filter_modal.select_filter.title": "Filtrar iste message",
  "filter_modal.title.status": "Filtrar un message",
  "filter_warning.matches_filter": "Corresponde al filtro “{title}”",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nemo} one {un persona} other {# personas}} que tu pote cognoscer",
  "filtered_notifications_banner.title": "Notificationes filtrate",
  "firehose.all": "Toto",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Jumlah akses dibatasi",
  "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
  "alert.unexpected.title": "Ups!",
  "alt_text_badge.title": "Teks Alternatif",
  "announcement.announcement": "Pengumuman",
  "attachments_list.unprocessed": "(tidak diproses)",
  "audio.hide": "Sembunyikan audio",
@ -97,6 +98,8 @@
  "block_modal.title": "Blokir pengguna?",
  "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
  "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
  "boost_modal.reblog": "Pacu kiriman?",
  "boost_modal.undo_reblog": "Jangan pacu kiriman?",
  "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
  "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
  "bundle_column_error.error.title": "Oh, tidak!",
@ -155,6 +158,7 @@
  "compose_form.poll.duration": "Durasi japat",
  "compose_form.poll.multiple": "Pilihan ganda",
  "compose_form.poll.option_placeholder": "Opsi {number}",
  "compose_form.poll.single": "Pilihan tunggal",
  "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
  "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
  "compose_form.poll.type": "Gaya",
@ -218,6 +222,7 @@
  "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
  "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
  "domain_block_modal.title": "Blokir domain?",
  "domain_block_modal.you_will_lose_relationships": "Kamu akan kehilangan semua pengikut dan orang yang kamu ikuti dari server ini.",
  "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
  "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
  "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
@ -231,6 +236,7 @@
  "domain_pill.who_you_are": "<button>ActivityPub-powered platforms</button>.",
  "domain_pill.your_handle": "Nama pengguna anda:",
  "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": "Pengenal unik anda di server ini. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
  "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
  "embed.preview": "Tampilan akan seperti ini nantinya:",
  "emoji_button.activity": "Aktivitas",
@ -293,6 +299,7 @@
  "filter_modal.select_filter.subtitle": "Gunakan kategori yang sudah ada atau buat yang baru",
  "filter_modal.select_filter.title": "Saring kiriman ini",
  "filter_modal.title.status": "Saring sebuah kiriman",
  "filtered_notifications_banner.title": "Notifikasi yang disaring",
  "firehose.all": "Semua",
  "firehose.local": "Server Ini",
  "firehose.remote": "Server Lain",
@ -301,6 +308,7 @@
  "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
  "follow_suggestions.curated_suggestion": "Pilihan staf",
  "follow_suggestions.dismiss": "Jangan tampilkan lagi",
  "follow_suggestions.friends_of_friends_longer": "Populer di antara orang yang anda ikuti",
  "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
  "follow_suggestions.personalized_suggestion": "Saran yang dipersonalisasi",
@ -308,6 +316,7 @@
  "follow_suggestions.popular_suggestion_longer": "Populer di {domain}",
  "follow_suggestions.similar_to_recently_followed_longer": "Serupa dengan profil yang baru Anda ikuti",
  "follow_suggestions.view_all": "Lihat semua",
  "follow_suggestions.who_to_follow": "Siapa yang harus diikuti",
  "followed_tags": "Tagar yang diikuti",
  "footer.about": "Tentang",
  "footer.directory": "Direktori profil",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -304,7 +304,6 @@
  "filter_modal.select_filter.subtitle": "Usez disponebla grupo o kreez novajo",
  "filter_modal.select_filter.title": "Filtragez ca posto",
  "filter_modal.title.status": "Filtragez posto",
  "filter_warning.matches_filter": "Sama kam filtrilo \"{title}\"",
  "filtered_notifications_banner.pending_requests": "De {count, plural,=0 {nulu} one {1 persono} other {# personi}} quan vu forsan konocas",
  "filtered_notifications_banner.title": "Filtrilita savigi",
  "firehose.all": "Omno",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
  "content_warning.hide": "Fela færslu",
  "content_warning.show": "Birta samt",
  "content_warning.show_more": "Sýna meira",
  "conversation.delete": "Eyða samtali",
  "conversation.mark_as_read": "Merkja sem lesið",
  "conversation.open": "Skoða samtal",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
  "filter_modal.select_filter.title": "Sía þessa færslu",
  "filter_modal.title.status": "Sía færslu",
-  "filter_warning.matches_filter": "Samsvarar síunni“{title}”",
+  "filter_warning.matches_filter": "Samsvarar síunni “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {engum} one {einum aðila} other {# manns}} sem þú gætir þekkt",
  "filtered_notifications_banner.title": "Síaðar tilkynningar",
  "firehose.all": "Allt",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
  "interaction_modal.description.reblog": "Með notandaaðgangi á Mastodon geturðu endurbirt þessa færslu til að deila henni með þeim sem fylgjast með þér.",
  "interaction_modal.description.reply": "Með notandaaðgangi á Mastodon geturðu svarað þessari færslu.",
  "interaction_modal.description.vote": "Þú getur greitt atkvæði í þessari könnun ef þú ert með aðgang á Mastodon.",
  "interaction_modal.login.action": "Fara á heimastreymið mitt",
  "interaction_modal.login.prompt": "Lén heimanetþjónsins þíns, t.d. mastodon.social",
  "interaction_modal.no_account_yet": "Ekki á Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Fylgjast með {name}",
  "interaction_modal.title.reblog": "Endurbirta færsluna frá {name}",
  "interaction_modal.title.reply": "Svara færslunni frá {name}",
  "interaction_modal.title.vote": "Greiða atkvæði í könnun á vegum {name}",
  "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
  "intervals.full.hours": "{number, plural, one {# klukkustund} other {# klukkustundir}}",
  "intervals.full.minutes": "{number, plural, one {# mínúta} other {# mínútur}}",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Smettere di seguire l'utente?",
  "content_warning.hide": "Nascondi post",
  "content_warning.show": "Mostra comunque",
  "content_warning.show_more": "Mostra di più",
  "conversation.delete": "Elimina conversazione",
  "conversation.mark_as_read": "Segna come letto",
  "conversation.open": "Visualizza conversazione",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
  "filter_modal.select_filter.title": "Filtra questo post",
  "filter_modal.title.status": "Filtra un post",
-  "filter_warning.matches_filter": "Corrisponde al filtro \"{title}\"",
+  "filter_warning.matches_filter": "Corrisponde al filtro “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
  "filtered_notifications_banner.title": "Notifiche filtrate",
  "firehose.all": "Tutto",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
  "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
  "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
  "interaction_modal.description.vote": "Con un account su Mastodon puoi votare in questo sondaggio.",
  "interaction_modal.login.action": "Portami alla pagina iniziale",
  "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
  "interaction_modal.no_account_yet": "Non su Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Segui {name}",
  "interaction_modal.title.reblog": "Reblogga il post di {name}",
  "interaction_modal.title.reply": "Rispondi al post di {name}",
  "interaction_modal.title.vote": "Vota nel sondaggio di {name}",
  "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
  "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "アンケート期間",
  "compose_form.poll.multiple": "複数選択",
  "compose_form.poll.option_placeholder": "項目{number}",
  "compose_form.poll.single": "単一選択",
  "compose_form.poll.switch_to_multiple": "複数選択に変更",
  "compose_form.poll.switch_to_single": "単一選択に変更",
  "compose_form.poll.type": "スタイル",
@ -195,7 +196,8 @@
  "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
  "confirmations.unfollow.title": "フォローを解除しようとしています",
  "content_warning.hide": "内容を隠す",
-  "content_warning.show": "承知の上で表示",
+  "content_warning.show": "承知して表示",
  "content_warning.show_more": "続きを表示",
  "conversation.delete": "会話を削除",
  "conversation.mark_as_read": "既読にする",
  "conversation.open": "会話を表示",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
  "filter_modal.select_filter.title": "この投稿をフィルターする",
  "filter_modal.title.status": "投稿をフィルターする",
-  "filter_warning.matches_filter": "フィルター「{title}」に一致する投稿です",
+  "filter_warning.matches_filter": "フィルター「<span>{title}</span>」に一致する投稿",
  "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
  "filtered_notifications_banner.title": "保留中の通知",
  "firehose.all": "すべて",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。",
  "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。",
  "interaction_modal.description.reply": "Mastodonのアカウントでこの投稿に反応できます。",
  "interaction_modal.description.vote": "Mastodonのアカウントでこのアンケートに票を入れることができます。",
  "interaction_modal.login.action": "サーバーに移動",
  "interaction_modal.login.prompt": "登録したサーバーのドメイン (例: mastodon.social)",
  "interaction_modal.no_account_yet": "Mastodonにアカウントがない場合は",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "{name}さんをフォロー",
  "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
  "interaction_modal.title.reply": "{name}さんの投稿にリプライ",
  "interaction_modal.title.vote": "{name}さんのアンケートに投票",
  "intervals.full.days": "{number}日",
  "intervals.full.hours": "{number}時間",
  "intervals.full.minutes": "{number}分",
@ -503,12 +507,13 @@
  "notification.admin.report_statuses": "{name}さんが{target}さんを「{category}」として通報しました",
  "notification.admin.report_statuses_other": "{name}さんが{target}さんを通報しました",
  "notification.admin.sign_up": "{name}さんがサインアップしました",
-  "notification.admin.sign_up.name_and_others": "{name}さんほか{count, plural, other {#人}}がサインアップしました",
+  "notification.admin.sign_up.name_and_others": "{name}さんとほか{count, plural, other {#人}}がサインアップしました",
  "notification.favourite": "{name}さんがお気に入りしました",
-  "notification.favourite.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
+  "notification.favourite.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
  "notification.follow": "{name}さんにフォローされました",
  "notification.follow.name_and_others": "{name}さんと<a>ほか{count, plural, other {#人}}</a>にフォローされました",
  "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
-  "notification.follow_request.name_and_others": "{name}さんほか{count, plural, other {#人}}があなたにフォローリクエストしました",
+  "notification.follow_request.name_and_others": "{name}さんとほか{count, plural, other {#人}}があなたにフォローリクエストしました",
  "notification.label.mention": "メンション",
  "notification.label.private_mention": "非公開の返信 (メンション)",
  "notification.label.private_reply": "非公開の返信",
@ -527,7 +532,7 @@
  "notification.own_poll": "アンケートが終了しました",
  "notification.poll": "投票したアンケートが終了しました",
  "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
-  "notification.reblog.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>にブーストされました",
+  "notification.reblog.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がブーストしました",
  "notification.relationships_severance_event": "{name} との関係が失われました",
  "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
  "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
@ -565,6 +570,7 @@
  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
  "notifications.column_settings.follow": "新しいフォロワー:",
  "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
  "notifications.column_settings.group": "グループ",
  "notifications.column_settings.mention": "返信:",
  "notifications.column_settings.poll": "アンケート結果:",
  "notifications.column_settings.push": "プッシュ通知",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
  "content_warning.hide": "게시물 숨기기",
  "content_warning.show": "무시하고 보기",
  "content_warning.show_more": "더 보기",
  "conversation.delete": "대화 삭제",
  "conversation.mark_as_read": "읽은 상태로 표시",
  "conversation.open": "대화 보기",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
  "filter_modal.select_filter.title": "이 게시물을 필터",
  "filter_modal.title.status": "게시물 필터",
-  "filter_warning.matches_filter": "\"{title}\" 필터에 걸림",
+  "filter_warning.matches_filter": "\"<span>{title}</span>\" 필터에 걸림",
  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
  "filtered_notifications_banner.title": "걸러진 알림",
  "firehose.all": "모두",
@ -351,7 +352,7 @@
  "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
  "hashtag.counter_by_accounts": "{count, plural, other {참여자 {counter}명}}",
  "hashtag.counter_by_uses": "{count, plural, other {게시물 {counter}개}}",
-  "hashtag.counter_by_uses_today": "금일 {count, plural, other {게시물 {counter}개}}",
+  "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
  "hashtag.follow": "해시태그 팔로우",
  "hashtag.unfollow": "해시태그 팔로우 해제",
  "hashtags.and_other": "…및 {count, plural,other {#개}}",
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@ -13,6 +13,8 @@
  "account.edit_profile": "Recolere notionem",
  "account.featured_tags.last_status_never": "Nulla contributa",
  "account.featured_tags.title": "Hashtag notātī {name}",
  "account.followers_counter": "{count, plural, one {{counter} sectator} other {{counter} sectatores}}",
  "account.following_counter": "{count, plural, one {{counter} sectans} other {{counter} sectans}}",
  "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
  "account.muted": "Confutatus",
  "account.requested_follow": "{name} postulavit ut te sequeretur",
@ -230,6 +232,7 @@
  "search_results.all": "Omnis",
  "server_banner.active_users": "Usūrāriī āctīvī",
  "server_banner.administered_by": "Administratur:",
  "server_banner.is_one_of_many": "{domain} est unum ex multis independentibus servientibus Mastodon quos adhibere potes ut participes in fediverso.",
  "sign_in_banner.sign_in": "Sign in",
  "status.admin_status": "Open this status in the moderation interface",
  "status.block": "Impedire @{name}",
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@ -191,6 +191,7 @@
  "confirmations.unfollow.title": "Desige utilizador?",
  "content_warning.hide": "Eskonde puvlikasyon",
  "content_warning.show": "Amostra entanto",
  "content_warning.show_more": "Amostra mas",
  "conversation.delete": "Efasa konversasyon",
  "conversation.mark_as_read": "Marka komo meldado",
  "conversation.open": "Ve konversasyon",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "Apklausos trukmė",
  "compose_form.poll.multiple": "Keli pasirinkimai",
  "compose_form.poll.option_placeholder": "{number} parinktis",
  "compose_form.poll.single": "Vienas pasirinkimas",
  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų leidžiama pasirinkti kelis pasirinkimus",
  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą",
  "compose_form.poll.type": "Stilius",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "Nebesekti naudotoją?",
  "content_warning.hide": "Slėpti įrašą",
  "content_warning.show": "Rodyti vis tiek",
  "content_warning.show_more": "Rodyti daugiau",
  "conversation.delete": "Ištrinti pokalbį",
  "conversation.mark_as_read": "Žymėti kaip skaitytą",
  "conversation.open": "Peržiūrėti pokalbį",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
  "filter_modal.select_filter.title": "Filtruoti šį įrašą",
  "filter_modal.title.status": "Filtruoti įrašą",
-  "filter_warning.matches_filter": "Atitinka filtrą „{title}“",
+  "filter_warning.matches_filter": "Atitinka filtrą „<span>{title}</span>“",
  "filtered_notifications_banner.pending_requests": "Iš {count, plural, =0 {nė vieno} one {žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
  "filtered_notifications_banner.title": "Filtruojami pranešimai",
  "firehose.all": "Visi",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
  "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
  "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
  "interaction_modal.description.vote": "Su „Mastodon“ paskyra galite balsuoti šioje apklausoje.",
  "interaction_modal.login.action": "Į pagrindinį puslapį",
  "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
  "interaction_modal.no_account_yet": "Nesi Mastodon?",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "Sekti {name}",
  "interaction_modal.title.reblog": "Pakelti {name} įrašą",
  "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
  "interaction_modal.title.vote": "Balsuoti {name} apklausoje",
  "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
  "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
  "intervals.full.minutes": "{number, plural, one {# minutė} few {# minutes} many {# minutės} other {# minučių}}",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -146,7 +146,7 @@
  "compose.saved.body": "Ziņa saglabāta.",
  "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
  "compose_form.encryption_warning": "Mastodon ieraksti nav pilnībā šifrēti. Nedalies ar jebkādu jutīgu informāciju caur Mastodon!",
-  "compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
+  "compose_form.hashtag_warning": "Šis ieraksts netiks uzrādīts nevienā tēmturī, jo tas nav redzams visiem. Tikai visiem redzamos ierakstus var meklēt pēc tēmtura.",
  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot, lai redzētu tikai sekotājiem paredzētos ierakstus.",
  "compose_form.lock_disclaimer.lock": "slēgts",
  "compose_form.placeholder": "Kas Tev padomā?",
@ -208,7 +208,7 @@
  "dismissable_banner.dismiss": "Atcelt",
  "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
  "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
-  "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
+  "dismissable_banner.explore_tags": "Šie ir tēmturi, kas šodien gūst uzmanību sabiedriskajā tīmeklī. Tēmturi, kurus izmanto vairāk dažādu cilvēku, tiek vērtēti augstāk.",
  "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
  "domain_block_modal.block": "Bloķēt serveri",
  "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
@ -246,7 +246,7 @@
  "empty_column.favourited_statuses": "Tev vēl nav iecienītāko ierakstu. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.",
  "empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.",
  "empty_column.follow_requests": "Šobrīd Tev nav sekošanas pieprasījumu. Kad saņemsi kādu, tas parādīsies šeit.",
-  "empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
+  "empty_column.followed_tags": "Tu vēl neseko nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
  "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
  "empty_column.home": "Tava mājas laikjosla ir tukša. Seko vairāk cilvēkiem, lai to piepildītu!",
  "empty_column.list": "Pagaidām šajā sarakstā nekā nav. Kad šī saraksta dalībnieki ievietos jaunus ierakstus, tie parādīsies šeit.",
@ -282,7 +282,6 @@
  "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
  "filter_modal.select_filter.title": "Filtrēt šo ziņu",
  "filter_modal.title.status": "Filtrēt ziņu",
  "filter_warning.matches_filter": "Atbilst filtram “{title}”",
  "firehose.all": "Visi",
  "firehose.local": "Šis serveris",
  "firehose.remote": "Citi serveri",
@ -315,8 +314,8 @@
  "hashtag.column_settings.tag_mode.all": "Visi no šiem",
  "hashtag.column_settings.tag_mode.any": "Kāds no šiem",
  "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
-  "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
+  "hashtag.column_settings.tag_toggle": "Iekļaut šajā kolonnā papildu birkas",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalībnieks} other {{counter} dalībnieki}}",
+  "hashtag.counter_by_accounts": "{count, plural, zero{{counter} dalībnieku} one {{counter} dalībnieks} other {{counter} dalībnieki}}",
  "hashtag.counter_by_uses": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
  "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
  "hashtag.follow": "Sekot tēmturim",
@ -412,6 +411,7 @@
  "mute_modal.show_options": "Parādīt iespējas",
  "mute_modal.title": "Apklusināt lietotāju?",
  "navigation_bar.about": "Par",
  "navigation_bar.administration": "Pārvaldība",
  "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
  "navigation_bar.blocks": "Bloķētie lietotāji",
  "navigation_bar.bookmarks": "Grāmatzīmes",
@ -428,6 +428,7 @@
  "navigation_bar.follows_and_followers": "Sekojamie un sekotāji",
  "navigation_bar.lists": "Saraksti",
  "navigation_bar.logout": "Iziet",
  "navigation_bar.moderation": "Satura pārraudzība",
  "navigation_bar.mutes": "Apklusinātie lietotāji",
  "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
  "navigation_bar.personal": "Personīgie",
@ -443,9 +444,11 @@
  "notification.follow": "{name} uzsāka Tev sekot",
  "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
  "notification.moderation-warning.learn_more": "Uzzināt vairāk",
  "notification.moderation_warning": "Ir saņemts satura pārraudzības brīdinājums",
  "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
  "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Daži no Taviem ierakstiem tika atzīmēti kā jutīgi.",
  "notification.moderation_warning.action_none": "Konts ir saņēmis satura pārraudzības brīdinājumu.",
  "notification.moderation_warning.action_sensitive": "Tavi ieraksti turpmāk tiks atzīmēti kā jutīgi.",
  "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
  "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
@ -554,7 +557,8 @@
  "privacy.private.long": "Tikai Tavi sekotāji",
  "privacy.private.short": "Sekotāji",
  "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
-  "privacy.public.short": "Publiska",
+  "privacy.public.short": "Redzams visiem",
  "privacy.unlisted.additional": "Šis uzvedas tieši kā publisks, izņemot to, ka ieraksts neparādīsies tiešraides barotnēs vai tēmturos, izpētē vai Mastodon meklēšanā, pat ja esi to norādījis visa konta ietvaros.",
  "privacy.unlisted.long": "Mazāk algoritmisku fanfaru",
  "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
  "privacy_policy.title": "Privātuma politika",
@ -652,9 +656,9 @@
  "sign_in_banner.create_account": "Izveidot kontu",
  "sign_in_banner.sign_in": "Pieteikties",
  "sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
-  "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
+  "status.admin_account": "Atvērt @{name} satura pārraudzības saskarni",
-  "status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
+  "status.admin_domain": "Atvērt {domain} satura pārraudzības saskarni",
-  "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
+  "status.admin_status": "Atvērt šo ziņu satura pārraudzības saskarnē",
  "status.block": "Bloķēt @{name}",
  "status.bookmark": "Grāmatzīme",
  "status.cancel_reblog_private": "Nepastiprināt",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Gebruiker ontvolgen?",
  "content_warning.hide": "Bericht verbergen",
  "content_warning.show": "Alsnog tonen",
  "content_warning.show_more": "Meer tonen",
  "conversation.delete": "Gesprek verwijderen",
  "conversation.mark_as_read": "Als gelezen markeren",
  "conversation.open": "Gesprek tonen",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
  "filter_modal.select_filter.title": "Dit bericht filteren",
  "filter_modal.title.status": "Een bericht filteren",
-  "filter_warning.matches_filter": "Komt overeen met filter “{title}”",
+  "filter_warning.matches_filter": "Komt overeen met filter \"<span>{title}</span>\"",
  "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
  "filtered_notifications_banner.title": "Gefilterde meldingen",
  "firehose.all": "Alles",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
  "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
  "interaction_modal.description.reply": "Je kunt met een Mastodon-account op dit bericht reageren.",
  "interaction_modal.description.vote": "Met een Mastodon-account kun je stemmen in deze peiling.",
  "interaction_modal.login.action": "Ga naar start",
  "interaction_modal.login.prompt": "Domein van jouw server, bv. mastodon.social",
  "interaction_modal.no_account_yet": "Niet op Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "{name} volgen",
  "interaction_modal.title.reblog": "Bericht van {name} boosten",
  "interaction_modal.title.reply": "Op het bericht van {name} reageren",
  "interaction_modal.title.vote": "Stemmen in {name}'s peiling",
  "intervals.full.days": "{number, plural, one {# dag} other {# dagen}}",
  "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
  "intervals.full.minutes": "{number, plural, one {# minuut} other {# minuten}}",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -305,7 +305,6 @@
  "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
  "filter_modal.select_filter.title": "Filtrer dette innlegget",
  "filter_modal.title.status": "Filtrer eit innlegg",
  "filter_warning.matches_filter": "Passar med filteret «{title}»",
  "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
  "filtered_notifications_banner.title": "Filtrerte varslingar",
  "firehose.all": "Alle",
@ -385,6 +384,7 @@
  "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
  "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
  "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.",
  "interaction_modal.description.vote": "Med ein konto på Mastodon kan du røyste i denne avrøystinga.",
  "interaction_modal.login.action": "Ta meg heim",
  "interaction_modal.login.prompt": "Domenenamnet til din heime-tenar. t.d. mastodon.social",
  "interaction_modal.no_account_yet": "Ikkje på Mastodon?",
@ -396,6 +396,7 @@
  "interaction_modal.title.follow": "Fylg {name}",
  "interaction_modal.title.reblog": "Framhev {name} sitt innlegg",
  "interaction_modal.title.reply": "Svar på innlegge til {name}",
  "interaction_modal.title.vote": "Røyst i {name} si avrøysting",
  "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
  "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
  "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutt}}",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -301,7 +301,6 @@
  "filter_modal.select_filter.subtitle": "Bruk en eksisterende kategori eller opprett en ny",
  "filter_modal.select_filter.title": "Filtrer dette innlegget",
  "filter_modal.title.status": "Filtrer et innlegg",
  "filter_warning.matches_filter": "Passer med filteret «{title}»",
  "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {en person} other {# folk}} du kanskje kjenner",
  "filtered_notifications_banner.title": "Filtrerte varsler",
  "firehose.all": "Alt",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Przestać obserwować?",
  "content_warning.hide": "Ukryj wpis",
  "content_warning.show": "Pokaż mimo to",
  "content_warning.show_more": "Rozwiń",
  "conversation.delete": "Usuń konwersację",
  "conversation.mark_as_read": "Oznacz jako przeczytane",
  "conversation.open": "Zobacz konwersację",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
  "filter_modal.select_filter.title": "Filtruj ten wpis",
  "filter_modal.title.status": "Filtruj wpis",
-  "filter_warning.matches_filter": "Pasuje do filtra \"{title}\"",
+  "filter_warning.matches_filter": "Pasuje do filtra \"<span>{title}</span>\"",
  "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
  "filtered_notifications_banner.title": "Powiadomienia filtrowane",
  "firehose.all": "Wszystko",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
  "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
  "interaction_modal.description.reply": "Mając konto na Mastodonie, możesz odpowiedzieć na ten wpis.",
  "interaction_modal.description.vote": "Mając konto na Mastodonie, możesz wziąć udział w tym głosowaniu.",
  "interaction_modal.login.action": "Wróć na stronę główną",
  "interaction_modal.login.prompt": "Domena twojego serwera domowego, np. \"mastodon.social\"",
  "interaction_modal.no_account_yet": "Nie masz konta na Mastodonie?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Śledź {name}",
  "interaction_modal.title.reblog": "Podbij wpis {name}",
  "interaction_modal.title.reply": "Odpowiedz na post {name}",
  "interaction_modal.title.vote": "Weź udział w głosowaniu {name}",
  "intervals.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}}",
  "intervals.full.hours": "{number, plural, one {# godzina} few {# godziny} many {# godzin} other {# godzin}}",
  "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Deixar de seguir o usuário?",
  "content_warning.hide": "Ocultar post",
  "content_warning.show": "Mostrar mesmo assim",
  "content_warning.show_more": "Mostrar mais",
  "conversation.delete": "Excluir conversa",
  "conversation.mark_as_read": "Marcar como lida",
  "conversation.open": "Ver conversa",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
  "filter_modal.select_filter.title": "Filtrar esta publicação",
  "filter_modal.title.status": "Filtrar uma publicação",
-  "filter_warning.matches_filter": "Correspondente ao filtro “{title}”",
+  "filter_warning.matches_filter": "Corresponder filtro “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Por {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
  "filtered_notifications_banner.title": "Notificações filtradas",
  "firehose.all": "Tudo",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.",
  "interaction_modal.description.reblog": "Com uma conta no Mastodon, você pode impulsionar esta publicação para compartilhá-lo com seus próprios seguidores.",
  "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.",
  "interaction_modal.description.vote": "Com uma conta no Mastodon, você pode votar nesta enquete.",
  "interaction_modal.login.action": "Leve-me para casa",
  "interaction_modal.login.prompt": "Domínio do seu servidor hospedeiro; por exemplo, mastodon.social",
  "interaction_modal.no_account_yet": "Ainda não está no Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Seguir {name}",
  "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
  "interaction_modal.title.reply": "Responder à publicação de {name}",
  "interaction_modal.title.vote": "Votar na enquete de {name}",
  "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -301,7 +301,6 @@
  "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
  "filter_modal.select_filter.title": "Filtrar esta publicação",
  "filter_modal.title.status": "Filtrar uma publicação",
  "filter_warning.matches_filter": "Corresponde ao filtro “{title}”",
  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
  "filtered_notifications_banner.title": "Notificações filtradas",
  "firehose.all": "Todas",
@ -773,7 +772,7 @@
  "status.bookmark": "Guardar nos marcadores",
  "status.cancel_reblog_private": "Deixar de reforçar",
  "status.cannot_reblog": "Não é possível partilhar esta publicação",
-  "status.continued_thread": "Continuação da conserva",
+  "status.continued_thread": "Continuação da conversa",
  "status.copy": "Copiar hiperligação para a publicação",
  "status.delete": "Eliminar",
  "status.detailed_status": "Vista pormenorizada da conversa",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -36,7 +36,7 @@
  "account.followers.empty": "На этого пользователя пока никто не подписан.",
  "account.followers_counter": "{count, plural, one {{counter} подписчик} few {{counter} подписчика} other {{counter} подписчиков}}",
  "account.following": "Подписки",
-  "account.following_counter": "{count, plural, one {{counter} последующий} other {{counter} последующие}}",
+  "account.following_counter": "{count, plural, one {# подписка} many {# подписок} other {# подписки}}",
  "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
  "account.go_to_profile": "Перейти к профилю",
  "account.hide_reblogs": "Скрыть продвижения от @{name}",
@ -303,8 +303,7 @@
  "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
  "filter_modal.select_filter.title": "Фильтровать этот пост",
  "filter_modal.title.status": "Фильтровать пост",
-  "filter_warning.matches_filter": "Соответствует фильтру \"{title}\"",
+  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни одного человека} one {одного человека} other {# человек}}",
  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни один} one {один человек} other {# люди}}",
  "filtered_notifications_banner.title": "Отфильтрованные уведомления",
  "firehose.all": "Все",
  "firehose.local": "Текущий сервер",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -155,6 +155,7 @@
  "compose_form.poll.duration": "Trvanie ankety",
  "compose_form.poll.multiple": "Viacero možností",
  "compose_form.poll.option_placeholder": "Možnosť {number}",
  "compose_form.poll.single": "Jediná voľba",
  "compose_form.poll.switch_to_multiple": "Zmeniť anketu a povoliť viaceré možnosti",
  "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber",
  "compose_form.poll.type": "Typ",
@ -290,7 +291,6 @@
  "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
  "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
  "filter_modal.title.status": "Filtrovanie príspevku",
  "filter_warning.matches_filter": "Zhody triedenia “{title}”",
  "filtered_notifications_banner.title": "Filtrované oznámenia",
  "firehose.all": "Všetko",
  "firehose.local": "Tento server",
@ -404,6 +404,7 @@
  "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
  "link_preview.author": "Autor: {name}",
  "link_preview.more_from_author": "Viac od {name}",
  "link_preview.shares": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
  "lists.account.add": "Pridať do zoznamu",
  "lists.account.remove": "Odstrániť zo zoznamu",
  "lists.delete": "Vymazať zoznam",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
  "content_warning.hide": "Fshihe postimin",
  "content_warning.show": "Shfaqe, sido qoftë",
  "content_warning.show_more": "Shfaq më tepër",
  "conversation.delete": "Fshije bisedën",
  "conversation.mark_as_read": "Vëri shenjë si të lexuar",
  "conversation.open": "Shfaq bisedën",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
  "filter_modal.select_filter.title": "Filtroje këtë postim",
  "filter_modal.title.status": "Filtroni një postim",
-  "filter_warning.matches_filter": "Ka përkim me filtrin “{title}”",
+  "filter_warning.matches_filter": "Ka përkim me filtrin “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
  "filtered_notifications_banner.title": "Njoftime të filtruar",
  "firehose.all": "Krejt",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Me një llogari në Mastodon, mund ta ndiqni {name} për të marrë postimet e tyre në prurjen tuaj të kreut.",
  "interaction_modal.description.reblog": "Me një llogari në Mastodon, mund ta përforconi këtë postim për ta ndarë me ndjekësit tuaj.",
  "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.",
  "interaction_modal.description.vote": "Me një llogari në Mastodon, mund të votoni në këtë pyetësor.",
  "interaction_modal.login.action": "Shpjemëni në shtëpi",
  "interaction_modal.login.prompt": "Përkatësia e shërbyesit tuaj vatër, p.sh. mastodon.social",
  "interaction_modal.no_account_yet": "S’gjendeni në Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Ndiq {name}",
  "interaction_modal.title.reblog": "Përforconi postimin e {name}",
  "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
  "interaction_modal.title.vote": "Votoni te pyetësori nga {name}",
  "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}",
  "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}",
  "intervals.full.minutes": "{number, plural, one {# minutë} other {# minuta}}",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -22,7 +22,7 @@
  "account.cancel_follow_request": "Återkalla din begäran om att få följa",
  "account.copy": "Kopiera länk till profil",
  "account.direct": "Nämn @{name} privat",
-  "account.disable_notifications": "Sluta notifiera mig när @{name} gör inlägg",
+  "account.disable_notifications": "Sluta meddela mig när @{name} skriver ett inlägg",
  "account.domain_blocked": "Domän blockerad",
  "account.edit_profile": "Redigera profil",
  "account.enable_notifications": "Notifiera mig när @{name} gör inlägg",
@ -44,7 +44,7 @@
  "account.joined_short": "Gick med",
  "account.languages": "Ändra vilka språk du helst vill se i ditt flöde",
  "account.link_verified_on": "Ägarskap för denna länk kontrollerades den {date}",
-  "account.locked_info": "För detta konto har ägaren valt att manuellt godkänna vem som kan följa hen.",
+  "account.locked_info": "Detta konto har låst integritetsstatus. Ägaren väljer manuellt vem som kan följa det.",
  "account.media": "Media",
  "account.mention": "Nämn @{name}",
  "account.moved_to": "{name} har indikerat att hen har ett nytt konto:",
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Avfölj %s?",
  "content_warning.hide": "Dölj inlägg",
  "content_warning.show": "Visa ändå",
  "content_warning.show_more": "Visa mer",
  "conversation.delete": "Radera konversation",
  "conversation.mark_as_read": "Markera som läst",
  "conversation.open": "Visa konversation",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
  "filter_modal.select_filter.title": "Filtrera detta inlägg",
  "filter_modal.title.status": "Filtrera ett inlägg",
-  "filter_warning.matches_filter": "Matchar filtret \"{title}\"",
+  "filter_warning.matches_filter": "Matchar filtret \"<span>{title}</span>\"",
  "filtered_notifications_banner.pending_requests": "Från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
  "filtered_notifications_banner.title": "Filtrerade aviseringar",
  "firehose.all": "Allt",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.",
  "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
  "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.",
  "interaction_modal.description.vote": "Med ett konto på Mastodon kan du delta i denna omröstning.",
  "interaction_modal.login.action": "Ta hem mig",
  "interaction_modal.login.prompt": "Domän för din hemserver, t.ex. mastodon.social",
  "interaction_modal.no_account_yet": "Inte på Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Följ {name}",
  "interaction_modal.title.reblog": "Boosta {name}s inlägg",
  "interaction_modal.title.reply": "Svara på {name}s inlägg",
  "interaction_modal.title.vote": "Rösta i {name}s enkät",
  "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
  "intervals.full.hours": "{number, plural, one {# timme} other {# timmar}}",
  "intervals.full.minutes": "{number, plural, one {# minut} other {# minuter}}",
@ -508,6 +511,7 @@
  "notification.favourite": "{name} favoritmarkerade ditt inlägg",
  "notification.favourite.name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> har favoritmarkerat ditt inlägg",
  "notification.follow": "{name} följer dig",
  "notification.follow.name_and_others": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> följer dig",
  "notification.follow_request": "{name} har begärt att följa dig",
  "notification.follow_request.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har bett att följa dig",
  "notification.label.mention": "Nämn",
@ -566,6 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Snabbfilter",
  "notifications.column_settings.follow": "Nya följare:",
  "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
  "notifications.column_settings.group": "Gruppera",
  "notifications.column_settings.mention": "Omnämningar:",
  "notifications.column_settings.poll": "Omröstningsresultat:",
  "notifications.column_settings.push": "Push-aviseringar",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -44,7 +44,7 @@
  "account.joined_short": "เข้าร่วมเมื่อ",
  "account.languages": "เปลี่ยนภาษาที่บอกรับ",
  "account.link_verified_on": "ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ {date}",
-  "account.locked_info": "มีการตั้งสถานะความเป็นส่วนตัวของบัญชีนี้เป็นล็อคอยู่ เจ้าของตรวจทานผู้ที่สามารถติดตามเขาด้วยตนเอง",
+  "account.locked_info": "สถานะความเป็นส่วนตัวของบัญชีนี้ถูกตั้งค่าเป็นล็อค เจ้าของตรวจสอบด้วยตนเองว่าใครสามารถติดตามพวกเขาได้",
  "account.media": "สื่อ",
  "account.mention": "กล่าวถึง @{name}",
  "account.moved_to": "{name} ได้ระบุว่าบัญชีใหม่ของเขาในตอนนี้คือ:",
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
  "compose_form.poll.multiple": "หลายตัวเลือก",
  "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
  "compose_form.poll.single": "ตัวเลือกเดียว",
  "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
  "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดียว",
  "compose_form.poll.type": "ลักษณะ",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
  "content_warning.hide": "ซ่อนโพสต์",
  "content_warning.show": "แสดงต่อไป",
  "content_warning.show_more": "แสดงเพิ่มเติม",
  "conversation.delete": "ลบการสนทนา",
  "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
  "conversation.open": "ดูการสนทนา",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
  "filter_modal.select_filter.title": "กรองโพสต์นี้",
  "filter_modal.title.status": "กรองโพสต์",
-  "filter_warning.matches_filter": "ตรงกับตัวกรอง “{title}”",
+  "filter_warning.matches_filter": "ตรงกับตัวกรอง “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "จาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
  "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
  "firehose.all": "ทั้งหมด",
@ -507,6 +509,7 @@
  "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
  "notification.favourite.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ชื่นชอบโพสต์ของคุณ",
  "notification.follow": "{name} ได้ติดตามคุณ",
  "notification.follow.name_and_others": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ติดตามคุณ",
  "notification.follow_request": "{name} ได้ขอติดตามคุณ",
  "notification.follow_request.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ขอติดตามคุณ",
  "notification.label.mention": "การกล่าวถึง",
@ -565,6 +568,7 @@
  "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
  "notifications.column_settings.follow": "ผู้ติดตามใหม่:",
  "notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
  "notifications.column_settings.group": "จัดกลุ่ม",
  "notifications.column_settings.mention": "การกล่าวถึง:",
  "notifications.column_settings.poll": "ผลลัพธ์การสำรวจความคิดเห็น:",
  "notifications.column_settings.push": "การแจ้งเตือนแบบผลัก",
@ -851,6 +855,11 @@
  "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
  "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
  "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
  "upload_form.drag_and_drop.instructions": "หากต้องการเลือกไฟล์สื่อ ให้กดปุ่มที Space หรือ Enter บนแป้นพิมพ์ เมื่อเลือกไฟล์ได้แล้ว ก็สามารถใช้ปุ่มลูกศรเพื่อเลื่อนไฟล์ไปในทิศทางที่ต้องการได้ เมื่อต้องการวางไฟล์ในตำแหน่งใหม่ ให้กดปุ่ม Space หรือ Enter ดูอีกครั้ง หรือหากต้องการยกเลิกการเลือก ให้กดปุ่ม Esc ได้",
  "upload_form.drag_and_drop.on_drag_cancel": "การลากไฟล์นั้นหยุดชะงัก ไฟล์ที่กำลังแนบมาถูกยกเลิก {item} ได้ถูกลบทิ้งแล้ว",
  "upload_form.drag_and_drop.on_drag_end": "ไฟล์แนบ {item} ได้ถูกยกเลิกแล้ว",
  "upload_form.drag_and_drop.on_drag_over": "ไฟล์แนบ {item} ได้ถูกย้ายไปแล้ว",
  "upload_form.drag_and_drop.on_drag_start": "ได้รับไฟล์แนบเรียบร้อยแล้ว {item}.",
  "upload_form.edit": "แก้ไข",
  "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
  "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
  "content_warning.hide": "Gönderiyi gizle",
  "content_warning.show": "Yine de göster",
  "content_warning.show_more": "Daha fazla göster",
  "conversation.delete": "Sohbeti sil",
  "conversation.mark_as_read": "Okundu olarak işaretle",
  "conversation.open": "Sohbeti görüntüle",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
  "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
  "filter_modal.title.status": "Bir gönderi süzgeçle",
-  "filter_warning.matches_filter": "“{title}” filtresiyle eşleşiyor",
+  "filter_warning.matches_filter": "“<span>{title}</span>” filtresiyle eşleşiyor",
  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}}",
  "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
  "firehose.all": "Tümü",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.",
  "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için tuşlayabilirsiniz.",
  "interaction_modal.description.reply": "Mastodon'daki bir hesapla, bu gönderiye yanıt verebilirsiniz.",
  "interaction_modal.description.vote": "Mastodon'daki bir hesapla, bu ankette oy kullanabilirsiniz.",
  "interaction_modal.login.action": "Anasayfaya geri dön",
  "interaction_modal.login.prompt": "Ev sunucunuzun etki alanı, örneğin mastodon.social",
  "interaction_modal.no_account_yet": "Mastodon açık değil?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "{name} kişisini takip et",
  "interaction_modal.title.reblog": "{name} kişisinin gönderisini yeniden paylaş",
  "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver",
  "interaction_modal.title.vote": "{name} kullanıcısının anketinde oy kullan",
  "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
  "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
  "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -158,6 +158,7 @@
  "compose_form.poll.duration": "Тривалість опитування",
  "compose_form.poll.multiple": "Кілька варіантів",
  "compose_form.poll.option_placeholder": "Варіант {number}",
  "compose_form.poll.single": "Один вибір",
  "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
  "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
  "compose_form.poll.type": "Стиль",
@ -196,6 +197,7 @@
  "confirmations.unfollow.title": "Відписатися від користувача?",
  "content_warning.hide": "Сховати допис",
  "content_warning.show": "Усе одно показати",
  "content_warning.show_more": "Показати більше",
  "conversation.delete": "Видалити бесіду",
  "conversation.mark_as_read": "Позначити як прочитане",
  "conversation.open": "Переглянути бесіду",
@ -304,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
  "filter_modal.select_filter.title": "Фільтрувати цей допис",
  "filter_modal.title.status": "Фільтрувати допис",
-  "filter_warning.matches_filter": "Збігається з фільтром “{title}”",
+  "filter_warning.matches_filter": "Збігається з фільтром “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
  "filtered_notifications_banner.title": "Відфільтровані сповіщення",
  "firehose.all": "Всі",
@ -384,6 +386,7 @@
  "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
  "interaction_modal.description.reblog": "Маючи обліковий запис на Mastodon, ви можете поширити цей допис, щоб поділитися ним зі своїми підписниками.",
  "interaction_modal.description.reply": "Маючи обліковий запис на Mastodon, ви можете відповісти на цей допис.",
  "interaction_modal.description.vote": "Маючи обліковий запис на Mastodon, ви можете проголосувати в цьому опитуванні.",
  "interaction_modal.login.action": "На домашню сторінку",
  "interaction_modal.login.prompt": "Домен вашого домашнього сервера, наприклад, mastodon.social",
  "interaction_modal.no_account_yet": "Не зареєстровані в Mastodon?",
@ -395,6 +398,7 @@
  "interaction_modal.title.follow": "Підписатися на {name}",
  "interaction_modal.title.reblog": "Поширити допис {name}",
  "interaction_modal.title.reply": "Відповісти на допис {name}",
  "interaction_modal.title.vote": "Проголосувати в опитуванні {name}",
  "intervals.full.days": "{number, plural, one {# день} few {# дні} other {# днів}}",
  "intervals.full.hours": "{number, plural, one {# година} few {# години} other {# годин}}",
  "intervals.full.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
@ -507,6 +511,7 @@
  "notification.favourite": "Ваш допис сподобався {name}",
  "notification.favourite.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> вподобали ваш допис",
  "notification.follow": "{name} підписалися на вас",
  "notification.follow.name_and_others": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> стежать за вами",
  "notification.follow_request": "{name} відправили запит на підписку",
  "notification.follow_request.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} надсилають вам запит на стеження",
  "notification.label.mention": "Згадка",
@ -565,7 +570,7 @@
  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
  "notifications.column_settings.follow": "Нові підписники:",
  "notifications.column_settings.follow_request": "Нові запити на підписку:",
-  "notifications.column_settings.group": "Група",
+  "notifications.column_settings.group": "Групувати",
  "notifications.column_settings.mention": "Згадки:",
  "notifications.column_settings.poll": "Результати опитування:",
  "notifications.column_settings.push": "Push-сповіщення",
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "Bỏ theo dõi",
  "content_warning.hide": "Ẩn lại",
  "content_warning.show": "Nhấn để xem",
  "content_warning.show_more": "Hiện thêm",
  "conversation.delete": "Xóa tin nhắn này",
  "conversation.mark_as_read": "Đánh dấu là đã đọc",
  "conversation.open": "Xem toàn bộ tin nhắn",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
  "filter_modal.select_filter.title": "Lọc tút này",
  "filter_modal.title.status": "Lọc một tút",
-  "filter_warning.matches_filter": "Khớp bộ lọc “{title}”",
+  "filter_warning.matches_filter": "Khớp bộ lọc “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "Từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
  "filtered_notifications_banner.title": "Thông báo đã lọc",
  "firehose.all": "Toàn bộ",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để tút của họ hiện trên bảng tin của mình.",
  "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.",
  "interaction_modal.description.reply": "Với tài khoản Mastodon, bạn có thể trả lời tút này.",
  "interaction_modal.description.vote": "Với tài khoản Mastodon, bạn có thể tham gia bình chọn.",
  "interaction_modal.login.action": "Đăng nhập ngay",
  "interaction_modal.login.prompt": "Địa chỉ máy chủ của bạn, vd: mastodon.social",
  "interaction_modal.no_account_yet": "Chưa có tài khoản Mastodon?",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "Theo dõi {name}",
  "interaction_modal.title.reblog": "Đăng lại tút của {name}",
  "interaction_modal.title.reply": "Trả lời tút của {name}",
  "interaction_modal.title.vote": "Bình chọn cùng {name}",
  "intervals.full.days": "{number, plural, other {# ngày}}",
  "intervals.full.hours": "{number, plural, other {# giờ}}",
  "intervals.full.minutes": "{number, plural, other {# phút}}",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "是否取消关注用户？",
  "content_warning.hide": "隐藏嘟文",
  "content_warning.show": "仍然显示",
  "content_warning.show_more": "显示更多",
  "conversation.delete": "删除对话",
  "conversation.mark_as_read": "标记为已读",
  "conversation.open": "查看对话",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
  "filter_modal.select_filter.title": "过滤此嘟文",
  "filter_modal.title.status": "过滤一条嘟文",
-  "filter_warning.matches_filter": "命中过滤规则 “{title}”",
+  "filter_warning.matches_filter": "命中过滤规则 “<span>{title}</span>”",
  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}",
  "filtered_notifications_banner.title": "通知（已过滤）",
  "firehose.all": "全部",
@ -382,9 +383,10 @@
  "ignore_notifications_modal.not_following_title": "是否忽略你未关注的人的通知？",
  "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
  "interaction_modal.description.favourite": "只需一个 Mastodon 账号，即可喜欢这条嘟文，对嘟文的作者展示您欣赏的态度，并保存嘟文以供日后使用。",
-  "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的主页上接收对方的新嘟文。",
+  "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你就可以关注 {name} 并在自己的主页上接收对方的新嘟文。",
-  "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。",
+  "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你就可以向自己的关注者们转发此嘟文。",
-  "interaction_modal.description.reply": "拥有一个 Mastodon 账号，你可以回复此嘟文。",
+  "interaction_modal.description.reply": "拥有一个 Mastodon 账号，你就可以回复此嘟文。",
  "interaction_modal.description.vote": "拥有一个 Mastodon 账号，你就可以参与此投票。",
  "interaction_modal.login.action": "转到主页",
  "interaction_modal.login.prompt": "您所入驻的服务器域名，如：mastodon.social",
  "interaction_modal.no_account_yet": "不在 Mastodon 上？",
@ -396,6 +398,7 @@
  "interaction_modal.title.follow": "关注 {name}",
  "interaction_modal.title.reblog": "转发 {name} 的嘟文",
  "interaction_modal.title.reply": "回复 {name} 的嘟文",
  "interaction_modal.title.vote": "参与 {name} 的投票",
  "intervals.full.days": "{number} 天",
  "intervals.full.hours": "{number} 小时",
  "intervals.full.minutes": "{number} 分钟",
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@ -11,6 +11,7 @@
  "about.not_available": "本伺服器尚未提供這資訊。",
  "about.powered_by": "由 {mastodon} 提供之去中心化社交媒體",
  "about.rules": "伺服器規則",
  "account.account_note_header": "個人筆記",
  "account.add_or_remove_from_list": "從列表中新增或移除",
  "account.badges.bot": "機械人",
  "account.badges.group": "群組",
@ -33,6 +34,7 @@
  "account.follow_back": "追蹤對方",
  "account.followers": "追蹤者",
  "account.followers.empty": "尚未有人追蹤這位使用者。",
  "account.followers_counter": "{count, plural, other {{counter} 個追蹤者}}",
  "account.following": "正在追蹤",
  "account.follows.empty": "這位使用者尚未追蹤任何人。",
  "account.go_to_profile": "前往個人檔案",
@ -81,6 +83,7 @@
  "alert.rate_limited.title": "已限速",
  "alert.unexpected.message": "發生意外錯誤。",
  "alert.unexpected.title": "失敗！",
  "alt_text_badge.title": "替代文字",
  "announcement.announcement": "公告",
  "attachments_list.unprocessed": "（未處理）",
  "audio.hide": "隱藏音訊",
@ -151,6 +154,7 @@
  "compose_form.poll.duration": "投票期限",
  "compose_form.poll.multiple": "多選",
  "compose_form.poll.option_placeholder": "選項 {number}",
  "compose_form.poll.single": "單一選擇",
  "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
  "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
  "compose_form.poll.type": "風格",
@ -168,6 +172,7 @@
  "confirmations.delete.title": "刪除帖文？",
  "confirmations.delete_list.confirm": "刪除",
  "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
  "confirmations.delete_list.title": "刪除列表？",
  "confirmations.discard_edit_media.confirm": "捨棄",
  "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
  "confirmations.edit.confirm": "編輯",
@ -182,6 +187,9 @@
  "confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆？",
  "confirmations.unfollow.confirm": "取消追蹤",
  "confirmations.unfollow.message": "真的不要繼續追蹤 {name} 了嗎？",
  "confirmations.unfollow.title": "取消追蹤使用者？",
  "content_warning.hide": "隱藏嘟文",
  "content_warning.show": "仍要顯示",
  "conversation.delete": "刪除對話",
  "conversation.mark_as_read": "標為已讀",
  "conversation.open": "檢視對話",
@ -343,6 +351,7 @@
  "home.pending_critical_update.link": "查看更新",
  "home.pending_critical_update.title": "有重要的安全更新！",
  "home.show_announcements": "顯示公告",
  "ignore_notifications_modal.ignore": "忽略推播通知",
  "interaction_modal.description.favourite": "有了 Mastodon 的帳號，你便可以把這篇帖文加入最愛，讓作者知道你欣賞他的作品，並可以稍後再閱讀。",
  "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以追蹤 {name} 以於首頁時間軸接收他們的帖文。",
  "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以向自己的追縱者們轉發此帖文。",
@ -417,6 +426,7 @@
  "lists.subheading": "列表",
  "load_pending": "{count, plural, other {# 個新項目}}",
  "loading_indicator.label": "載入中…",
  "media_gallery.hide": "隱藏",
  "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
  "mute_modal.hide_from_notifications": "隱藏通知",
  "mute_modal.hide_options": "隱藏選項",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -1,7 +1,7 @@
 {
  "about.blocks": "被限制的伺服器",
  "about.contact": "聯絡我們：",
-  "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 的註冊商標。",
+  "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 之註冊商標。",
  "about.domain_blocks.no_reason_available": "無法存取的原因",
  "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
  "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
@ -197,6 +197,7 @@
  "confirmations.unfollow.title": "是否取消跟隨該使用者？",
  "content_warning.hide": "隱藏嘟文",
  "content_warning.show": "仍要顯示",
  "content_warning.show_more": "顯示更多",
  "conversation.delete": "刪除對話",
  "conversation.mark_as_read": "標記為已讀",
  "conversation.open": "檢視對話",
@ -305,7 +306,7 @@
  "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
  "filter_modal.select_filter.title": "過濾此嘟文",
  "filter_modal.title.status": "過濾一則嘟文",
-  "filter_warning.matches_filter": "匹配過濾器「{title}」",
+  "filter_warning.matches_filter": "符合過濾器「<span>{title}</span>」",
  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
  "filtered_notifications_banner.title": "已過濾之推播通知",
  "firehose.all": "全部",
@ -385,6 +386,7 @@
  "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
  "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以向您的跟隨者們分享。",
  "interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
  "interaction_modal.description.vote": "若於 Mastodon 上有個帳號，您可以參與此投票。",
  "interaction_modal.login.action": "返回首頁",
  "interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
  "interaction_modal.no_account_yet": "還沒有 Mastodon 帳號嗎？",
@ -396,9 +398,10 @@
  "interaction_modal.title.follow": "跟隨 {name}",
  "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文",
  "interaction_modal.title.reply": "回覆 {name} 的嘟文",
-  "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
+  "interaction_modal.title.vote": "參與 {name} 之投票",
-  "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
+  "intervals.full.days": "{number, plural, other {# 天}}",
-  "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
+  "intervals.full.hours": "{number, plural, other {# 小時}}",
  "intervals.full.minutes": "{number, plural, other {# 分鐘}}",
  "keyboard_shortcuts.back": "上一頁",
  "keyboard_shortcuts.blocked": "開啟「封鎖使用者」列表",
  "keyboard_shortcuts.boost": "轉嘟",
@ -457,7 +460,7 @@
  "lists.replies_policy.title": "顯示回覆：",
  "lists.search": "搜尋您跟隨之使用者",
  "lists.subheading": "您的列表",
-  "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
+  "load_pending": "{count, plural, other {# 個新項目}}",
  "loading_indicator.label": "正在載入...",
  "media_gallery.hide": "隱藏",
  "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
@ -655,11 +658,11 @@
  "poll.closed": "已關閉",
  "poll.refresh": "重新整理",
  "poll.reveal": "檢視結果",
-  "poll.total_people": "{count, plural, one {# 個投票} other {# 個投票}}",
+  "poll.total_people": "{count, plural, other {# 個人}}",
-  "poll.total_votes": "{count, plural, one {# 個投票} other {# 個投票}}",
+  "poll.total_votes": "{count, plural, other {# 張票}}",
  "poll.vote": "投票",
  "poll.voted": "您已對此問題投票",
-  "poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
+  "poll.votes": "{votes, plural, other {# 張票}}",
  "poll_button.add_poll": "新增投票",
  "poll_button.remove_poll": "移除投票",
  "privacy.change": "調整嘟文隱私狀態",
@ -680,10 +683,10 @@
  "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
  "relative_time.days": "{number} 天",
  "relative_time.full.days": "{number, plural, other {# 天}}前",
-  "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
+  "relative_time.full.hours": "{number, plural, other {# 小時}}前",
  "relative_time.full.just_now": "剛剛",
-  "relative_time.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}前",
+  "relative_time.full.minutes": "{number, plural, other {# 分鐘}}前",
-  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
+  "relative_time.full.seconds": "{number, plural, other {# 秒}}前",
  "relative_time.hours": "{number} 小時前",
  "relative_time.just_now": "剛剛",
  "relative_time.minutes": "{number} 分鐘前",
@ -793,7 +796,7 @@
  "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
  "status.embed": "取得嵌入程式碼",
  "status.favourite": "最愛",
-  "status.favourites": "{count, plural, other {# 則最愛}}",
+  "status.favourites": "{count, plural, other {則最愛}}",
  "status.filter": "過濾此嘟文",
  "status.history.created": "{name} 於 {date} 建立",
  "status.history.edited": "{name} 於 {date} 修改",
@ -812,7 +815,7 @@
  "status.reblog": "轉嘟",
  "status.reblog_private": "依照原嘟可見性轉嘟",
  "status.reblogged_by": "{name} 已轉嘟",
-  "status.reblogs": "{count, plural, other {# 則轉嘟}}",
+  "status.reblogs": "{count, plural, other {則轉嘟}}",
  "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
  "status.redraft": "刪除並重新編輯",
  "status.remove_bookmark": "移除書籤",
@ -837,11 +840,11 @@
  "subscribed_languages.target": "變更 {target} 的訂閱語言",
  "tabs_bar.home": "首頁",
  "tabs_bar.notifications": "通知",
-  "time_remaining.days": "剩餘 {number, plural, one {# 天} other {# 天}}",
+  "time_remaining.days": "剩餘 {number, plural, other {# 天}}",
-  "time_remaining.hours": "剩餘 {number, plural, one {# 小時} other {# 小時}}",
+  "time_remaining.hours": "剩餘{number, plural, other {# 小時}}",
-  "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
+  "time_remaining.minutes": "剩餘{number, plural, other {# 分鐘}}",
  "time_remaining.moments": "剩餘時間",
-  "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
+  "time_remaining.seconds": "剩餘{number, plural, other {# 秒}}",
  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}於過去 {days, plural, one {日} other {{days} 日}} 之間",
  "trends.trending_now": "現正熱門趨勢",
  "ui.beforeunload": "如果離開 Mastodon，您的草稿將會不見。",
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2759,6 +2759,7 @@ a.account__display-name {
      flex: 0 1 auto;
      display: flex;
      flex-direction: column;
      contain: inline-size layout paint style;
      @media screen and (min-width: $no-gap-breakpoint) {
        max-width: 600px;
@ -4032,6 +4033,7 @@ $ui-header-logo-wordmark-width: 99px;
  overflow: hidden;
  border: 1px solid var(--background-border-color);
  border-radius: 8px;
  contain: inline-size layout paint style;
  &.bottomless {
    border-radius: 8px 8px 0 0;
@ -5809,6 +5811,7 @@ a.status-card {
  pointer-events: auto;
  user-select: text;
  display: flex;
  max-width: 100vw;
  @media screen and (width <= $mobile-breakpoint) {
    margin-top: auto;
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@ -20,9 +20,9 @@ class ActivityPub::Activity
  end
  class << self
-    def factory(json, account, **options)
+    def factory(json, account, **)
      @json = json
-      klass&.new(json, account, **options)
+      klass&.new(json, account, **)
    end
    private
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -53,6 +53,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
    ApplicationRecord.transaction do
      @status = Status.create!(@params)
      attach_tags(@status)
      attach_counts(@status)
    end
    resolve_thread(@status)
@ -166,6 +167,18 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
    end
  end
  def attach_counts(status)
    likes = @status_parser.favourites_count
    shares = @status_parser.reblogs_count
    return if likes.nil? && shares.nil?
    status.status_stat.tap do |status_stat|
      status_stat.untrusted_reblogs_count = shares unless shares.nil?
      status_stat.untrusted_favourites_count = likes unless likes.nil?
      status_stat.save if status_stat.changed?
    end
  end
  def process_tags
    return if @object['tag'].nil?
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@ -95,6 +95,14 @@ class ActivityPub::Parser::StatusParser
    lang.presence && NORMALIZED_LOCALE_NAMES.fetch(lang.downcase.to_sym, lang)
  end
  def favourites_count
    @object.dig(:likes, :totalItems)
  end
  def reblogs_count
    @object.dig(:shares, :totalItems)
  end
  private
  def raw_language_code
--- a/app/lib/annual_report/commonly_interacted_with_accounts.rb
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@ -7,7 +7,7 @@ class AnnualReport::CommonlyInteractedWithAccounts < AnnualReport::Source
    {
      commonly_interacted_with_accounts: commonly_interacted_with_accounts.map do |(account_id, count)|
                                           {
-                                             account_id: account_id,
+                                             account_id: account_id.to_s,
                                             count: count,
                                           }
                                         end,
--- a/app/lib/annual_report/most_reblogged_accounts.rb
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@ -7,7 +7,7 @@ class AnnualReport::MostRebloggedAccounts < AnnualReport::Source
    {
      most_reblogged_accounts: most_reblogged_accounts.map do |(account_id, count)|
                                 {
-                                   account_id: account_id,
+                                   account_id: account_id.to_s,
                                   count: count,
                                 }
                               end,
--- a/app/lib/annual_report/top_statuses.rb
+++ b/app/lib/annual_report/top_statuses.rb
@ -8,9 +8,9 @@ class AnnualReport::TopStatuses < AnnualReport::Source
    {
      top_statuses: {
-        by_reblogs: top_reblogs,
+        by_reblogs: top_reblogs&.to_s,
-        by_favourites: top_favourites,
+        by_favourites: top_favourites&.to_s,
-        by_replies: top_replies,
+        by_replies: top_replies&.to_s,
      },
    }
  end
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@ -77,10 +77,22 @@ class AttachmentBatch
          when :fog
            logger.debug { "Deleting #{attachment.path(style)}" }
            retries = 0
            begin
              attachment.send(:directory).files.new(key: attachment.path(style)).destroy
-            rescue Fog::Storage::OpenStack::NotFound
+            rescue Fog::OpenStack::Storage::NotFound
-              # Ignore failure to delete a file that has already been deleted
+              logger.debug "Will ignore because file is not found #{attachment.path(style)}"
            rescue => e
              retries += 1
              if retries < MAX_RETRY
                logger.debug "Retry #{retries}/#{MAX_RETRY} after #{e.message}"
                sleep 2**retries
                retry
              else
                logger.error "Batch deletion from fog failed after #{e.message}"
                raise e
              end
            end
          when :azure
            logger.debug { "Deleting #{attachment.path(style)}" }
--- a/app/lib/rss/element.rb
+++ b/app/lib/rss/element.rb
@ -1,8 +1,8 @@
 # frozen_string_literal: true
 class RSS::Element
-  def self.with(*args, &block)
+  def self.with(*, &block)
-    new(*args).tap(&block).to_element
+    new(*).tap(&block).to_element
  end
  def create_element(name, content = nil)
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@ -33,6 +33,8 @@ class TextFormatter
  def to_s
    return ''.html_safe if text.blank?
    html = nil
    MastodonOTELTracer.in_span('TextFormatter#to_s extract_and_rewrite') do
      html = rewrite do |entity|
        if entity[:url]
          link_to_url(entity)
@ -42,8 +44,13 @@ class TextFormatter
          link_to_mention(entity)
        end
      end
    end
-    html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+    if multiline?
      MastodonOTELTracer.in_span('TextFormatter#to_s simple_format') do
        html = simple_format(html, {}, sanitize: false).delete("\n")
      end
    end
    html.html_safe # rubocop:disable Rails/OutputSafety
  end
@ -93,10 +100,13 @@ class TextFormatter
  end
  def link_to_url(entity)
    MastodonOTELTracer.in_span('TextFormatter#link_to_url') do
      TextFormatter.shortened_link(entity[:url], rel_me: with_rel_me?)
    end
  end
  def link_to_hashtag(entity)
    MastodonOTELTracer.in_span('TextFormatter#link_to_hashtag') do
      hashtag = entity[:hashtag]
      url     = tag_url(hashtag)
@ -104,8 +114,10 @@ class TextFormatter
        <a href="#{h(url)}" class="mention hashtag" rel="tag">#<span>#{h(hashtag)}</span></a>
      HTML
    end
  end
  def link_to_mention(entity)
    MastodonOTELTracer.in_span('TextFormatter#link_to_mention') do
      username, domain = entity[:screen_name].split('@')
      domain           = nil if local_domain?(domain)
      account          = nil
@ -136,6 +148,7 @@ class TextFormatter
        <span class="h-card" translate="no"><a href="#{h(url)}" class="u-url mention">@<span>#{h(display_username)}</span></a></span>
      HTML
    end
  end
  def entity_cache
    @entity_cache ||= EntityCache.instance
--- a/app/lib/translation_service/deepl.rb
+++ b/app/lib/translation_service/deepl.rb
@ -42,8 +42,8 @@ class TranslationService::DeepL < TranslationService
    subtags.join('-')
  end
-  def request(verb, path, **options)
+  def request(verb, path, **)
-    req = Request.new(verb, "#{base_url}#{path}", **options)
+    req = Request.new(verb, "#{base_url}#{path}", **)
    req.add_headers(Authorization: "DeepL-Auth-Key #{@api_key}")
    req.perform do |res|
      case res.code
--- a/app/lib/translation_service/libre_translate.rb
+++ b/app/lib/translation_service/libre_translate.rb
@ -27,8 +27,8 @@ class TranslationService::LibreTranslate < TranslationService
  private
-  def request(verb, path, **options)
+  def request(verb, path, **)
-    req = Request.new(verb, "#{@base_url}#{path}", allow_local: true, **options)
+    req = Request.new(verb, "#{@base_url}#{path}", allow_local: true, **)
    req.add_headers('Content-Type': 'application/json')
    req.perform do |res|
      case res.code
--- a/app/models/concerns/ranked_trend.rb
+++ b/app/models/concerns/ranked_trend.rb
@ -9,6 +9,10 @@ module RankedTrend
  end
  class_methods do
    def locales
      distinct.pluck(:language)
    end
    def recalculate_ordered_rank
      connection
        .exec_update(<<~SQL.squish)
--- a/app/models/concerns/status/snapshot_concern.rb
+++ b/app/models/concerns/status/snapshot_concern.rb
@ -30,7 +30,7 @@ module Status::SnapshotConcern
    )
  end
-  def snapshot!(**options)
+  def snapshot!(**)
-    build_snapshot(**options).save!
+    build_snapshot(**).save!
  end
 end
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@ -35,8 +35,8 @@ class SessionActivation < ApplicationRecord
      id && exists?(session_id: id)
    end
-    def activate(**options)
+    def activate(**)
-      activation = create!(**options)
+      activation = create!(**)
      purge_old
      activation
    end
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -310,13 +310,35 @@ class Status < ApplicationRecord
    status_stat&.favourites_count || 0
  end
  # Reblogs count received from an external instance
  def untrusted_reblogs_count
    status_stat&.untrusted_reblogs_count unless local?
  end
  # Favourites count received from an external instance
  def untrusted_favourites_count
    status_stat&.untrusted_favourites_count unless local?
  end
  def increment_count!(key)
    if key == :favourites_count && !untrusted_favourites_count.nil?
      update_status_stat!(favourites_count: favourites_count + 1, untrusted_favourites_count: untrusted_favourites_count + 1)
    elsif key == :reblogs_count && !untrusted_reblogs_count.nil?
      update_status_stat!(reblogs_count: reblogs_count + 1, untrusted_reblogs_count: untrusted_reblogs_count + 1)
    else
      update_status_stat!(key => public_send(key) + 1)
    end
  end
  def decrement_count!(key)
    if key == :favourites_count && !untrusted_favourites_count.nil?
      update_status_stat!(favourites_count: [favourites_count - 1, 0].max, untrusted_favourites_count: [untrusted_favourites_count - 1, 0].max)
    elsif key == :reblogs_count && !untrusted_reblogs_count.nil?
      update_status_stat!(reblogs_count: [reblogs_count - 1, 0].max, untrusted_reblogs_count: [untrusted_reblogs_count - 1, 0].max)
    else
      update_status_stat!(key => [public_send(key) - 1, 0].max)
    end
  end
  def trendable?
    if attributes['trendable'].nil?
--- a/app/models/status_pin.rb
+++ b/app/models/status_pin.rb
@ -17,11 +17,17 @@ class StatusPin < ApplicationRecord
  validates_with StatusPinValidator
-  after_destroy :invalidate_cleanup_info
+  after_destroy :invalidate_cleanup_info, if: %i(account_matches_status_account? account_local?)
  delegate :local?, to: :account, prefix: true
  private
  def invalidate_cleanup_info
    return unless status&.account_id == account_id && account.local?
    account.statuses_cleanup_policy&.invalidate_last_inspected(status, :unpin)
  end
  def account_matches_status_account?
    status&.account_id == account_id
  end
 end
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@ -11,11 +11,17 @@
 #  favourites_count           :bigint(8)        default(0), not null
 #  created_at                 :datetime         not null
 #  updated_at                 :datetime         not null
 #  untrusted_favourites_count :bigint(8)
 #  untrusted_reblogs_count    :bigint(8)
 #
 class StatusStat < ApplicationRecord
  belongs_to :status, inverse_of: :status_stat
  before_validation :clamp_untrusted_counts
  MAX_UNTRUSTED_COUNT = 100_000_000
  def replies_count
    [attributes['replies_count'], 0].max
  end
@ -27,4 +33,11 @@ class StatusStat < ApplicationRecord
  def favourites_count
    [attributes['favourites_count'], 0].max
  end
  private
  def clamp_untrusted_counts
    self.untrusted_favourites_count = untrusted_favourites_count.to_i.clamp(0, MAX_UNTRUSTED_COUNT) if untrusted_favourites_count.present?
    self.untrusted_reblogs_count = untrusted_reblogs_count.to_i.clamp(0, MAX_UNTRUSTED_COUNT) if untrusted_reblogs_count.present?
  end
 end
--- a/app/models/tombstone.rb
+++ b/app/models/tombstone.rb
@ -14,4 +14,6 @@
 class Tombstone < ApplicationRecord
  belongs_to :account
  validates :uri, presence: true
 end
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@ -85,7 +85,7 @@ class Trends::Links < Trends::Base
  end
  def request_review
-    PreviewCardTrend.pluck('distinct language').flat_map do |language|
+    PreviewCardTrend.locales.flat_map do |language|
      score_at_threshold  = PreviewCardTrend.where(language: language).allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
      preview_card_trends = PreviewCardTrend.where(language: language).not_allowed.joins(:preview_card)
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@ -78,7 +78,7 @@ class Trends::Statuses < Trends::Base
  end
  def request_review
-    StatusTrend.pluck('distinct language').flat_map do |language|
+    StatusTrend.locales.flat_map do |language|
      score_at_threshold = StatusTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
      status_trends      = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -405,8 +405,8 @@ class User < ApplicationRecord
    @pending_devise_notifications ||= []
  end
-  def render_and_send_devise_message(notification, *args, **kwargs)
+  def render_and_send_devise_message(notification, *, **)
-    devise_mailer.send(notification, self, *args, **kwargs).deliver_later
+    devise_mailer.send(notification, self, *, **).deliver_later
  end
  def set_approved
--- a/Show more
+++ b/Show more