Merge branch 'main' into add-image-remote-url-to-preview-cards

2024-08-20 21:08:15 -07:00 · 2024-08-09 16:35:41 +02:00 · 2024-08-09 16:35:41 +02:00 · c9d4288bc7
commit c9d4288bc7
parent 86346ad04b 1701575704
322 changed files with 4095 additions and 2028 deletions
--- a/2
+++ b/2
@ -211,7 +211,7 @@ FROM build AS ffmpeg

 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
-ARG FFMPEG_VERSION=7.0.1
+ARG FFMPEG_VERSION=7.0.2
 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"]
 ARG FFMPEG_URL=https://ffmpeg.org/releases

--- a/2
+++ b/2
@ -16,7 +16,7 @@ gem 'pghero'

 gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'blurhash', '~> 0.1'
-gem 'fog-core', '<= 2.4.0'
+gem 'fog-core', '<= 2.5.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -100,8 +100,8 @@ GEM
    attr_required (1.0.2)
    awrence (1.2.1)
    aws-eventstream (1.3.0)
-    aws-partitions (1.950.0)
-    aws-sdk-core (3.201.0)
+    aws-partitions (1.961.0)
+    aws-sdk-core (3.201.3)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.8)
@ -109,11 +109,11 @@ GEM
    aws-sdk-kms (1.88.0)
      aws-sdk-core (~> 3, >= 3.201.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
+    aws-sdk-s3 (1.157.0)
      aws-sdk-core (~> 3, >= 3.201.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.9.1)
      aws-eventstream (~> 1, >= 1.0.2)
    azure-storage-blob (2.0.3)
      azure-storage-common (~> 2.0)
@ -135,7 +135,7 @@ GEM
    binding_of_caller (1.0.1)
      debug_inspector (>= 1.2.0)
    blurhash (0.1.7)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
      msgpack (~> 1.2)
    brakeman (6.1.2)
      racc
@ -229,7 +229,7 @@ GEM
    erubi (1.13.0)
    et-orbi (1.2.11)
      tzinfo
-    excon (0.110.0)
+    excon (0.111.0)
    fabrication (2.31.0)
    faker (3.4.2)
      i18n (>= 1.8.11, < 2)
@ -269,7 +269,7 @@ GEM
    flatware-rspec (2.3.2)
      flatware (= 2.3.2)
      rspec (>= 3.6)
-    fog-core (2.4.0)
+    fog-core (2.5.0)
      builder
      excon (~> 0.71)
      formatador (>= 0.2, < 2.0)
@ -429,7 +429,7 @@ GEM
    memory_profiler (1.0.2)
    mime-types (3.5.2)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0604)
+    mime-types-data (3.2024.0702)
    mini_mime (1.1.5)
    mini_portile2 (2.8.7)
    minitest (5.24.1)
@ -614,7 +614,7 @@ GEM
    pundit (2.3.2)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.8.1)
    rack (2.2.9)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
@ -698,7 +698,7 @@ GEM
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    rexml (3.3.2)
+    rexml (3.3.4)
      strscan
    rotp (6.3.0)
    rouge (4.2.1)
@ -735,7 +735,7 @@ GEM
      rspec-mocks (~> 3.0)
      sidekiq (>= 5, < 8)
    rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
@ -758,7 +758,7 @@ GEM
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.0.4)
      rubocop (~> 1.61)
    rubocop-rspec_rails (2.30.0)
      rubocop (~> 1.61)
@ -796,7 +796,7 @@ GEM
      redis (>= 4.5.0, < 5)
    sidekiq-bulk (0.2.0)
      sidekiq
-    sidekiq-scheduler (5.0.5)
+    sidekiq-scheduler (5.0.6)
      rufus-scheduler (~> 3.2)
      sidekiq (>= 6, < 8)
      tilt (>= 1.4.0, < 3)
@ -945,7 +945,7 @@ DEPENDENCIES
  fast_blank (~> 1.0)
  fastimage
  flatware-rspec
-  fog-core (<= 2.4.0)
+  fog-core (<= 2.5.0)
  fog-openstack (~> 1.0)
  fuubar (~> 2.5)
  haml-rails (~> 2.0)
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@ -5,6 +5,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
  include AccountableConcern

  LIMIT = 100
+  MAX_LIMIT = 500

  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_allows' }, only: [:index, :show]
  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_allows' }, except: [:index, :show]
@ -47,7 +48,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
  private

  def set_domain_allows
-    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

  def set_domain_allow
@ -67,7 +68,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
  end

  def records_continue?
-    @domain_allows.size == limit_param(LIMIT)
+    @domain_allows.size == limit_param(LIMIT, MAX_LIMIT)
  end

  def resource_params
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@ -5,6 +5,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
  include AccountableConcern

  LIMIT = 100
+  MAX_LIMIT = 500

  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_blocks' }, only: [:index, :show]
  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_blocks' }, except: [:index, :show]
@ -59,7 +60,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
  end

  def set_domain_blocks
-    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

  def set_domain_block
@ -83,7 +84,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
  end

  def records_continue?
-    @domain_blocks.size == limit_param(LIMIT)
+    @domain_blocks.size == limit_param(LIMIT, MAX_LIMIT)
  end

  def resource_params
--- a/app/controllers/api/v1/notifications/policies_controller.rb
+++ b/app/controllers/api/v1/notifications/policies_controller.rb
@ -8,12 +8,12 @@ class Api::V1::Notifications::PoliciesController < Api::BaseController
  before_action :set_policy

  def show
-    render json: @policy, serializer: REST::NotificationPolicySerializer
+    render json: @policy, serializer: REST::V1::NotificationPolicySerializer
  end

  def update
    @policy.update!(resource_params)
-    render json: @policy, serializer: REST::NotificationPolicySerializer
+    render json: @policy, serializer: REST::V1::NotificationPolicySerializer
  end

  private
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@ -5,7 +5,8 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index

  before_action :require_user!
-  before_action :set_request, except: :index
+  before_action :set_request, only: [:show, :accept, :dismiss]
+  before_action :set_requests, only: [:accept_bulk, :dismiss_bulk]

  after_action :insert_pagination_headers, only: :index

@ -28,7 +29,17 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
  end

  def dismiss
-    @request.destroy!
+    DismissNotificationRequestService.new.call(@request)
+    render_empty
+  end
+
+  def accept_bulk
+    @requests.each { |request| AcceptNotificationRequestService.new.call(request) }
+    render_empty
+  end
+
+  def dismiss_bulk
+    @requests.each(&:destroy!)
    render_empty
  end

@ -53,6 +64,10 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
    @request = NotificationRequest.where(account: current_account).find(params[:id])
  end

+  def set_requests
+    @requests = NotificationRequest.where(account: current_account, id: Array(params[:id]).uniq.map(&:to_i))
+  end
+
  def next_path
    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
  end
--- a/app/controllers/api/v2/notifications/policies_controller.rb
+++ b/app/controllers/api/v2/notifications/policies_controller.rb
@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class Api::V2::Notifications::PoliciesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :show
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: :update
+
+  before_action :require_user!
+  before_action :set_policy
+
+  def show
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  def update
+    @policy.update!(resource_params)
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  private
+
+  def set_policy
+    @policy = NotificationPolicy.find_or_initialize_by(account: current_account)
+
+    with_read_replica do
+      @policy.summarize!
+    end
+  end
+
+  def resource_params
+    params.permit(
+      :for_not_following,
+      :for_not_followers,
+      :for_new_accounts,
+      :for_private_mentions,
+      :for_limited_accounts
+    )
+  end
+end
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@ -16,10 +16,10 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
      @group_metadata = load_group_metadata
      @grouped_notifications = load_grouped_notifications
      @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
-      @sample_accounts = @grouped_notifications.flat_map(&:sample_accounts)
+      @presenter = GroupedNotificationsPresenter.new(@grouped_notifications, expand_accounts: expand_accounts_param)

      # Preload associations to avoid N+1s
-      ActiveRecord::Associations::Preloader.new(records: @sample_accounts, associations: [:account_stat, { user: :role }]).call
+      ActiveRecord::Associations::Preloader.new(records: @presenter.accounts, associations: [:account_stat, { user: :role }]).call
    end

    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
@ -27,13 +27,14 @@ class Api::V2Alpha::NotificationsController < Api::BaseController

      span.add_attributes(
        'app.notification_grouping.count' => @grouped_notifications.size,
-        'app.notification_grouping.sample_account.count' => @sample_accounts.size,
-        'app.notification_grouping.sample_account.unique_count' => @sample_accounts.pluck(:id).uniq.size,
+        'app.notification_grouping.account.count' => @presenter.accounts.size,
+        'app.notification_grouping.partial_account.count' => @presenter.partial_accounts.size,
        'app.notification_grouping.status.count' => statuses.size,
-        'app.notification_grouping.status.unique_count' => statuses.uniq.size
+        'app.notification_grouping.status.unique_count' => statuses.uniq.size,
+        'app.notification_grouping.expand_accounts_param' => expand_accounts_param
      )

-      render json: @grouped_notifications, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+      render json: @presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata, expand_accounts: expand_accounts_param
    end
  end

@ -47,7 +48,8 @@ class Api::V2Alpha::NotificationsController < Api::BaseController

  def show
    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
-    render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
+    presenter = GroupedNotificationsPresenter.new([NotificationGroup.from_notification(@notification)])
+    render json: presenter, serializer: REST::DedupNotificationGroupSerializer
  end

  def clear
@ -129,4 +131,15 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
  def pagination_params(core_params)
    params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params)
  end
+
+  def expand_accounts_param
+    case params[:expand_accounts]
+    when nil, 'full'
+      'full'
+    when 'partial_avatars'
+      'partial_avatars'
+    else
+      raise Mastodon::InvalidParameterError, "Invalid value for 'expand_accounts': '#{params[:expand_accounts]}', allowed values are 'full' and 'partial_avatars'"
+    end
+  end
 end
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@ -5,7 +5,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController

  layout 'auth'

-  before_action :set_body_classes
  before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
  before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?

@ -73,10 +72,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
    user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
  end

-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
  def after_resending_confirmation_instructions_path_for(_resource_name)
    if user_signed_in?
      if current_user.confirmed? && current_user.approved?
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@ -3,7 +3,6 @@
 class Auth::PasswordsController < Devise::PasswordsController
  skip_before_action :check_self_destruct!
  before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
-  before_action :set_body_classes

  layout 'auth'

@ -24,10 +23,6 @@ class Auth::PasswordsController < Devise::PasswordsController
    redirect_to new_password_path(resource_name)
  end

-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
  def reset_password_token_is_valid?
    resource_class.with_reset_password_token(params[:reset_password_token]).present?
  end
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -105,7 +105,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  private

  def set_body_classes
-    @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
+    @body_classes = 'admin' if %w(edit update).include?(action_name)
  end

  def set_invite
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -16,8 +16,6 @@ class Auth::SessionsController < Devise::SessionsController

  include Auth::TwoFactorAuthenticationConcern

-  before_action :set_body_classes
-
  content_security_policy only: :new do |p|
    p.form_action(false)
  end
@ -103,10 +101,6 @@ class Auth::SessionsController < Devise::SessionsController

  private

-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
  def home_paths(resource)
    paths = [about_path, '/explore']

--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@ -5,7 +5,6 @@ class Auth::SetupController < ApplicationController

  before_action :authenticate_user!
  before_action :require_unconfirmed_or_pending!
-  before_action :set_body_classes
  before_action :set_user

  skip_before_action :require_functional!
@ -35,10 +34,6 @@ class Auth::SetupController < ApplicationController
    @user = current_user
  end

-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
  def user_params
    params.require(:user).permit(:email)
  end
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@ -83,7 +83,6 @@ module Auth::TwoFactorAuthenticationConcern
  def prompt_for_two_factor(user)
    register_attempt_in_session(user)

-    @body_classes     = 'lighter'
    @webauthn_enabled = user.webauthn_enabled?
    @scheme_type      = if user.webauthn_enabled? && user_params[:otp_attempt].blank?
                          'webauthn'
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@ -42,7 +42,6 @@ module ChallengableConcern
  end

  def render_challenge
-    @body_classes = 'lighter'
    render 'auth/challenges/new', layout: 'auth'
  end

--- a/app/controllers/mail_subscriptions_controller.rb
+++ b/app/controllers/mail_subscriptions_controller.rb
@ -5,7 +5,6 @@ class MailSubscriptionsController < ApplicationController

  skip_before_action :require_functional!

-  before_action :set_body_classes
  before_action :set_user
  before_action :set_type

@ -25,10 +24,6 @@ class MailSubscriptionsController < ApplicationController
    not_found unless @user
  end

-  def set_body_classes
-    @body_classes = 'lighter'
-  end
-
  def set_type
    @type = email_type_from_param
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -116,7 +116,7 @@ module ApplicationHelper
  def material_symbol(icon, attributes = {})
    inline_svg_tag(
      "400-24px/#{icon}.svg",
-      class: %w(icon).concat(attributes[:class].to_s.split),
+      class: ['icon', "material-#{icon}"].concat(attributes[:class].to_s.split),
      role: :img
    )
  end
@ -127,23 +127,23 @@ module ApplicationHelper

  def visibility_icon(status)
    if status.public_visibility?
-      fa_icon('globe', title: I18n.t('statuses.visibilities.public'))
+      material_symbol('globe', title: I18n.t('statuses.visibilities.public'))
    elsif status.unlisted_visibility?
-      fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
+      material_symbol('lock_open', title: I18n.t('statuses.visibilities.unlisted'))
    elsif status.private_visibility? || status.limited_visibility?
-      fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
+      material_symbol('lock', title: I18n.t('statuses.visibilities.private'))
    elsif status.direct_visibility?
-      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
+      material_symbol('alternate_email', title: I18n.t('statuses.visibilities.direct'))
    end
  end

  def interrelationships_icon(relationships, account_id)
    if relationships.following[account_id] && relationships.followed_by[account_id]
-      fa_icon('exchange', title: I18n.t('relationships.mutual'), class: 'fa-fw active passive')
+      material_symbol('sync_alt', title: I18n.t('relationships.mutual'), class: 'active passive')
    elsif relationships.following[account_id]
-      fa_icon(locale_direction == 'ltr' ? 'arrow-right' : 'arrow-left', title: I18n.t('relationships.following'), class: 'fa-fw active')
+      material_symbol(locale_direction == 'ltr' ? 'arrow_right_alt' : 'arrow_left_alt', title: I18n.t('relationships.following'), class: 'active')
    elsif relationships.followed_by[account_id]
-      fa_icon(locale_direction == 'ltr' ? 'arrow-left' : 'arrow-right', title: I18n.t('relationships.followers'), class: 'fa-fw passive')
+      material_symbol(locale_direction == 'ltr' ? 'arrow_left_alt' : 'arrow_right_alt', title: I18n.t('relationships.followers'), class: 'passive')
    end
  end

--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@ -60,13 +60,13 @@ module StatusesHelper
  def fa_visibility_icon(status)
    case status.visibility
    when 'public'
-      fa_icon 'globe fw'
+      material_symbol 'globe'
    when 'unlisted'
-      fa_icon 'unlock fw'
+      material_symbol 'lock_open'
    when 'private'
-      fa_icon 'lock fw'
+      material_symbol 'lock'
    when 'direct'
-      fa_icon 'at fw'
+      material_symbol 'alternate_email'
    end
  end

--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@ -431,6 +431,42 @@ Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
    target.src = target.dataset.static;
 });

+const setInputDisabled = (
+  input: HTMLInputElement | HTMLSelectElement,
+  disabled: boolean,
+) => {
+  input.disabled = disabled;
+
+  const wrapper = input.closest('.with_label');
+  if (wrapper) {
+    wrapper.classList.toggle('disabled', input.disabled);
+
+    const hidden =
+      input.type === 'checkbox' &&
+      wrapper.querySelector<HTMLInputElement>('input[type=hidden][value="0"]');
+    if (hidden) {
+      hidden.disabled = input.disabled;
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#account_statuses_cleanup_policy_enabled',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement) || !target.form) return;
+
+    target.form
+      .querySelectorAll<
+        HTMLInputElement | HTMLSelectElement
+      >('input:not([type=hidden], #account_statuses_cleanup_policy_enabled), select')
+      .forEach((input) => {
+        setInputDisabled(input, !target.checked);
+      });
+  },
+);
+
 // Empty the honeypot fields in JS in case something like an extension
 // automatically filled them.
 Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@ -38,10 +38,6 @@ function dispatchAssociatedRecords(
  const fetchedStatuses: ApiStatusJSON[] = [];

  notifications.forEach((notification) => {
-    if ('sample_accounts' in notification) {
-      fetchedAccounts.push(...notification.sample_accounts);
-    }
-
    if (notification.type === 'admin.report') {
      fetchedAccounts.push(notification.report.target_account);
    }
@ -75,7 +71,9 @@ export const fetchNotifications = createDataLoadingThunk(
          : excludeAllTypesExcept(activeFilter),
    });
  },
-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
    dispatchAssociatedRecords(dispatch, notifications);
    const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
      notifications;
@ -95,7 +93,9 @@ export const fetchNotificationsGap = createDataLoadingThunk(
  async (params: { gap: NotificationGap }) =>
    apiFetchNotifications({ max_id: params.gap.maxId }),

-  ({ notifications }, { dispatch }) => {
+  ({ notifications, accounts, statuses }, { dispatch }) => {
+    dispatch(importFetchedAccounts(accounts));
+    dispatch(importFetchedStatuses(statuses));
    dispatchAssociatedRecords(dispatch, notifications);

    return { notifications };
--- a/app/javascript/mastodon/api/notification_policies.ts
+++ b/app/javascript/mastodon/api/notification_policies.ts
@ -2,8 +2,8 @@ import { apiRequestGet, apiRequestPut } from 'mastodon/api';
 import type { NotificationPolicyJSON } from 'mastodon/api_types/notification_policies';

 export const apiGetNotificationPolicy = () =>
-  apiRequestGet<NotificationPolicyJSON>('/v1/notifications/policy');
+  apiRequestGet<NotificationPolicyJSON>('/v2/notifications/policy');

 export const apiUpdateNotificationsPolicy = (
  policy: Partial<NotificationPolicyJSON>,
-) => apiRequestPut<NotificationPolicyJSON>('/v1/notifications/policy', policy);
+) => apiRequestPut<NotificationPolicyJSON>('/v2/notifications/policy', policy);
--- a/app/javascript/mastodon/api/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@ -1,17 +1,24 @@
 import api, { apiRequest, getLinks } from 'mastodon/api';
-import type { ApiNotificationGroupJSON } from 'mastodon/api_types/notifications';
+import type { ApiNotificationGroupsResultJSON } from 'mastodon/api_types/notifications';

 export const apiFetchNotifications = async (params?: {
  exclude_types?: string[];
  max_id?: string;
 }) => {
-  const response = await api().request<ApiNotificationGroupJSON[]>({
+  const response = await api().request<ApiNotificationGroupsResultJSON>({
    method: 'GET',
    url: '/api/v2_alpha/notifications',
    params,
  });

-  return { notifications: response.data, links: getLinks(response) };
+  const { statuses, accounts, notification_groups } = response.data;
+
+  return {
+    statuses,
+    accounts,
+    notifications: notification_groups,
+    links: getLinks(response),
+  };
 };

 export const apiClearNotifications = () =>
--- a/app/javascript/mastodon/api_types/notification_policies.ts
+++ b/app/javascript/mastodon/api_types/notification_policies.ts
@ -1,10 +1,13 @@
 // See app/serializers/rest/notification_policy_serializer.rb

+export type NotificationPolicyValue = 'accept' | 'filter' | 'drop';
+
 export interface NotificationPolicyJSON {
-  filter_not_following: boolean;
-  filter_not_followers: boolean;
-  filter_new_accounts: boolean;
-  filter_private_mentions: boolean;
+  for_not_following: NotificationPolicyValue;
+  for_not_followers: NotificationPolicyValue;
+  for_new_accounts: NotificationPolicyValue;
+  for_private_mentions: NotificationPolicyValue;
+  for_limited_accounts: NotificationPolicyValue;
  summary: {
    pending_requests_count: number;
    pending_notifications_count: number;
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@ -51,7 +51,7 @@ export interface BaseNotificationGroupJSON {
  group_key: string;
  notifications_count: number;
  type: NotificationType;
-  sample_accounts: ApiAccountJSON[];
+  sample_account_ids: string[];
  latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
  most_recent_notification_id: string;
  page_min_id?: string;
@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {

 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
  type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }

 interface NotificationWithStatusJSON extends BaseNotificationJSON {
@ -143,3 +143,9 @@ export type ApiNotificationGroupJSON =
  | AccountRelationshipSeveranceNotificationGroupJSON
  | NotificationGroupWithStatusJSON
  | ModerationWarningNotificationGroupJSON;
+
+export interface ApiNotificationGroupsResultJSON {
+  accounts: ApiAccountJSON[];
+  statuses: ApiStatusJSON[];
+  notification_groups: ApiNotificationGroupJSON[];
+}
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@ -106,7 +106,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
        </>
      );
    } else if (defaultAction === 'mute') {
-      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+      buttons = <Button text={intl.formatMessage(messages.mute)} onClick={handleMute} />;
    } else if (defaultAction === 'block') {
      buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
    } else if (!account.get('suspended') && !account.get('moved') || following) {
--- a/app/javascript/mastodon/components/avatar.tsx
+++ b/app/javascript/mastodon/components/avatar.tsx
@ -11,6 +11,8 @@ interface Props {
  style?: React.CSSProperties;
  inline?: boolean;
  animate?: boolean;
+  counter?: number | string;
+  counterBorderColor?: string;
 }

 export const Avatar: React.FC<Props> = ({
@ -19,6 +21,8 @@ export const Avatar: React.FC<Props> = ({
  size = 20,
  inline = false,
  style: styleFromParent,
+  counter,
+  counterBorderColor,
 }) => {
  const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(animate);

@ -43,6 +47,14 @@ export const Avatar: React.FC<Props> = ({
      style={style}
    >
      {src && <img src={src} alt='' />}
+      {counter && (
+        <div
+          className='account__avatar__counter'
+          style={{ borderColor: counterBorderColor }}
+        >
+          {counter}
+        </div>
+      )}
    </div>
  );
 };
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@ -20,7 +20,7 @@ let id = 0;
 class DropdownMenu extends PureComponent {

  static propTypes = {
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.array.isRequired,
    loading: PropTypes.bool,
    scrollable: PropTypes.bool,
    onClose: PropTypes.func.isRequired,
@ -39,6 +39,7 @@ class DropdownMenu extends PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
      e.stopPropagation();
+      e.preventDefault();
    }
  };

@ -164,7 +165,7 @@ class Dropdown extends PureComponent {
    children: PropTypes.node,
    icon: PropTypes.string,
    iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
+    items: PropTypes.array.isRequired,
    loading: PropTypes.bool,
    size: PropTypes.number,
    title: PropTypes.string,
--- a/app/javascript/mastodon/components/dropdown_selector.tsx
+++ b/app/javascript/mastodon/components/dropdown_selector.tsx
@ -0,0 +1,185 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+
+import type { IconProp } from './icon';
+import { Icon } from './icon';
+
+const listenerOptions = supportsPassiveEvents
+  ? { passive: true, capture: true }
+  : true;
+
+export interface SelectItem {
+  value: string;
+  icon?: string;
+  iconComponent?: IconProp;
+  text: string;
+  meta: string;
+  extra?: string;
+}
+
+interface Props {
+  value: string;
+  classNamePrefix: string;
+  style?: React.CSSProperties;
+  items: SelectItem[];
+  onChange: (value: string) => void;
+  onClose: () => void;
+}
+
+export const DropdownSelector: React.FC<Props> = ({
+  style,
+  items,
+  value,
+  classNamePrefix = 'privacy-dropdown',
+  onClose,
+  onChange,
+}) => {
+  const nodeRef = useRef<HTMLUListElement>(null);
+  const focusedItemRef = useRef<HTMLLIElement>(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback(
+    (e: MouseEvent | TouchEvent) => {
+      if (
+        nodeRef.current &&
+        e.target instanceof Node &&
+        !nodeRef.current.contains(e.target)
+      ) {
+        onClose();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, onClose],
+  );
+
+  const handleClick = useCallback(
+    (
+      e: React.MouseEvent<HTMLLIElement> | React.KeyboardEvent<HTMLLIElement>,
+    ) => {
+      const value = e.currentTarget.getAttribute('data-index');
+
+      e.preventDefault();
+
+      onClose();
+      if (value) onChange(value);
+    },
+    [onClose, onChange],
+  );
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLLIElement>) => {
+      const value = e.currentTarget.getAttribute('data-index');
+      const index = items.findIndex((item) => item.value === value);
+
+      let element: Element | null | undefined = null;
+
+      switch (e.key) {
+        case 'Escape':
+          onClose();
+          break;
+        case ' ':
+        case 'Enter':
+          handleClick(e);
+          break;
+        case 'ArrowDown':
+          element =
+            nodeRef.current?.children[index + 1] ??
+            nodeRef.current?.firstElementChild;
+          break;
+        case 'ArrowUp':
+          element =
+            nodeRef.current?.children[index - 1] ??
+            nodeRef.current?.lastElementChild;
+          break;
+        case 'Tab':
+          if (e.shiftKey) {
+            element =
+              nodeRef.current?.children[index + 1] ??
+              nodeRef.current?.firstElementChild;
+          } else {
+            element =
+              nodeRef.current?.children[index - 1] ??
+              nodeRef.current?.lastElementChild;
+          }
+          break;
+        case 'Home':
+          element = nodeRef.current?.firstElementChild;
+          break;
+        case 'End':
+          element = nodeRef.current?.lastElementChild;
+          break;
+      }
+
+      if (element && element instanceof HTMLElement) {
+        const selectedValue = element.getAttribute('data-index');
+        element.focus();
+        if (selectedValue) setCurrentValue(selectedValue);
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
+    [nodeRef, items, onClose, handleClick, setCurrentValue],
+  );
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, {
+        capture: true,
+      });
+      document.removeEventListener(
+        'touchend',
+        handleDocumentClick,
+        listenerOptions,
+      );
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={style} role='listbox' ref={nodeRef}>
+      {items.map((item) => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames(`${classNamePrefix}__option`, {
+            active: item.value === currentValue,
+          })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          {item.icon && item.iconComponent && (
+            <div className={`${classNamePrefix}__option__icon`}>
+              <Icon id={item.icon} icon={item.iconComponent} />
+            </div>
+          )}
+
+          <div className={`${classNamePrefix}__option__content`}>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div
+              className={`${classNamePrefix}__option__additional`}
+              title={item.extra}
+            >
+              <Icon id='info-circle' icon={InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
--- a/app/javascript/mastodon/components/hover_card_account.tsx
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@ -1,5 +1,7 @@
 import { useEffect, forwardRef } from 'react';

+import { FormattedMessage } from 'react-intl';
+
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';

@ -25,6 +27,11 @@ export const HoverCardAccount = forwardRef<
    accountId ? state.accounts.get(accountId) : undefined,
  );

+  const note = useAppSelector(
+    (state) =>
+      state.relationships.getIn([accountId, 'note']) as string | undefined,
+  );
+
  useEffect(() => {
    if (accountId && !account) {
      dispatch(fetchAccount(accountId));
@ -53,6 +60,17 @@ export const HoverCardAccount = forwardRef<
              className='hover-card__bio'
            />
            <AccountFields fields={account.fields} limit={2} />
+            {note && note.length > 0 && (
+              <dl className='hover-card__note'>
+                <dt className='hover-card__note-label'>
+                  <FormattedMessage
+                    id='account.account_note_header'
+                    defaultMessage='Personal note'
+                  />
+                </dt>
+                <dd>{note}</dd>
+              </dl>
+            )}
          </div>

          <div className='hover-card__number'>
--- a/app/javascript/mastodon/features/account/components/account_note.jsx
+++ b/app/javascript/mastodon/features/account/components/account_note.jsx
@ -151,7 +151,7 @@ class AccountNote extends ImmutablePureComponent {
    return (
      <div className='account__header__account-note'>
        <label htmlFor={`account-note-${account.get('id')}`}>
-          <FormattedMessage id='account.account_note_header' defaultMessage='Note' /> <InlineAlert show={saved} />
+          <FormattedMessage id='account.account_note_header' defaultMessage='Personal note' /> <InlineAlert show={saved} />
        </label>

        <Textarea
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@ -11,10 +11,9 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import { DropdownSelector } from 'mastodon/components/dropdown_selector';
 import { Icon }  from 'mastodon/components/icon';

-import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
-
 const messages = defineMessages({
  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
  public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
@ -143,7 +142,7 @@ class PrivacyDropdown extends PureComponent {
          {({ props, placement }) => (
            <div {...props}>
              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
-                <PrivacyDropdownMenu
+                <DropdownSelector
                  items={this.options}
                  value={value}
                  onClose={this.handleClose}
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
@ -1,128 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
-import { Icon } from 'mastodon/components/icon';
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
-  const nodeRef = useRef(null);
-  const focusedItemRef = useRef(null);
-  const [currentValue, setCurrentValue] = useState(value);
-
-  const handleDocumentClick = useCallback((e) => {
-    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
-      onClose();
-      e.stopPropagation();
-    }
-  }, [nodeRef, onClose]);
-
-  const handleClick = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    onClose();
-    onChange(value);
-  }, [onClose, onChange]);
-
-  const handleKeyDown = useCallback((e) => {
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => (item.value === value));
-
-    let element = null;
-
-    switch (e.key) {
-    case 'Escape':
-      onClose();
-      break;
-    case ' ':
-    case 'Enter':
-      handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      break;
-    case 'ArrowUp':
-      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
-      } else {
-        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
-      }
-      break;
-    case 'Home':
-      element = nodeRef.current.firstChild;
-      break;
-    case 'End':
-      element = nodeRef.current.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      setCurrentValue(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
-
-  useEffect(() => {
-    document.addEventListener('click', handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
-    focusedItemRef.current?.focus({ preventScroll: true });
-
-    return () => {
-      document.removeEventListener('click', handleDocumentClick, { capture: true });
-      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
-    };
-  }, [handleDocumentClick]);
-
-  return (
-    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
-      {items.map(item => (
-        <li
-          role='option'
-          tabIndex={0}
-          key={item.value}
-          data-index={item.value}
-          onKeyDown={handleKeyDown}
-          onClick={handleClick}
-          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
-          aria-selected={item.value === currentValue}
-          ref={item.value === currentValue ? focusedItemRef : null}
-        >
-          <div className='privacy-dropdown__option__icon'>
-            <Icon id={item.icon} icon={item.iconComponent} />
-          </div>
-
-          <div className='privacy-dropdown__option__content'>
-            <strong>{item.text}</strong>
-            {item.meta}
-          </div>
-
-          {item.extra && (
-            <div className='privacy-dropdown__option__additional' title={item.extra}>
-              <Icon id='info-circle' icon={InfoIcon} />
-            </div>
-          )}
-        </li>
-      ))}
-    </ul>
-  );
-};
-
-PrivacyDropdownMenu.propTypes = {
-  style: PropTypes.object,
-  items: PropTypes.array.isRequired,
-  value: PropTypes.string.isRequired,
-  onClose: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
--- a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
+++ b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
@ -1,31 +0,0 @@
-import PropTypes from 'prop-types';
-import { useCallback } from 'react';
-
-import Toggle from 'react-toggle';
-
-export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
-  const handleChange = useCallback(({ target }) => {
-    onChange(target.checked);
-  }, [onChange]);
-
-  return (
-    <label className='app-form__toggle'>
-      <div className='app-form__toggle__label'>
-        {children}
-      </div>
-
-      <div className='app-form__toggle__toggle'>
-        <div>
-          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
-        </div>
-      </div>
-    </label>
-  );
-};
-
-CheckboxWithLabel.propTypes = {
-  checked: PropTypes.bool,
-  disabled: PropTypes.bool,
-  children: PropTypes.children,
-  onChange: PropTypes.func,
-};
--- a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx
+++ b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.tsx
@ -0,0 +1,40 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+interface Props {
+  checked: boolean;
+  disabled?: boolean;
+  onChange: (checked: boolean) => void;
+}
+
+export const CheckboxWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  checked,
+  disabled,
+  children,
+  onChange,
+}) => {
+  const handleChange = useCallback(
+    ({ target }: React.ChangeEvent<HTMLInputElement>) => {
+      onChange(target.checked);
+    },
+    [onChange],
+  );
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle
+            checked={checked}
+            onChange={handleChange}
+            disabled={disabled}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';

-import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
+import { PolicyControls } from './policy_controls';
 import SettingToggle from './setting_toggle';

 class ColumnSettings extends PureComponent {
@ -24,32 +24,14 @@ class ColumnSettings extends PureComponent {
    alertsEnabled: PropTypes.bool,
    browserSupport: PropTypes.bool,
    browserPermission: PropTypes.string,
-    notificationPolicy: PropTypes.object.isRequired,
-    onChangePolicy: PropTypes.func.isRequired,
  };

  onPushChange = (path, checked) => {
    this.props.onChange(['push', ...path], checked);
  };

-  handleFilterNotFollowing = checked => {
-    this.props.onChangePolicy('filter_not_following', checked);
-  };
-
-  handleFilterNotFollowers = checked => {
-    this.props.onChangePolicy('filter_not_followers', checked);
-  };
-
-  handleFilterNewAccounts = checked => {
-    this.props.onChangePolicy('filter_new_accounts', checked);
-  };
-
-  handleFilterPrivateMentions = checked => {
-    this.props.onChangePolicy('filter_private_mentions', checked);
-  };
-
  render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;

    const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
    const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
@ -79,31 +61,7 @@ class ColumnSettings extends PureComponent {
          </section>
        )}

-        <section>
-          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
-
-          <div className='column-settings__row'>
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_following} onChange={this.handleFilterNotFollowing}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_not_followers} onChange={this.handleFilterNotFollowers}>
-              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_new_accounts} onChange={this.handleFilterNewAccounts}>
-              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
-            </CheckboxWithLabel>
-
-            <CheckboxWithLabel checked={notificationPolicy.filter_private_mentions} onChange={this.handleFilterPrivateMentions}>
-              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
-              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
-            </CheckboxWithLabel>
-          </div>
-        </section>
+        <PolicyControls />

        <section role='group' aria-labelledby='notifications-beta'>
          <h3 id='notifications-beta'>
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@ -1,18 +1,62 @@
-import { useEffect } from 'react';
+import { useCallback, useEffect } from 'react';

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

-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';

 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'mastodon/actions/notification_policies';
 import { Icon } from 'mastodon/components/icon';
+import { selectSettingsNotificationsMinimizeFilteredBanner } from 'mastodon/selectors/settings';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
-import { toCappedNumber } from 'mastodon/utils/numbers';
+
+const messages = defineMessages({
+  filteredNotifications: {
+    id: 'notification_requests.title',
+    defaultMessage: 'Filtered notifications',
+  },
+});
+
+export const FilteredNotificationsIconButton: React.FC<{
+  className?: string;
+}> = ({ className }) => {
+  const intl = useIntl();
+  const history = useHistory();
+  const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );
+
+  const handleClick = useCallback(() => {
+    history.push('/notifications/requests');
+  }, [history]);
+
+  if (policy === null || policy.summary.pending_notifications_count === 0) {
+    return null;
+  }
+
+  if (!minimizeSetting) {
+    return null;
+  }
+
+  return (
+    <button
+      aria-label={intl.formatMessage(messages.filteredNotifications)}
+      title={intl.formatMessage(messages.filteredNotifications)}
+      onClick={handleClick}
+      className={className}
+    >
+      <Icon id='filtered-notifications' icon={InventoryIcon} />
+    </button>
+  );
+};

 export const FilteredNotificationsBanner: React.FC = () => {
  const dispatch = useAppDispatch();
  const policy = useAppSelector((state) => state.notificationPolicy);
+  const minimizeSetting = useAppSelector(
+    selectSettingsNotificationsMinimizeFilteredBanner,
+  );

  useEffect(() => {
    void dispatch(fetchNotificationPolicy());
@ -30,6 +74,10 @@ export const FilteredNotificationsBanner: React.FC = () => {
    return null;
  }

+  if (minimizeSetting) {
+    return null;
+  }
+
  return (
    <Link
      className='filtered-notifications-banner'
@ -49,22 +97,11 @@ export const FilteredNotificationsBanner: React.FC = () => {
        <span>
          <FormattedMessage
            id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
            values={{ count: policy.summary.pending_requests_count }}
          />
        </span>
      </div>
-
-      <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
-          {toCappedNumber(policy.summary.pending_notifications_count)}
-        </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
-      </div>
    </Link>
  );
 };
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@ -38,12 +38,11 @@ export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
  return (
    <div className='notification-request'>
      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
-        <Avatar account={account} size={36} />
+        <Avatar account={account} size={40} counter={toCappedNumber(notificationsCount)} />

        <div className='notification-request__name'>
          <div className='notification-request__name__display-name'>
            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
-            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
          </div>

          <span>@{account?.get('acct')}</span>
--- a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@ -0,0 +1,220 @@
+import { useCallback } from 'react';
+
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+
+import { openModal } from 'mastodon/actions/modal';
+import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import type { AppDispatch } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { SelectWithLabel } from './select_with_label';
+
+const messages = defineMessages({
+  accept: { id: 'notifications.policy.accept', defaultMessage: 'Accept' },
+  accept_hint: {
+    id: 'notifications.policy.accept_hint',
+    defaultMessage: 'Show in notifications',
+  },
+  filter: { id: 'notifications.policy.filter', defaultMessage: 'Filter' },
+  filter_hint: {
+    id: 'notifications.policy.filter_hint',
+    defaultMessage: 'Send to filtered notifications inbox',
+  },
+  drop: { id: 'notifications.policy.drop', defaultMessage: 'Ignore' },
+  drop_hint: {
+    id: 'notifications.policy.drop_hint',
+    defaultMessage: 'Send to the void, never to be seen again',
+  },
+});
+
+// TODO: change the following when we change the API
+const changeFilter = (
+  dispatch: AppDispatch,
+  filterType: string,
+  value: string,
+) => {
+  if (value === 'drop') {
+    dispatch(
+      openModal({
+        modalType: 'IGNORE_NOTIFICATIONS',
+        modalProps: { filterType },
+      }),
+    );
+  } else {
+    void dispatch(updateNotificationsPolicy({ [filterType]: value }));
+  }
+};
+
+export const PolicyControls: React.FC = () => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const notificationPolicy = useAppSelector(
+    (state) => state.notificationPolicy,
+  );
+
+  const handleFilterNotFollowing = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_following', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterNotFollowers = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_not_followers', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterNewAccounts = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_new_accounts', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterPrivateMentions = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_private_mentions', value);
+    },
+    [dispatch],
+  );
+
+  const handleFilterLimitedAccounts = useCallback(
+    (value: string) => {
+      changeFilter(dispatch, 'for_limited_accounts', value);
+    },
+    [dispatch],
+  );
+
+  if (!notificationPolicy) return null;
+
+  const options = [
+    {
+      value: 'accept',
+      text: intl.formatMessage(messages.accept),
+      meta: intl.formatMessage(messages.accept_hint),
+    },
+    {
+      value: 'filter',
+      text: intl.formatMessage(messages.filter),
+      meta: intl.formatMessage(messages.filter_hint),
+    },
+    {
+      value: 'drop',
+      text: intl.formatMessage(messages.drop),
+      meta: intl.formatMessage(messages.drop_hint),
+    },
+  ];
+
+  return (
+    <section>
+      <h3>
+        <FormattedMessage
+          id='notifications.policy.title'
+          defaultMessage='Manage notifications from…'
+        />
+      </h3>
+
+      <div className='column-settings__row'>
+        <SelectWithLabel
+          value={notificationPolicy.for_not_following}
+          onChange={handleFilterNotFollowing}
+          options={options}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_title'
+              defaultMessage="People you don't follow"
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_following_hint'
+              defaultMessage='Until you manually approve them'
+            />
+          </span>
+        </SelectWithLabel>
+
+        <SelectWithLabel
+          value={notificationPolicy.for_not_followers}
+          onChange={handleFilterNotFollowers}
+          options={options}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_title'
+              defaultMessage='People not following you'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_not_followers_hint'
+              defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}'
+              values={{ days: 3 }}
+            />
+          </span>
+        </SelectWithLabel>
+
+        <SelectWithLabel
+          value={notificationPolicy.for_new_accounts}
+          onChange={handleFilterNewAccounts}
+          options={options}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts_title'
+              defaultMessage='New accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_new_accounts.hint'
+              defaultMessage='Created within the past {days, plural, one {one day} other {# days}}'
+              values={{ days: 30 }}
+            />
+          </span>
+        </SelectWithLabel>
+
+        <SelectWithLabel
+          value={notificationPolicy.for_private_mentions}
+          onChange={handleFilterPrivateMentions}
+          options={options}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_title'
+              defaultMessage='Unsolicited private mentions'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_private_mentions_hint'
+              defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
+            />
+          </span>
+        </SelectWithLabel>
+
+        <SelectWithLabel
+          value={notificationPolicy.for_limited_accounts}
+          onChange={handleFilterLimitedAccounts}
+          options={options}
+        >
+          <strong>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_title'
+              defaultMessage='Moderated accounts'
+            />
+          </strong>
+          <span className='hint'>
+            <FormattedMessage
+              id='notifications.policy.filter_limited_accounts_hint'
+              defaultMessage='Limited by server moderators'
+            />
+          </span>
+        </SelectWithLabel>
+      </div>
+    </section>
+  );
+};
--- a/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
+++ b/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
@ -0,0 +1,153 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback, useState, useRef } from 'react';
+
+import classNames from 'classnames';
+
+import type { Placement, State as PopperState } from '@popperjs/core';
+import Overlay from 'react-overlays/Overlay';
+
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
+import type { SelectItem } from 'mastodon/components/dropdown_selector';
+import { DropdownSelector } from 'mastodon/components/dropdown_selector';
+import { Icon } from 'mastodon/components/icon';
+
+interface DropdownProps {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+  placement?: Placement;
+}
+
+const Dropdown: React.FC<DropdownProps> = ({
+  value,
+  options,
+  disabled,
+  onChange,
+  placement: initialPlacement = 'bottom-end',
+}) => {
+  const activeElementRef = useRef<Element | null>(null);
+  const containerRef = useRef(null);
+  const [isOpen, setOpen] = useState<boolean>(false);
+  const [placement, setPlacement] = useState<Placement>(initialPlacement);
+
+  const handleToggle = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    ) {
+      activeElementRef.current.focus({ preventScroll: true });
+    }
+
+    setOpen(!isOpen);
+  }, [isOpen, setOpen]);
+
+  const handleMouseDown = useCallback(() => {
+    if (!isOpen) activeElementRef.current = document.activeElement;
+  }, [isOpen]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      switch (e.key) {
+        case ' ':
+        case 'Enter':
+          if (!isOpen) activeElementRef.current = document.activeElement;
+          break;
+      }
+    },
+    [isOpen],
+  );
+
+  const handleClose = useCallback(() => {
+    if (
+      isOpen &&
+      activeElementRef.current &&
+      activeElementRef.current instanceof HTMLElement
+    )
+      activeElementRef.current.focus({ preventScroll: true });
+    setOpen(false);
+  }, [isOpen]);
+
+  const handleOverlayEnter = useCallback(
+    (state: Partial<PopperState>) => {
+      if (state.placement) setPlacement(state.placement);
+    },
+    [setPlacement],
+  );
+
+  const valueOption = options.find((item) => item.value === value);
+
+  return (
+    <div ref={containerRef}>
+      <button
+        type='button'
+        onClick={handleToggle}
+        onMouseDown={handleMouseDown}
+        onKeyDown={handleKeyDown}
+        disabled={disabled}
+        className={classNames('dropdown-button', { active: isOpen })}
+      >
+        <span className='dropdown-button__label'>{valueOption?.text}</span>
+        <Icon id='down' icon={ArrowDropDownIcon} />
+      </button>
+
+      <Overlay
+        show={isOpen}
+        offset={[5, 5]}
+        placement={placement}
+        flip
+        target={containerRef}
+        popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}
+      >
+        {({ props, placement }) => (
+          <div {...props}>
+            <div
+              className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}
+            >
+              <DropdownSelector
+                items={options}
+                value={value}
+                onClose={handleClose}
+                onChange={onChange}
+                classNamePrefix='privacy-dropdown'
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
+};
+
+interface Props {
+  value: string;
+  options: SelectItem[];
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}
+
+export const SelectWithLabel: React.FC<PropsWithChildren<Props>> = ({
+  value,
+  options,
+  disabled,
+  children,
+  onChange,
+}) => {
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>{children}</div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Dropdown
+            value={value}
+            onChange={onChange}
+            disabled={disabled}
+            options={options}
+          />
+        </div>
+      </div>
+    </label>
+  );
+};
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@ -6,7 +6,6 @@ import { openModal } from 'mastodon/actions/modal';
 import { initializeNotifications } from 'mastodon/actions/notifications_migration';

 import { showAlert } from '../../../actions/alerts';
-import { updateNotificationsPolicy } from '../../../actions/notification_policies';
 import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
@ -25,7 +24,6 @@ const mapStateToProps = state => ({
  alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
  browserSupport: state.getIn(['notifications', 'browserSupport']),
  browserPermission: state.getIn(['notifications', 'browserPermission']),
-  notificationPolicy: state.notificationPolicy,
 });

 const mapDispatchToProps = (dispatch) => ({
@ -74,12 +72,6 @@ const mapDispatchToProps = (dispatch) => ({
    dispatch(requestBrowserPermission());
  },

-  onChangePolicy (param, checked) {
-    dispatch(updateNotificationsPolicy({
-      [param]: checked,
-    }));
-  },
-
 });

 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@ -34,7 +34,10 @@ import ColumnHeader from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';

-import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@ -255,20 +258,21 @@ class Notifications extends PureComponent {
      scrollContainer = <NotSignedInIndicator />;
    }

-    let extraButton = null;
-
-    if (canMarkAsRead) {
-      extraButton = (
-        <button
-          aria-label={intl.formatMessage(messages.markAsRead)}
-          title={intl.formatMessage(messages.markAsRead)}
-          onClick={this.handleMarkAsRead}
-          className='column-header__button'
-        >
-          <Icon id='done-all' icon={DoneAllIcon} />
-        </button>
-      );
-    }
+    const extraButton = (
+      <>
+        <FilteredNotificationsIconButton className='column-header__button' />
+        {canMarkAsRead && (
+          <button
+            aria-label={intl.formatMessage(messages.markAsRead)}
+            title={intl.formatMessage(messages.markAsRead)}
+            onClick={this.handleMarkAsRead}
+            className='column-header__button'
+          >
+            <Icon id='done-all' icon={DoneAllIcon} />
+          </button>
+        )}
+      </>
+    );

    return (
      <Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.title)}>
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { useRef, useCallback, useEffect } from 'react';

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

 import { Helmet } from 'react-helmet';

@ -90,6 +90,23 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {

  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });

+  let explainer = null;
+
+  if (account?.limited) {
+    const isLocal = account.acct.indexOf('@') === -1;
+    explainer = (
+      <div className='dismissable-banner'>
+        <div className='dismissable-banner__message'>
+          {isLocal ? (
+            <FormattedMessage id='notification_requests.explainer_for_limited_account' defaultMessage='Notifications from this account have been filtered because the account has been limited by a moderator.' />
+          ) : (
+            <FormattedMessage id='notification_requests.explainer_for_limited_remote_account' defaultMessage='Notifications from this account have been filtered because the account or its server has been limited by a moderator.' />
+          )}
+        </div>
+      </div>
+    );
+  }
+
  return (
    <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
      <ColumnHeader
@ -109,6 +126,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {

      <SensitiveMediaContextProvider hideMediaByDefault>
        <ScrollableList
+          prepend={explainer}
          scrollKey={`notification_requests/${id}`}
          trackScroll={!multiColumn}
          bindToDocument={!multiColumn}
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@ -9,16 +9,52 @@ import { useSelector, useDispatch } from 'react-redux';

 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
+import { changeSetting } from 'mastodon/actions/settings';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import ScrollableList from 'mastodon/components/scrollable_list';

 import { NotificationRequest } from './components/notification_request';
+import { PolicyControls } from './components/policy_controls';
+import SettingToggle from './components/setting_toggle';

 const messages = defineMessages({
  title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+  maximize: { id: 'notification_requests.maximize', defaultMessage: 'Maximize' }
 });

+const ColumnSettings = () => {
+  const dispatch = useDispatch();
+  const settings = useSelector((state) => state.settings.get('notifications'));
+
+  const onChange = useCallback(
+    (key, checked) => {
+      dispatch(changeSetting(['notifications', ...key], checked));
+    },
+    [dispatch],
+  );
+
+  return (
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='notifications'
+            settings={settings}
+            settingPath={['minimizeFilteredBanner']}
+            onChange={onChange}
+            label={
+              <FormattedMessage id='notification_requests.minimize_banner' defaultMessage='Minimize filtered notifications banner' />
+            }
+          />
+        </div>
+      </section>
+
+      <PolicyControls />
+    </div>
+  );
+};
+
 export const NotificationRequests = ({ multiColumn }) => {
  const columnRef = useRef();
  const intl = useIntl();
@ -48,7 +84,9 @@ export const NotificationRequests = ({ multiColumn }) => {
        onClick={handleHeaderClick}
        multiColumn={multiColumn}
        showBackButton
-      />
+      >
+        <ColumnSettings />
+      </ColumnHeader>

      <ScrollableList
        scrollKey='notification_requests'
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@ -1,26 +1,34 @@
 import { FormattedMessage } from 'react-intl';

+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
-import type { StatusVisibility } from 'mastodon/api_types/statuses';
+import { me } from 'mastodon/initial_state';
 import type { NotificationGroupMention } from 'mastodon/models/notification_group';
+import type { Status } from 'mastodon/models/status';
 import { useAppSelector } from 'mastodon/store';

 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationWithStatus } from './notification_with_status';

-const labelRenderer: LabelRenderer = (values) => (
+const mentionLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.mention' defaultMessage='Mention' />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = () => (
  <FormattedMessage
-    id='notification.mention'
-    defaultMessage='{name} mentioned you'
-    values={values}
+    id='notification.label.private_mention'
+    defaultMessage='Private mention'
  />
 );

-const privateMentionLabelRenderer: LabelRenderer = (values) => (
+const replyLabelRenderer: LabelRenderer = () => (
+  <FormattedMessage id='notification.label.reply' defaultMessage='Reply' />
+);
+
+const privateReplyLabelRenderer: LabelRenderer = () => (
  <FormattedMessage
-    id='notification.private_mention'
-    defaultMessage='{name} privately mentioned you'
-    values={values}
+    id='notification.label.private_reply'
+    defaultMessage='Private reply'
  />
 );

@ -28,27 +36,30 @@ export const NotificationMention: React.FC<{
  notification: NotificationGroupMention;
  unread: boolean;
 }> = ({ notification, unread }) => {
-  const statusVisibility = useAppSelector(
-    (state) =>
-      state.statuses.getIn([
-        notification.statusId,
-        'visibility',
-      ]) as StatusVisibility,
-  );
+  const [isDirect, isReply] = useAppSelector((state) => {
+    const status = state.statuses.get(notification.statusId) as Status;
+
+    return [
+      status.get('visibility') === 'direct',
+      status.get('in_reply_to_account_id') === me,
+    ] as const;
+  });
+
+  let labelRenderer = mentionLabelRenderer;
+
+  if (isReply && isDirect) labelRenderer = privateReplyLabelRenderer;
+  else if (isReply) labelRenderer = replyLabelRenderer;
+  else if (isDirect) labelRenderer = privateMentionLabelRenderer;

  return (
    <NotificationWithStatus
      type='mention'
-      icon={ReplyIcon}
+      icon={isReply ? ReplyIcon : AlternateEmailIcon}
      iconId='reply'
      accountIds={notification.sampleAccountIds}
      count={notification.notifications_count}
      statusId={notification.statusId}
-      labelRenderer={
-        statusVisibility === 'direct'
-          ? privateMentionLabelRenderer
-          : labelRenderer
-      }
+      labelRenderer={labelRenderer}
      unread={unread}
    />
  );
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@ -4,8 +4,6 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';

 import { Helmet } from 'react-helmet';

-import { createSelector } from '@reduxjs/toolkit';
-
 import { useDebouncedCallback } from 'use-debounce';

 import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
@ -26,16 +24,14 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import {
  selectUnreadNotificationGroupsCount,
  selectPendingNotificationGroupsCount,
+  selectAnyPendingNotification,
+  selectNotificationGroups,
 } from 'mastodon/selectors/notifications';
 import {
  selectNeedsNotificationPermission,
-  selectSettingsNotificationsExcludedTypes,
-  selectSettingsNotificationsQuickFilterActive,
-  selectSettingsNotificationsQuickFilterShow,
  selectSettingsNotificationsShowUnread,
 } from 'mastodon/selectors/settings';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
-import type { RootState } from 'mastodon/store';

 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { submitMarkers } from '../../actions/markers';
@ -43,7 +39,10 @@ import Column from '../../components/column';
 import { ColumnHeader } from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
-import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import {
+  FilteredNotificationsBanner,
+  FilteredNotificationsIconButton,
+} from '../notifications/components/filtered_notifications_banner';
 import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
 import ColumnSettingsContainer from '../notifications/containers/column_settings_container';

@ -58,41 +57,19 @@ const messages = defineMessages({
  },
 });

-const getNotifications = createSelector(
-  [
-    selectSettingsNotificationsQuickFilterShow,
-    selectSettingsNotificationsQuickFilterActive,
-    selectSettingsNotificationsExcludedTypes,
-    (state: RootState) => state.notificationGroups.groups,
-  ],
-  (showFilterBar, allowedType, excludedTypes, notifications) => {
-    if (!showFilterBar || allowedType === 'all') {
-      // used if user changed the notification settings after loading the notifications from the server
-      // otherwise a list of notifications will come pre-filtered from the backend
-      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
-      return notifications.filter(
-        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
-      );
-    }
-    return notifications.filter(
-      (item) => item.type === 'gap' || allowedType === item.type,
-    );
-  },
-);
-
 export const Notifications: React.FC<{
  columnId?: string;
  multiColumn?: boolean;
 }> = ({ columnId, multiColumn }) => {
  const intl = useIntl();
-  const notifications = useAppSelector(getNotifications);
+  const notifications = useAppSelector(selectNotificationGroups);
  const dispatch = useAppDispatch();
  const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
  const hasMore = notifications.at(-1)?.type === 'gap';

  const lastReadId = useAppSelector((s) =>
    selectSettingsNotificationsShowUnread(s)
-      ? s.notificationGroups.lastReadId
+      ? s.notificationGroups.readMarkerId
      : '0',
  );

@ -102,11 +79,13 @@ export const Notifications: React.FC<{
    selectUnreadNotificationGroupsCount,
  );

+  const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
+
  const isUnread = unreadNotificationsCount > 0;

  const canMarkAsRead =
    useAppSelector(selectSettingsNotificationsShowUnread) &&
-    unreadNotificationsCount > 0;
+    anyPendingNotification;

  const needsNotificationPermission = useAppSelector(
    selectNeedsNotificationPermission,
@ -306,16 +285,21 @@ export const Notifications: React.FC<{
    <NotSignedInIndicator />
  );

-  const extraButton = canMarkAsRead ? (
-    <button
-      aria-label={intl.formatMessage(messages.markAsRead)}
-      title={intl.formatMessage(messages.markAsRead)}
-      onClick={handleMarkAsRead}
-      className='column-header__button'
-    >
-      <Icon id='done-all' icon={DoneAllIcon} />
-    </button>
-  ) : null;
+  const extraButton = (
+    <>
+      <FilteredNotificationsIconButton className='column-header__button' />
+      {canMarkAsRead && (
+        <button
+          aria-label={intl.formatMessage(messages.markAsRead)}
+          title={intl.formatMessage(messages.markAsRead)}
+          onClick={handleMarkAsRead}
+          className='column-header__button'
+        >
+          <Icon id='done-all' icon={DoneAllIcon} />
+        </button>
+      )}
+    </>
+  );

  return (
    <Column
--- a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
@ -0,0 +1,108 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import PersonAlertIcon from '@/material-icons/400-24px/person_alert.svg?react';
+import ShieldQuestionIcon from '@/material-icons/400-24px/shield_question.svg?react';
+import { closeModal } from 'mastodon/actions/modal';
+import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const IgnoreNotificationsModal = ({ filterType }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'drop' }));
+  }, [dispatch, filterType]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    void dispatch(updateNotificationsPolicy({ [filterType]: 'filter' }));
+  }, [dispatch, filterType]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  let title = null;
+
+  switch(filterType) {
+  case 'for_not_following':
+    title = <FormattedMessage id='ignore_notifications_modal.not_following_title' defaultMessage="Ignore notifications from people you don't follow?" />;
+    break;
+  case 'for_not_followers':
+    title = <FormattedMessage id='ignore_notifications_modal.not_followers_title' defaultMessage='Ignore notifications from people not following you?' />;
+    break;
+  case 'for_new_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.new_accounts_title' defaultMessage='Ignore notifications from new accounts?' />;
+    break;
+  case 'for_private_mentions':
+    title = <FormattedMessage id='ignore_notifications_modal.private_mentions_title' defaultMessage='Ignore notifications from unsolicited Private Mentions?' />;
+    break;
+  case 'for_limited_accounts':
+    title = <FormattedMessage id='ignore_notifications_modal.limited_accounts_title' defaultMessage='Ignore notifications from moderated accounts?' />;
+    break;
+  }
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <h1>{title}</h1>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={InventoryIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_review_separately' defaultMessage='You can review filtered notifications speparately' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonAlertIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_act_users' defaultMessage="You'll still be able to accept, reject, or report users" /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ShieldQuestionIcon} /></div>
+            <div><FormattedMessage id='ignore_notifications_modal.filter_to_avoid_confusion' defaultMessage='Filtering helps avoid potential confusion' /></div>
+          </div>
+        </div>
+
+        <div>
+          <FormattedMessage id='ignore_notifications_modal.disclaimer' defaultMessage="Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent." />
+        </div>
+      </div>
+
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='ignore_notifications_modal.filter_instead' defaultMessage='Filter instead' />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <button onClick={handleClick} className='link-button'>
+            <FormattedMessage id='ignore_notifications_modal.ignore' defaultMessage='Ignore notifications' />
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+IgnoreNotificationsModal.propTypes = {
+  filterType: PropTypes.string.isRequired,
+};
+
+export default IgnoreNotificationsModal;
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@ -17,6 +17,7 @@ import {
  InteractionModal,
  SubscribedLanguagesModal,
  ClosedRegistrationsModal,
+  IgnoreNotificationsModal,
 } from 'mastodon/features/ui/util/async-components';
 import { getScrollbarWidth } from 'mastodon/utils/scrollbar';

@ -70,6 +71,7 @@ export const MODAL_COMPONENTS = {
  'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,
  'INTERACTION': InteractionModal,
  'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
+  'IGNORE_NOTIFICATIONS': IgnoreNotificationsModal,
 };

 export default class ModalRoot extends PureComponent {
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@ -134,6 +134,10 @@ export function ReportModal () {
  return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }

+export function IgnoreNotificationsModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/ignore_notifications_modal');
+}
+
 export function MediaGallery () {
  return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media_gallery');
 }
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@ -9,7 +9,6 @@
  "about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
  "about.powered_by": "Gedesentraliseerde sosiale media aangedryf deur {mastodon}",
  "about.rules": "Bedienerreëls",
-  "account.account_note_header": "Nota",
  "account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
  "account.badges.bot": "Bot",
  "account.badges.group": "Groep",
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@ -11,7 +11,6 @@
  "about.not_available": "Esta información no ye disponible en este servidor.",
  "about.powered_by": "Retz socials descentralizaus con tecnolochía de {mastodon}",
  "about.rules": "Reglas d'o servidor",
-  "account.account_note_header": "Nota",
  "account.add_or_remove_from_list": "Adhibir u eliminar de listas",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grupo",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -11,7 +11,6 @@
  "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": "فريق",
@ -291,8 +290,6 @@
  "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
  "filter_modal.select_filter.title": "تصفية هذا المنشور",
  "filter_modal.title.status": "تصفية منشور",
-  "filtered_notifications_banner.mentions": "{count, plural, one {إشارة} two {إشارتين} few {# إشارات} other {# إشارة}}",
-  "filtered_notifications_banner.pending_requests": "إشعارات من {count, plural, zero {}=0 {لا أحد} one {شخص واحد قد تعرفه} two {شخصين قد تعرفهما} few {# أشخاص قد تعرفهم} many {# شخص قد تعرفهم} other {# شخص قد تعرفهم}}",
  "filtered_notifications_banner.title": "الإشعارات المصفاة",
  "firehose.all": "الكل",
  "firehose.local": "هذا الخادم",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -11,7 +11,6 @@
  "about.not_available": "Esta información nun ta disponible nesti sirvidor.",
  "about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
  "about.rules": "Normes del sirvidor",
-  "account.account_note_header": "Nota",
  "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
  "account.badges.group": "Grupu",
  "account.block": "Bloquiar a @{name}",
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@ -11,7 +11,6 @@
  "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": "Група",
@ -171,21 +170,28 @@
  "confirmations.block.confirm": "Заблакіраваць",
  "confirmations.delete.confirm": "Выдаліць",
  "confirmations.delete.message": "Вы ўпэўненыя, што хочаце выдаліць гэты допіс?",
+  "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": "Рэдагаваць",
  "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
+  "confirmations.edit.title": "Замяніць допіс?",
  "confirmations.logout.confirm": "Выйсці",
  "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
+  "confirmations.logout.title": "Выйсці?",
  "confirmations.mute.confirm": "Ігнараваць",
  "confirmations.redraft.confirm": "Выдаліць і перапісаць",
  "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
+  "confirmations.redraft.title": "Выдаліць і перапісаць допіс?",
  "confirmations.reply.confirm": "Адказаць",
  "confirmations.reply.message": "Калі вы адкажаце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
+  "confirmations.reply.title": "Замяніць допіс?",
  "confirmations.unfollow.confirm": "Адпісацца",
  "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
+  "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
  "conversation.delete": "Выдаліць размову",
  "conversation.mark_as_read": "Адзначыць прачытаным",
  "conversation.open": "Прагледзець размову",
@ -293,8 +299,7 @@
  "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
  "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
  "filter_modal.title.status": "Фільтраваць допіс",
-  "filtered_notifications_banner.mentions": "{count, plural, one {згадванне} few {згадванні} many {згадванняў} other {згадвання}}",
-  "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+  "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
  "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
  "firehose.all": "Усе",
  "firehose.local": "Гэты сервер",
@ -343,7 +348,7 @@
  "hashtag.follow": "Падпісацца на хэштэг",
  "hashtag.unfollow": "Адпісацца ад хэштэга",
  "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.column_settings.show_reblogs": "Паказаць пашырэнні",
+  "home.column_settings.show_reblogs": "Паказваць пашырэнні",
  "home.column_settings.show_replies": "Паказваць адказы",
  "home.hide_announcements": "Схаваць аб'явы",
  "home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
@ -439,6 +444,8 @@
  "mute_modal.title": "Ігнараваць карыстальніка?",
  "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
+  "name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}}",
+  "name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a>",
  "navigation_bar.about": "Пра нас",
  "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
  "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
@ -466,6 +473,10 @@
  "navigation_bar.security": "Бяспека",
  "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
  "notification.admin.report": "{name} паскардзіўся на {target}",
+  "notification.admin.report_account": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target} з прычыны {category}",
+  "notification.admin.report_account_other": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target}",
+  "notification.admin.report_statuses": "{name} паскардзіўся на {target} з прычыны {category}",
+  "notification.admin.report_statuses_other": "{name} паскардзіўся на {target}",
  "notification.admin.sign_up": "{name} зарэгістраваўся",
  "notification.favourite": "Ваш допіс упадабаны {name}",
  "notification.follow": "{name} падпісаўся на вас",
@ -481,6 +492,8 @@
  "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
  "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
  "notification.own_poll": "Ваша апытанне скончылася",
+  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
+  "notification.private_mention": "{name} згадаў вас асабіста",
  "notification.reblog": "{name} пашырыў ваш допіс",
  "notification.relationships_severance_event": "Страціў сувязь з {name}",
  "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
@ -491,13 +504,18 @@
  "notification.update": "Допіс {name} адрэдагаваны",
  "notification_requests.accept": "Прыняць",
  "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.maximize": "Разгарнуць",
+  "notification_requests.minimize_banner": "Згарнуць банер адфільтраваных апавяшчэнняў",
  "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
  "notification_requests.title": "Адфільтраваныя апавяшчэнні",
  "notifications.clear": "Ачысціць апавяшчэнні",
  "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
+  "notifications.clear_title": "Ачысціць апавяшчэнні?",
  "notifications.column_settings.admin.report": "Новыя скаргі:",
  "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
  "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
+  "notifications.column_settings.beta.category": "Эксперыментальныя функцыі",
+  "notifications.column_settings.beta.grouping": "Групаваць апавяшчэннi",
  "notifications.column_settings.favourite": "Упадабанае:",
  "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
@ -661,9 +679,13 @@
  "report.unfollow_explanation": "Вы падпісаныя на гэты ўліковы запіс. Каб не бачыць допісы з яго ў вашай стужцы, адпішыцеся.",
  "report_notification.attached_statuses": "{count, plural, one {{count} допіс прымацаваны} few {{count} допісы прымацаваны} many {{count} допісаў прымацавана} other {{count} допісу прымацавана}}",
  "report_notification.categories.legal": "Права",
+  "report_notification.categories.legal_sentence": "нелегальнае змесціва",
  "report_notification.categories.other": "Іншае",
+  "report_notification.categories.other_sentence": "іншае",
  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.spam_sentence": "спам",
  "report_notification.categories.violation": "Парушэнне правілаў",
+  "report_notification.categories.violation_sentence": "парушэнне правілаў",
  "report_notification.open": "Адкрыць скаргу",
  "search.no_recent_searches": "Гісторыя пошуку пустая",
  "search.placeholder": "Пошук",
@ -691,8 +713,11 @@
  "server_banner.about_active_users": "Людзі, якія карыстаюцца гэтым сервера на працягу апошніх 30 дзён (Штомесячна Актыўныя Карыстальнікі)",
  "server_banner.active_users": "актыўныя карыстальнікі",
  "server_banner.administered_by": "Адміністратар:",
+  "server_banner.is_one_of_many": "{domain} - гэта адзін з многіх незалежных сервераў Mastodon, якія вы можаце выкарыстоўваць для ўдзелу ў fediverse.",
  "server_banner.server_stats": "Статыстыка сервера:",
  "sign_in_banner.create_account": "Стварыць уліковы запіс",
+  "sign_in_banner.follow_anyone": "Сачыце за кім заўгодна ва ўсім fediverse і глядзіце ўсё ў храналагічным парадку. Ніякіх алгарытмаў, рэкламы або клікбэйту.",
+  "sign_in_banner.mastodon_is": "Mastodon - лепшы спосаб быць у курсе ўсяго, што адбываецца.",
  "sign_in_banner.sign_in": "Увайсці",
  "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
  "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
@ -767,8 +792,8 @@
  "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
  "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
  "timeline_hint.resources.followers": "Падпісчыкі",
-  "timeline_hint.resources.follows": "Падпісаны на",
-  "timeline_hint.resources.statuses": "Старэйшыя допісы",
+  "timeline_hint.resources.follows": "Падпіскі",
+  "timeline_hint.resources.statuses": "Старыя допісы",
  "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
  "trends.trending_now": "Актуальнае",
  "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -11,7 +11,7 @@
  "about.not_available": "Тази информация не е публична на този сървър.",
  "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
  "about.rules": "Правила на сървъра",
-  "account.account_note_header": "Бележка",
+  "account.account_note_header": "Лична бележка",
  "account.add_or_remove_from_list": "Добавяне или премахване от списъци",
  "account.badges.bot": "Бот",
  "account.badges.group": "Група",
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
  "filter_modal.select_filter.title": "Филтриране на публ.",
  "filter_modal.title.status": "Филтриране на публ.",
-  "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
-  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
  "filtered_notifications_banner.title": "Филтрирани известия",
  "firehose.all": "Всичко",
  "firehose.local": "Този сървър",
@ -506,6 +505,8 @@
  "notification.update": "{name} промени публикация",
  "notification_requests.accept": "Приемам",
  "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.maximize": "Максимизиране",
+  "notification_requests.minimize_banner": "Минимизиране на банера за филтрирани известия",
  "notification_requests.notifications_from": "Известия от {name}",
  "notification_requests.title": "Филтрирани известия",
  "notifications.clear": "Изчистване на известията",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -11,7 +11,6 @@
  "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": "দল",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -11,7 +11,6 @@
  "about.not_available": "An titour-mañ ne c'heller ket gwelet war ar servijer-mañ.",
  "about.powered_by": "Rouedad sokial digreizenned kaset gant {mastodon}",
  "about.rules": "Reolennoù ar servijer",
-  "account.account_note_header": "Notenn",
  "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
  "account.badges.bot": "Robot",
  "account.badges.group": "Strollad",
@ -252,7 +251,6 @@
  "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
  "filter_modal.select_filter.title": "Silañ an toud-mañ",
  "filter_modal.title.status": "Silañ un toud",
-  "filtered_notifications_banner.mentions": "{count, plural, one {meneg} two {veneg} few {meneg} other {a venegoù}}",
  "firehose.all": "Pep tra",
  "firehose.local": "Ar servijer-mañ",
  "firehose.remote": "Servijerioù all",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -11,7 +11,7 @@
  "about.not_available": "Aquesta informació no és disponible en aquest servidor.",
  "about.powered_by": "Xarxa social descentralitzada impulsada per {mastodon}",
  "about.rules": "Normes del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
  "account.add_or_remove_from_list": "Afegeix o elimina de les llistes",
  "account.badges.bot": "Automatitzat",
  "account.badges.group": "Grup",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menció} other {mencions}}",
-  "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.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",
  "firehose.local": "Aquest servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} ha editat un tut",
  "notification_requests.accept": "Accepta",
  "notification_requests.dismiss": "Ignora",
+  "notification_requests.maximize": "Maximitza",
+  "notification_requests.minimize_banner": "Minimitza el bàner de notificacions filtrades",
  "notification_requests.notifications_from": "Notificacions de {name}",
  "notification_requests.title": "Notificacions filtrades",
  "notifications.clear": "Esborra les notificacions",
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@ -11,7 +11,6 @@
  "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": "گرووپ",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -1,5 +1,4 @@
 {
-  "account.account_note_header": "Nota",
  "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
  "account.badges.bot": "Bot",
  "account.badges.group": "Gruppu",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -11,7 +11,7 @@
  "about.not_available": "Tato informace nebyla zpřístupněna na tomto serveru.",
  "about.powered_by": "Decentralizovaná sociální média poháněná {mastodon}",
  "about.rules": "Pravidla serveru",
-  "account.account_note_header": "Poznámka",
+  "account.account_note_header": "Osobní poznámka",
  "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
  "account.badges.bot": "Bot",
  "account.badges.group": "Skupina",
@ -171,21 +171,28 @@
  "confirmations.block.confirm": "Blokovat",
  "confirmations.delete.confirm": "Smazat",
  "confirmations.delete.message": "Opravdu chcete smazat tento příspěvek?",
+  "confirmations.delete.title": "Smazat příspěvek?",
  "confirmations.delete_list.confirm": "Smazat",
  "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
+  "confirmations.delete_list.title": "Smazat seznam?",
  "confirmations.discard_edit_media.confirm": "Zahodit",
  "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
  "confirmations.edit.confirm": "Upravit",
  "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
+  "confirmations.edit.title": "Přepsat příspěvek?",
  "confirmations.logout.confirm": "Odhlásit se",
  "confirmations.logout.message": "Opravdu se chcete odhlásit?",
+  "confirmations.logout.title": "Odhlásit se?",
  "confirmations.mute.confirm": "Skrýt",
  "confirmations.redraft.confirm": "Smazat a přepsat",
  "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
+  "confirmations.redraft.title": "Smazat a přepracovat příspěvek na koncept?",
  "confirmations.reply.confirm": "Odpovědět",
  "confirmations.reply.message": "Odpověď přepíše vaši rozepsanou zprávu. Opravdu chcete pokračovat?",
+  "confirmations.reply.title": "Přepsat příspěvek?",
  "confirmations.unfollow.confirm": "Přestat sledovat",
  "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
+  "confirmations.unfollow.title": "Přestat sledovat uživatele?",
  "conversation.delete": "Smazat konverzaci",
  "conversation.mark_as_read": "Označit jako přečtené",
  "conversation.open": "Zobrazit konverzaci",
@ -293,8 +300,6 @@
  "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
  "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
  "filter_modal.title.status": "Filtrovat příspěvek",
-  "filtered_notifications_banner.mentions": "{count, plural, one {zmínka} few {zmínky} many {zmínek} other {zmínek}}",
-  "filtered_notifications_banner.pending_requests": "Oznámení od {count, plural, =0 {nikoho} one {jednoho člověka, kterého znáte} few {# lidí, které znáte} many {# lidí, které znáte} other {# lidí, které znáte}}",
  "filtered_notifications_banner.title": "Filtrovaná oznámení",
  "firehose.all": "Vše",
  "firehose.local": "Tento server",
@ -466,6 +471,8 @@
  "navigation_bar.security": "Zabezpečení",
  "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
  "notification.admin.report": "Uživatel {name} nahlásil {target}",
+  "notification.admin.report_statuses": "{name} nahlásil {target} za {category}",
+  "notification.admin.report_statuses_other": "{name} nahlásil {target}",
  "notification.admin.sign_up": "Uživatel {name} se zaregistroval",
  "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
  "notification.follow": "Uživatel {name} vás začal sledovat",
@ -481,6 +488,8 @@
  "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
  "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
  "notification.own_poll": "Vaše anketa skončila",
+  "notification.poll": "Anketa, ve které jste hlasovali, skončila",
+  "notification.private_mention": "{name} vás soukromě zmínil",
  "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
  "notification.relationships_severance_event": "Kontakt ztracen s {name}",
  "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
@ -491,13 +500,18 @@
  "notification.update": "Uživatel {name} upravil příspěvek",
  "notification_requests.accept": "Přijmout",
  "notification_requests.dismiss": "Zamítnout",
+  "notification_requests.maximize": "Maximalizovat",
+  "notification_requests.minimize_banner": "Minimalizovat banner filtrovaných oznámení",
  "notification_requests.notifications_from": "Oznámení od {name}",
  "notification_requests.title": "Vyfiltrovaná oznámení",
  "notifications.clear": "Vyčistit oznámení",
  "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
+  "notifications.clear_title": "Vyčistit oznámení?",
  "notifications.column_settings.admin.report": "Nová hlášení:",
  "notifications.column_settings.admin.sign_up": "Nové registrace:",
  "notifications.column_settings.alert": "Oznámení na počítači",
+  "notifications.column_settings.beta.category": "Experimentální funkce",
+  "notifications.column_settings.beta.grouping": "Seskupit notifikace",
  "notifications.column_settings.favourite": "Oblíbené:",
  "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
  "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
@ -661,9 +675,13 @@
  "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
  "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
  "report_notification.categories.legal": "Právní ustanovení",
+  "report_notification.categories.legal_sentence": "nezákonný obsah",
  "report_notification.categories.other": "Ostatní",
+  "report_notification.categories.other_sentence": "další",
  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
  "report_notification.categories.violation": "Porušení pravidla",
+  "report_notification.categories.violation_sentence": "porušení pravidla",
  "report_notification.open": "Otevřít hlášení",
  "search.no_recent_searches": "Žádná nedávná vyhledávání",
  "search.placeholder": "Hledat",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -3,7 +3,7 @@
  "about.contact": "Cysylltwch â:",
  "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
-  "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffederasiwn a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
+  "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffedysawd a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
  "about.domain_blocks.silenced.explanation": "Fel rheol, fyddwch chi ddim yn gweld proffiliau a chynnwys o'r gweinydd hwn, oni bai eich bod yn chwilio'n benodol amdano neu yn ymuno drwy ei ddilyn.",
  "about.domain_blocks.silenced.title": "Cyfyngedig",
  "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei gadw na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
@ -11,7 +11,6 @@
  "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
  "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
  "about.rules": "Rheolau'r gweinydd",
-  "account.account_note_header": "Nodyn",
  "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grŵp",
@ -300,8 +299,6 @@
  "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
  "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
  "filter_modal.title.status": "Hidlo postiad",
-  "filtered_notifications_banner.mentions": "{count, plural, one {crybwylliad} other {crybwylliad}}",
-  "filtered_notifications_banner.pending_requests": "Hysbysiadau gan {count, plural, =0 {neb} one {un person} other {# person}} efallai y gwyddoch amdanyn nhw",
  "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
  "firehose.all": "Popeth",
  "firehose.local": "Gweinydd hwn",
@ -505,6 +502,7 @@
  "notification.update": "Golygodd {name} bostiad",
  "notification_requests.accept": "Derbyn",
  "notification_requests.dismiss": "Cau",
+  "notification_requests.maximize": "Mwyhau",
  "notification_requests.notifications_from": "Hysbysiadau gan {name}",
  "notification_requests.title": "Hysbysiadau wedi'u hidlo",
  "notifications.clear": "Clirio hysbysiadau",
@ -712,8 +710,11 @@
  "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
  "server_banner.active_users": "defnyddwyr gweithredol",
  "server_banner.administered_by": "Gweinyddir gan:",
+  "server_banner.is_one_of_many": "Mae {domain} yn un o'r nifer o weinyddion Mastodon annibynnol y gallwch eu defnyddio i gymryd rhan yn y ffedysawd.",
  "server_banner.server_stats": "Ystadegau'r gweinydd:",
  "sign_in_banner.create_account": "Creu cyfrif",
+  "sign_in_banner.follow_anyone": "Dilynwch unrhyw un ar draws y ffedysawd a gweld y cyfan mewn trefn gronolegol. Dim algorithmau, hysbysebion, na straeon er mwyn cliciadau yn y golwg.",
+  "sign_in_banner.mastodon_is": "Mastodon yw'r ffordd orau o gadw i fyny â'r hyn sy'n digwydd.",
  "sign_in_banner.sign_in": "Mewngofnodi",
  "sign_in_banner.sso_redirect": "Mewngofnodi neu Gofrestru",
  "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -11,7 +11,7 @@
  "about.not_available": "Denne information er ikke blevet gjort tilgængelig på denne server.",
  "about.powered_by": "Decentraliserede sociale medier drevet af {mastodon}",
  "about.rules": "Serverregler",
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Personligt notat",
  "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
  "account.badges.bot": "Bot",
  "account.badges.group": "Gruppe",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
-  "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+  "filtered_notifications_banner.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",
  "firehose.local": "Denne server",
@ -506,6 +505,8 @@
  "notification.update": "{name} redigerede et indlæg",
  "notification_requests.accept": "Acceptér",
  "notification_requests.dismiss": "Afvis",
+  "notification_requests.maximize": "Maksimér",
+  "notification_requests.minimize_banner": "Minimér filtrerede notifikationsbanner",
  "notification_requests.notifications_from": "Notifikationer fra {name}",
  "notification_requests.title": "Filtrerede notifikationer",
  "notifications.clear": "Ryd notifikationer",
@ -544,6 +545,8 @@
  "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
  "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.filter_limited_accounts_hint": "Begrænset af servermoderatorer",
+  "notifications.policy.filter_limited_accounts_title": "Modererede konti",
  "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
  "notifications.policy.filter_new_accounts_title": "Ny konti",
  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -11,7 +11,7 @@
  "about.not_available": "Diese Informationen sind auf diesem Server nicht verfügbar.",
  "about.powered_by": "Ein dezentralisiertes soziales Netzwerk, angetrieben von {mastodon}",
  "about.rules": "Serverregeln",
-  "account.account_note_header": "Notiz",
+  "account.account_note_header": "Persönliche Notiz",
  "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
  "account.badges.bot": "Automatisiert",
  "account.badges.group": "Gruppe",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {Erwähnung} other {Erwähnungen}}",
-  "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.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",
  "firehose.local": "Dieser Server",
@ -506,6 +505,8 @@
  "notification.update": "{name} bearbeitete einen Beitrag",
  "notification_requests.accept": "Akzeptieren",
  "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.maximize": "Maximieren",
+  "notification_requests.minimize_banner": "Banner für gefilterte Benachrichtigungen minimieren",
  "notification_requests.notifications_from": "Benachrichtigungen von {name}",
  "notification_requests.title": "Gefilterte Benachrichtigungen",
  "notifications.clear": "Benachrichtigungen löschen",
@ -688,7 +689,7 @@
  "report_notification.categories.violation_sentence": "Regelverletzung",
  "report_notification.open": "Meldung öffnen",
  "search.no_recent_searches": "Keine früheren Suchanfragen",
-  "search.placeholder": "Suche",
+  "search.placeholder": "Suchen",
  "search.quick_action.account_search": "Profile passend zu {x}",
  "search.quick_action.go_to_account": "Profil {x} aufrufen",
  "search.quick_action.go_to_hashtag": "Hashtag {x} aufrufen",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -11,7 +11,7 @@
  "about.not_available": "Αυτές οι πληροφορίες δεν έχουν είναι διαθέσιμες σε αυτόν τον διακομιστή.",
  "about.powered_by": "Αποκεντρωμένα μέσα κοινωνικής δικτύωσης που βασίζονται στο {mastodon}",
  "about.rules": "Κανόνες διακομιστή",
-  "account.account_note_header": "Σημείωση",
+  "account.account_note_header": "Προσωπική σημείωση",
  "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
  "account.badges.bot": "Αυτοματοποιημένος",
  "account.badges.group": "Ομάδα",
@ -171,21 +171,28 @@
  "confirmations.block.confirm": "Αποκλεισμός",
  "confirmations.delete.confirm": "Διαγραφή",
  "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
+  "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": "Επεξεργασία",
  "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
+  "confirmations.edit.title": "Αντικατάσταση ανάρτησης;",
  "confirmations.logout.confirm": "Αποσύνδεση",
  "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
+  "confirmations.logout.title": "Αποσύνδεση;",
  "confirmations.mute.confirm": "Αποσιώπηση",
  "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
  "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
+  "confirmations.redraft.title": "Διαγραφή & επανασύνταξη;",
  "confirmations.reply.confirm": "Απάντησε",
  "confirmations.reply.message": "Απαντώντας τώρα θα αντικαταστήσεις το κείμενο που ήδη γράφεις. Σίγουρα θέλεις να συνεχίσεις;",
+  "confirmations.reply.title": "Αντικατάσταση ανάρτησης;",
  "confirmations.unfollow.confirm": "Άρση ακολούθησης",
  "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
+  "confirmations.unfollow.title": "Άρση ακολούθησης;",
  "conversation.delete": "Διαγραφή συζήτησης",
  "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
  "conversation.open": "Προβολή συνομιλίας",
@ -293,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
  "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
  "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
-  "filtered_notifications_banner.mentions": "{count, plural, one {επισήμανση} other {επισημάνσεις}}",
-  "filtered_notifications_banner.pending_requests": "Ειδοποιήσεις από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
+  "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
  "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
  "firehose.all": "Όλα",
  "firehose.local": "Αυτός ο διακομιστής",
@ -499,10 +505,13 @@
  "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
  "notification_requests.accept": "Αποδοχή",
  "notification_requests.dismiss": "Απόρριψη",
+  "notification_requests.maximize": "Μεγιστοποίηση",
+  "notification_requests.minimize_banner": "Ελαχιστοποίηση μπάνερ φιλτραρισμένων ειδοποιήσεων",
  "notification_requests.notifications_from": "Ειδοποιήσεις από {name}",
  "notification_requests.title": "Φιλτραρισμένες ειδοποιήσεις",
  "notifications.clear": "Καθαρισμός ειδοποιήσεων",
  "notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις μόνιμα όλες τις ειδοποιήσεις σου;",
+  "notifications.clear_title": "Εκκαθάριση ειδοποιήσεων;",
  "notifications.column_settings.admin.report": "Νέες αναφορές:",
  "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
  "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -11,7 +11,6 @@
  "about.not_available": "This information has not been made available on this server.",
  "about.powered_by": "Decentralised social media powered by {mastodon}",
  "about.rules": "Server rules",
-  "account.account_note_header": "Note",
  "account.add_or_remove_from_list": "Add or Remove from lists",
  "account.badges.bot": "Automated",
  "account.badges.group": "Group",
@ -293,8 +292,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
  "filtered_notifications_banner.title": "Filtered notifications",
  "firehose.all": "All",
  "firehose.local": "This server",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -11,7 +11,7 @@
  "about.not_available": "This information has not been made available on this server.",
  "about.powered_by": "Decentralized social media powered by {mastodon}",
  "about.rules": "Server rules",
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Personal note",
  "account.add_or_remove_from_list": "Add or Remove from lists",
  "account.badges.bot": "Automated",
  "account.badges.group": "Group",
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
  "filter_modal.select_filter.title": "Filter this post",
  "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.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",
  "firehose.local": "This server",
@ -357,6 +356,17 @@
  "home.pending_critical_update.link": "See updates",
  "home.pending_critical_update.title": "Critical security update available!",
  "home.show_announcements": "Show announcements",
+  "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.",
+  "ignore_notifications_modal.filter_instead": "Filter instead",
+  "ignore_notifications_modal.filter_to_act_users": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtering helps avoid potential confusion",
+  "ignore_notifications_modal.filter_to_review_separately": "You can review filtered notifications speparately",
+  "ignore_notifications_modal.ignore": "Ignore notifications",
+  "ignore_notifications_modal.limited_accounts_title": "Ignore notifications from moderated accounts?",
+  "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",
+  "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
+  "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
+  "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
  "interaction_modal.description.favourite": "With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.",
  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@ -483,7 +493,11 @@
  "notification.favourite": "{name} favorited your post",
  "notification.follow": "{name} followed you",
  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} mentioned you",
+  "notification.label.mention": "Mention",
+  "notification.label.private_mention": "Private mention",
+  "notification.label.private_reply": "Private reply",
+  "notification.label.reply": "Reply",
+  "notification.mention": "Mention",
  "notification.moderation-warning.learn_more": "Learn more",
  "notification.moderation_warning": "You have received a moderation warning",
  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
@ -495,7 +509,6 @@
  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
  "notification.own_poll": "Your poll has ended",
  "notification.poll": "A poll you voted in has ended",
-  "notification.private_mention": "{name} privately mentioned you",
  "notification.reblog": "{name} boosted your post",
  "notification.relationships_severance_event": "Lost connections with {name}",
  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@ -506,6 +519,10 @@
  "notification.update": "{name} edited a post",
  "notification_requests.accept": "Accept",
  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
+  "notification_requests.maximize": "Maximize",
+  "notification_requests.minimize_banner": "Minimize filtered notifications banner",
  "notification_requests.notifications_from": "Notifications from {name}",
  "notification_requests.title": "Filtered notifications",
  "notifications.clear": "Clear notifications",
@ -544,6 +561,14 @@
  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.accept": "Accept",
+  "notifications.policy.accept_hint": "Show in notifications",
+  "notifications.policy.drop": "Ignore",
+  "notifications.policy.drop_hint": "Send to the void, never to be seen again",
+  "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_hint": "Send to filtered notifications inbox",
+  "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
+  "notifications.policy.filter_limited_accounts_title": "Moderated accounts",
  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
  "notifications.policy.filter_new_accounts_title": "New accounts",
  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
@ -552,7 +577,7 @@
  "notifications.policy.filter_not_following_title": "People you don't follow",
  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
-  "notifications.policy.title": "Filter out notifications from…",
+  "notifications.policy.title": "Manage notifications from…",
  "notifications_permission_banner.enable": "Enable desktop notifications",
  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
  "notifications_permission_banner.title": "Never miss a thing",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -11,7 +11,6 @@
  "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
  "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
  "about.rules": "Regularo de la servilo",
-  "account.account_note_header": "Noto",
  "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
  "account.badges.bot": "Roboto",
  "account.badges.group": "Grupo",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -11,7 +11,7 @@
  "about.not_available": "Esta información no está disponible en este servidor.",
  "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
  "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
  "account.add_or_remove_from_list": "Agregar o quitar de las listas",
  "account.badges.bot": "Automatizada",
  "account.badges.group": "Grupo",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.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",
  "firehose.local": "Este servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} editó un mensaje",
  "notification_requests.accept": "Aceptar",
  "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar la barra de notificaciones filtradas",
  "notification_requests.notifications_from": "Notificaciones de {name}",
  "notification_requests.title": "Notificaciones filtradas",
  "notifications.clear": "Limpiar notificaciones",
@ -544,6 +545,8 @@
  "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
  "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
  "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.filter_limited_accounts_hint": "Limitada por los moderadores del servidor",
+  "notifications.policy.filter_limited_accounts_title": "Cuentas moderadas",
  "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
  "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
  "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -11,7 +11,7 @@
  "about.not_available": "Esta información no está disponible en este servidor.",
  "about.powered_by": "Medio social descentralizado con tecnología de {mastodon}",
  "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
  "account.add_or_remove_from_list": "Agregar o eliminar de las listas",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grupo",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.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",
  "firehose.local": "Este servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} editó una publicación",
  "notification_requests.accept": "Aceptar",
  "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
  "notification_requests.notifications_from": "Notificaciones de {name}",
  "notification_requests.title": "Notificaciones filtradas",
  "notifications.clear": "Limpiar notificaciones",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -11,7 +11,7 @@
  "about.not_available": "Esta información no está disponible en este servidor.",
  "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
  "about.rules": "Reglas del servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
  "account.add_or_remove_from_list": "Agregar o eliminar de listas",
  "account.badges.bot": "Automatizada",
  "account.badges.group": "Grupo",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
-  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.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",
  "firehose.local": "Este servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} editó una publicación",
  "notification_requests.accept": "Aceptar",
  "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar banner de notificaciones filtradas",
  "notification_requests.notifications_from": "Notificaciones de {name}",
  "notification_requests.title": "Notificaciones filtradas",
  "notifications.clear": "Limpiar notificaciones",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -11,7 +11,6 @@
  "about.not_available": "See info ei ole sellel serveril saadavaks tehtud.",
  "about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
  "about.rules": "Serveri reeglid",
-  "account.account_note_header": "Märge",
  "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
  "account.badges.bot": "Robot",
  "account.badges.group": "Grupp",
@ -290,8 +289,6 @@
  "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
  "filter_modal.select_filter.title": "Filtreeri seda postitust",
  "filter_modal.title.status": "Postituse filtreerimine",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mainimine} other {mainimist}}",
-  "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
  "filtered_notifications_banner.title": "Filtreeritud teavitused",
  "firehose.all": "Kõik",
  "firehose.local": "See server",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -11,7 +11,6 @@
  "about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
  "about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
  "about.rules": "Zerbitzariaren arauak",
-  "account.account_note_header": "Oharra",
  "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
  "account.badges.bot": "Bot-a",
  "account.badges.group": "Taldea",
@ -294,8 +293,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {aipamen} other {aipamen}}",
-  "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
  "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
  "firehose.all": "Guztiak",
  "firehose.local": "Zerbitzari hau",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -11,7 +11,6 @@
  "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": "گروه",
@ -86,6 +85,10 @@
  "announcement.announcement": "اعلامیه",
  "attachments_list.unprocessed": "(پردازش نشده)",
  "audio.hide": "نهفتن صدا",
+  "block_modal.show_less": "نمایش کم‌تر",
+  "block_modal.show_more": "نمایش بیش‌تر",
+  "block_modal.title": "انسداد کاربر؟",
+  "block_modal.you_wont_see_mentions": "فرسته‌هایی که از اون نام برده را نخواهید دید.",
  "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
  "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
  "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@ -160,21 +163,28 @@
  "confirmations.block.confirm": "انسداد",
  "confirmations.delete.confirm": "حذف",
  "confirmations.delete.message": "آیا مطمئنید که می‌خواهید این فرسته را حذف کنید؟",
+  "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": "ویرایش",
  "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
+  "confirmations.edit.title": "رونویسی فرسته؟",
  "confirmations.logout.confirm": "خروج از حساب",
  "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
+  "confirmations.logout.title": "خروج؟",
  "confirmations.mute.confirm": "خموش",
  "confirmations.redraft.confirm": "حذف و بازنویسی",
  "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
+  "confirmations.redraft.title": "حذف و پیش‌نویسی دوبارهٔ فرسته؟",
  "confirmations.reply.confirm": "پاسخ",
  "confirmations.reply.message": "اگر الان پاسخ دهید، چیزی که در حال نوشتنش بودید پاک خواهد شد. می‌خواهید ادامه دهید؟",
+  "confirmations.reply.title": "رونویسی فرسته؟",
  "confirmations.unfollow.confirm": "پی‌نگرفتن",
  "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
+  "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
  "conversation.delete": "حذف گفتگو",
  "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
  "conversation.open": "دیدن گفتگو",
@ -194,6 +204,10 @@
  "dismissable_banner.explore_statuses": "هم‌اکنون این فرسته‌ها از این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
  "dismissable_banner.explore_tags": "هم‌اکنون این برچسب‌ها بین افراد این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
  "dismissable_banner.public_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افرادی روی وب اجتماعیند که اعضای {domain} پی می‌گیرندشان.",
+  "domain_block_modal.block": "انسداد کارساز",
+  "domain_block_modal.title": "انسداد دامنه؟",
+  "domain_pill.server": "کارساز",
+  "domain_pill.username": "نام کاربری",
  "embed.instructions": "جاسازی این فرسته روی پایگاهتان با رونوشت کردن کد زیر.",
  "embed.preview": "این گونه دیده خواهد شد:",
  "emoji_button.activity": "فعالیت",
@ -388,6 +402,8 @@
  "loading_indicator.label": "در حال بارگذاری…",
  "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
  "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
+  "mute_modal.show_options": "نمایش گزینه‌ها",
+  "mute_modal.title": "خموشی کاربر؟",
  "navigation_bar.about": "درباره",
  "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
  "navigation_bar.blocks": "کاربران مسدود شده",
@ -420,15 +436,21 @@
  "notification.follow": "‫{name}‬ پی‌گیرتان شد",
  "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
  "notification.mention": "‫{name}‬ به شما اشاره کرد",
+  "notification.moderation-warning.learn_more": "بیشتر بدانید",
  "notification.own_poll": "نظرسنجیتان پایان یافت",
  "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
+  "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
  "notification.status": "{name} چیزی فرستاد",
  "notification.update": "{name} فرسته‌ای را ویرایش کرد",
+  "notification_requests.accept": "پذیرش",
+  "notification_requests.dismiss": "دورانداختن",
+  "notification_requests.maximize": "بیشنه",
  "notifications.clear": "پاک‌سازی آگاهی‌ها",
  "notifications.clear_confirmation": "مطمئنید می‌خواهید همهٔ آگاهی‌هایتان را برای همیشه پاک کنید؟",
  "notifications.column_settings.admin.report": "گزارش‌های جدید:",
  "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
  "notifications.column_settings.alert": "آگاهی‌های میزکار",
+  "notifications.column_settings.beta.category": "ویژگی‌های آزمایشی",
  "notifications.column_settings.favourite": "برگزیده‌ها:",
  "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
  "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
@ -583,8 +605,11 @@
  "report.unfollow_explanation": "شما این حساب را پی‌گرفته‌اید، برای اینکه دیگر فرسته‌هایش را در خوراک خانه‌تان نبینید؛ آن را پی‌نگیرید.",
  "report_notification.attached_statuses": "{count, plural, one {{count} فرسته} other {{count} فرسته}} پیوست شده",
  "report_notification.categories.legal": "قانونی",
+  "report_notification.categories.legal_sentence": "محتوای غیرقانونی",
  "report_notification.categories.other": "دیگر",
+  "report_notification.categories.other_sentence": "دیگر",
  "report_notification.categories.spam": "هرزنامه",
+  "report_notification.categories.spam_sentence": "هرزنامه",
  "report_notification.categories.violation": "تخطّی از قانون",
  "report_notification.open": "گشودن گزارش",
  "search.no_recent_searches": "جست‌وجوی اخیری نیست",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -3,7 +3,7 @@
  "about.contact": "Yhteydenotto:",
  "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
  "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
-  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
+  "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
  "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
  "about.domain_blocks.silenced.title": "Rajoitettu",
  "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta eikä vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
@ -11,7 +11,7 @@
  "about.not_available": "Näitä tietoja ei ole julkaistu tällä palvelimella.",
  "about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
  "about.rules": "Palvelimen säännöt",
-  "account.account_note_header": "Muistiinpano",
+  "account.account_note_header": "Henkilökohtainen muistiinpano",
  "account.add_or_remove_from_list": "Lisää tai poista listoilta",
  "account.badges.bot": "Botti",
  "account.badges.group": "Ryhmä",
@ -19,7 +19,7 @@
  "account.block_domain": "Estä verkkotunnus {domain}",
  "account.block_short": "Estä",
  "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaile kattavampaa alkuperäprofiilia",
+  "account.browse_more_on_origin_server": "Selaa lisää alkuperäisessä profiilissa",
  "account.cancel_follow_request": "Peruuta seurantapyyntö",
  "account.copy": "Kopioi linkki profiiliin",
  "account.direct": "Mainitse @{name} yksityisesti",
@ -30,7 +30,7 @@
  "account.endorse": "Suosittele profiilissasi",
  "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
  "account.featured_tags.last_status_never": "Ei julkaisuja",
-  "account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
+  "account.featured_tags.title": "Käyttäjän {name} suosittelemat aihetunnisteet",
  "account.follow": "Seuraa",
  "account.follow_back": "Seuraa takaisin",
  "account.followers": "Seuraajat",
@ -68,14 +68,14 @@
  "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
  "account.unblock_short": "Kumoa esto",
  "account.unendorse": "Kumoa suosittelu profiilissasi",
-  "account.unfollow": "Lopeta seuraaminen",
+  "account.unfollow": "Älä seuraa",
  "account.unmute": "Poista käyttäjän @{name} mykistys",
  "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
  "account.unmute_short": "Poista mykistys",
  "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
-  "admin.dashboard.daily_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen päivittäin",
-  "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen kuukausittain",
-  "admin.dashboard.retention.average": "Keskiarvo",
+  "admin.dashboard.daily_retention": "Käyttäjien pysyvyys päivittäin rekisteröitymisen jälkeen",
+  "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys kuukausittain rekisteröitymisen jälkeen",
+  "admin.dashboard.retention.average": "Keskimäärin",
  "admin.dashboard.retention.cohort": "Rekisteröitymis-kk.",
  "admin.dashboard.retention.cohort_size": "Uusia käyttäjiä",
  "admin.impact_report.instance_accounts": "Tilien profiilit, jotka tämä poistaisi",
@ -143,7 +143,7 @@
  "community.column_settings.media_only": "Vain media",
  "community.column_settings.remote_only": "Vain etätilit",
  "compose.language.change": "Vaihda kieli",
-  "compose.language.search": "Hae kieliä...",
+  "compose.language.search": "Hae kieliä…",
  "compose.published.body": "Julkaisu lähetetty.",
  "compose.published.open": "Avaa",
  "compose.saved.body": "Julkaisu tallennettu.",
@ -200,7 +200,7 @@
  "copy_icon_button.copied": "Sisältö kopioitiin leikepöydälle",
  "copypaste.copied": "Kopioitu",
  "copypaste.copy_to_clipboard": "Kopioi leikepöydälle",
-  "directory.federated": "Koko tunnettu fediversumi",
+  "directory.federated": "Tunnetusta fediversumista",
  "directory.local": "Vain palvelimelta {domain}",
  "directory.new_arrivals": "Äskettäin saapuneet",
  "directory.recently_active": "Hiljattain aktiiviset",
@ -211,10 +211,10 @@
  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat korkeammalle sijalle.",
  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat korkeammalle sijalle.",
  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat korkeammalle sijalle.",
-  "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "dismissable_banner.public_timeline": "Nämä ovat tuoreimpia julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
  "domain_block_modal.block": "Estä palvelin",
  "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
-  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Tämän palvelimen käyttäjät eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
  "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
  "domain_block_modal.they_wont_know": "Hän ei saa tietää tulleensa estetyksi.",
  "domain_block_modal.title": "Estetäänkö verkkotunnus?",
@ -228,8 +228,8 @@
  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
  "domain_pill.username": "Käyttäjänimi",
  "domain_pill.whats_in_a_handle": "Mitä käyttäjätunnuksessa on?",
-  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa käyttäjien kanssa kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, käyttäjät voivat olla vaikutuksessa kanssasi kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
  "domain_pill.your_handle": "Käyttäjätunnuksesi:",
  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
@ -246,7 +246,7 @@
  "emoji_button.objects": "Esineet",
  "emoji_button.people": "Ihmiset",
  "emoji_button.recent": "Usein käytetyt",
-  "emoji_button.search": "Hae...",
+  "emoji_button.search": "Hae…",
  "emoji_button.search_results": "Hakutulokset",
  "emoji_button.symbols": "Symbolit",
  "emoji_button.travel": "Matkailu ja paikat",
@ -265,12 +265,12 @@
  "empty_column.follow_requests": "Et ole vielä vastaanottanut seurantapyyntöjä. Saamasi pyynnöt näkyvät täällä.",
  "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
  "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
-  "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
+  "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia käyttäjiä, niin näet enemmän sisältöä.",
  "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
  "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
  "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
  "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
-  "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
+  "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun muut ovat vuorovaikutuksessa kanssasi, näet sen täällä.",
  "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti tai seuraa muiden palvelinten käyttäjiä, niin saat sisältöä",
  "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
  "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
@ -279,7 +279,7 @@
  "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
  "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
  "explore.search_results": "Hakutulokset",
-  "explore.suggested_follows": "Henkilöt",
+  "explore.suggested_follows": "Käyttäjät",
  "explore.title": "Selaa",
  "explore.trending_links": "Uutiset",
  "explore.trending_statuses": "Julkaisut",
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
  "filter_modal.select_filter.title": "Suodata tämä julkaisu",
  "filter_modal.title.status": "Suodata julkaisu",
-  "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
-  "filtered_notifications_banner.pending_requests": "Ilmoituksia {count, plural, =0 {ei ole} one {1 henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {1 käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
  "firehose.all": "Kaikki",
  "firehose.local": "Tämä palvelin",
@ -312,9 +311,9 @@
  "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
  "follow_suggestions.dismiss": "Älä näytä uudelleen",
  "follow_suggestions.featured_longer": "Palvelimen {domain} tiimin poimintoja",
-  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
+  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi käyttäjien joukossa",
  "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
-  "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
+  "follow_suggestions.hints.friends_of_friends": "Tämä profiili on suosittu seuraamiesi käyttäjien joukossa.",
  "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
  "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
  "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
@ -367,7 +366,7 @@
  "interaction_modal.on_another_server": "Toisella palvelimella",
  "interaction_modal.on_this_server": "Tällä palvelimella",
  "interaction_modal.sign_in": "Et ole kirjautunut tälle palvelimelle. Millä palvelimella tilisi sijaitsee?",
-  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit myös syöttää koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
+  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit syöttää myös koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
  "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
  "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
  "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
@ -382,7 +381,7 @@
  "keyboard_shortcuts.compose": "Kohdista kirjoituskenttään",
  "keyboard_shortcuts.description": "Kuvaus",
  "keyboard_shortcuts.direct": "Avaa yksityismainintojen sarake",
-  "keyboard_shortcuts.down": "Siirry listassa alaspäin",
+  "keyboard_shortcuts.down": "Siirry luettelossa eteenpäin",
  "keyboard_shortcuts.enter": "Avaa julkaisu",
  "keyboard_shortcuts.favourite": "Lisää julkaisu suosikkeihin",
  "keyboard_shortcuts.favourites": "Avaa suosikkiluettelo",
@ -402,13 +401,13 @@
  "keyboard_shortcuts.reply": "Vastaa julkaisuun",
  "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
  "keyboard_shortcuts.search": "Kohdista hakukenttään",
-  "keyboard_shortcuts.spoilers": "Näytä/piilota sisältövaroituskenttä",
+  "keyboard_shortcuts.spoilers": "Näytä tai piilota sisältövaroituskenttä",
  "keyboard_shortcuts.start": "Avaa Näin pääset alkuun -sarake",
-  "keyboard_shortcuts.toggle_hidden": "Näytä/piilota sisältövaroituksella merkitty teksti",
-  "keyboard_shortcuts.toggle_sensitivity": "Näytä/piilota media",
+  "keyboard_shortcuts.toggle_hidden": "Näytä tai piilota sisältövaroituksella merkitty teksti",
+  "keyboard_shortcuts.toggle_sensitivity": "Näytä tai piilota media",
  "keyboard_shortcuts.toot": "Luo uusi julkaisu",
-  "keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä",
-  "keyboard_shortcuts.up": "Siirry listassa ylöspäin",
+  "keyboard_shortcuts.unfocus": "Poistu kirjoitus- tai hakukentästä",
+  "keyboard_shortcuts.up": "Siirry luettelossa taaksepäin",
  "lightbox.close": "Sulje",
  "lightbox.compress": "Tiivis kuvankatselunäkymä",
  "lightbox.expand": "Laajennettu kuvankatselunäkymä",
@ -416,7 +415,7 @@
  "lightbox.previous": "Edellinen",
  "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": "Julkaissut {name}",
+  "link_preview.author": "Tehnyt {name}",
  "link_preview.more_from_author": "Lisää tekijältä {name}",
  "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
  "lists.account.add": "Lisää listalle",
@ -431,7 +430,7 @@
  "lists.replies_policy.list": "Listan jäsenille",
  "lists.replies_policy.none": "Ei kellekään",
  "lists.replies_policy.title": "Näytä vastaukset:",
-  "lists.search": "Hae seuraamistasi henkilöistä",
+  "lists.search": "Hae seuraamistasi käyttäjistä",
  "lists.subheading": "Omat listasi",
  "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
  "loading_indicator.label": "Ladataan…",
@ -454,7 +453,7 @@
  "navigation_bar.bookmarks": "Kirjanmerkit",
  "navigation_bar.community_timeline": "Paikallinen aikajana",
  "navigation_bar.compose": "Luo uusi julkaisu",
-  "navigation_bar.direct": "Yksityiset maininnat",
+  "navigation_bar.direct": "Yksityismaininnat",
  "navigation_bar.discover": "Löydä uutta",
  "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
  "navigation_bar.explore": "Selaa",
@ -501,11 +500,13 @@
  "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
  "notification.relationships_severance_event.learn_more": "Lue lisää",
-  "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt verkkotunnuksen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
  "notification.status": "{name} julkaisi juuri",
  "notification.update": "{name} muokkasi julkaisua",
  "notification_requests.accept": "Hyväksy",
  "notification_requests.dismiss": "Hylkää",
+  "notification_requests.maximize": "Suurenna",
+  "notification_requests.minimize_banner": "Pienennä suodatettujen ilmoitusten palkki",
  "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
  "notification_requests.title": "Suodatetut ilmoitukset",
  "notifications.clear": "Tyhjennä ilmoitukset",
@ -534,22 +535,24 @@
  "notifications.filter.all": "Kaikki",
  "notifications.filter.boosts": "Tehostukset",
  "notifications.filter.favourites": "Suosikit",
-  "notifications.filter.follows": "Seuraa",
+  "notifications.filter.follows": "Seuraamiset",
  "notifications.filter.mentions": "Maininnat",
  "notifications.filter.polls": "Äänestyksen tulokset",
-  "notifications.filter.statuses": "Päivitykset henkilöiltä, joita seuraat",
+  "notifications.filter.statuses": "Päivitykset seuraamiltasi käyttäjiltä",
  "notifications.grant_permission": "Myönnä käyttöoikeus.",
  "notifications.group": "{count} ilmoitusta",
  "notifications.mark_as_read": "Merkitse jokainen ilmoitus luetuksi",
  "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
  "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin evätty",
  "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa käyttöoikeutta ei ole myönnetty.",
+  "notifications.policy.filter_limited_accounts_hint": "Palvelimen moderaattorien rajoittamat",
+  "notifications.policy.filter_limited_accounts_title": "Moderoidut tilit",
  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
  "notifications.policy.filter_new_accounts_title": "Uudet tilit",
  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
-  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_followers_title": "Käyttäjät, jotka eivät seuraa sinua",
  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt heidät manuaalisesti",
-  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_not_following_title": "Käyttäjät, joita et seuraa",
  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se ole vastaus omaan mainintaasi tai ellet seuraa lähettäjää",
  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
@ -582,7 +585,7 @@
  "onboarding.start.lead": "Uusi Mastodon-tilisi on nyt valmiina käyttöön. Kyseessä on ainutlaatuinen, hajautettu sosiaalisen median alusta, jolla sinä itse – algoritmin sijaan – määrität käyttökokemuksesi. Näin hyödyt Mastodonista eniten:",
  "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
  "onboarding.start.title": "Olet tehnyt sen!",
-  "onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
+  "onboarding.steps.follow_people.body": "Mastodonissa on kyse kiinnostavien käyttäjien seuraamisesta.",
  "onboarding.steps.follow_people.title": "Mukauta kotisyötettäsi",
  "onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
  "onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
@ -597,10 +600,10 @@
  "password_confirmation.exceeds_maxlength": "Salasanan vahvistus ylittää salasanan enimmäispituuden",
  "password_confirmation.mismatching": "Salasanan vahvistus ei täsmää",
  "picture_in_picture.restore": "Laita se takaisin",
-  "poll.closed": "Suljettu",
+  "poll.closed": "Päättynyt",
  "poll.refresh": "Päivitä",
  "poll.reveal": "Näytä tulokset",
-  "poll.total_people": "{count, plural, one {# henkilö} other {# henkilöä}}",
+  "poll.total_people": "{count, plural, one {# käyttäjä} other {# käyttäjää}}",
  "poll.total_votes": "{count, plural, one {# ääni} other {# ääntä}}",
  "poll.vote": "Äänestä",
  "poll.voted": "Äänestit tätä vastausta",
@ -609,7 +612,7 @@
  "poll_button.remove_poll": "Poista äänestys",
  "privacy.change": "Muuta julkaisun näkyvyyttä",
  "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
-  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.direct.short": "Tietyt käyttäjät",
  "privacy.private.long": "Vain seuraajasi",
  "privacy.private.short": "Seuraajat",
  "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
@ -619,7 +622,7 @@
  "privacy.unlisted.short": "Vaivihkaisesti julkinen",
  "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
  "privacy_policy.title": "Tietosuojakäytäntö",
-  "recommended": "Suositeltu",
+  "recommended": "Suositellaan",
  "refresh": "Päivitä",
  "regeneration_indicator.label": "Ladataan…",
  "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
@ -731,7 +734,7 @@
  "status.delete": "Poista",
  "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
  "status.direct": "Mainitse @{name} yksityisesti",
-  "status.direct_indicator": "Yksityinen maininta",
+  "status.direct_indicator": "Yksityismaininta",
  "status.edit": "Muokkaa",
  "status.edited": "Viimeksi muokattu {date}",
  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
@ -782,7 +785,7 @@
  "status.unpin": "Irrota profiilista",
  "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
  "subscribed_languages.save": "Tallenna muutokset",
-  "subscribed_languages.target": "Vaihda tilatut kielet {target}",
+  "subscribed_languages.target": "Vaihda tilattuja kieliä käyttäjältä {target}",
  "tabs_bar.home": "Koti",
  "tabs_bar.notifications": "Ilmoitukset",
  "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
@ -790,11 +793,11 @@
  "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
  "time_remaining.moments": "Hetkiä jäljellä",
  "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource}-tietoa ei näytetä täällä.",
-  "timeline_hint.resources.followers": "Seuraajat",
-  "timeline_hint.resources.follows": "seurattua",
-  "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
+  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource} eivät näy tässä.",
+  "timeline_hint.resources.followers": "seuraajat",
+  "timeline_hint.resources.follows": "seuratut",
+  "timeline_hint.resources.statuses": "vanhemmat julkaisut",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
  "trends.trending_now": "Suosittua nyt",
  "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
  "units.short.billion": "{count} mrd.",
@ -819,7 +822,7 @@
  "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
  "upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
  "upload_modal.preview_label": "Esikatselu ({ratio})",
-  "upload_progress.label": "Lähetetään...",
+  "upload_progress.label": "Lähetetään…",
  "upload_progress.processing": "Käsitellään…",
  "username.taken": "Tämä käyttäjänimi on jo käytössä. Kokeile toista",
  "video.close": "Sulje video",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@ -6,7 +6,6 @@
  "about.domain_blocks.silenced.title": "Limitado",
  "about.domain_blocks.suspended.title": "Suspendido",
  "about.rules": "Mga alituntunin ng server",
-  "account.account_note_header": "Tala",
  "account.add_or_remove_from_list": "I-dagdag o tanggalin mula sa mga listahan",
  "account.badges.bot": "Pakusa",
  "account.badges.group": "Pangkat",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -11,7 +11,7 @@
  "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
  "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
  "about.rules": "Ambætarareglur",
-  "account.account_note_header": "Viðmerking",
+  "account.account_note_header": "Persónlig viðmerking",
  "account.add_or_remove_from_list": "Legg afturat ella tak av listum",
  "account.badges.bot": "Bottur",
  "account.badges.group": "Bólkur",
@ -72,7 +72,7 @@
  "account.unmute": "Doyv ikki @{name}",
  "account.unmute_notifications_short": "Tendra fráboðanir",
  "account.unmute_short": "Doyv ikki",
-  "account_note.placeholder": "Klikka fyri at leggja notu afturat",
+  "account_note.placeholder": "Klikka fyri at leggja viðmerking afturat",
  "admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
  "admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
  "admin.dashboard.retention.average": "Miðal",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {umrøða} other {umrøður}}",
-  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
+  "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
  "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
  "firehose.all": "Allar",
  "firehose.local": "Hesin ambætarin",
@ -506,6 +505,7 @@
  "notification.update": "{name} rættaði ein post",
  "notification_requests.accept": "Góðtak",
  "notification_requests.dismiss": "Avvís",
+  "notification_requests.maximize": "Mesta",
  "notification_requests.notifications_from": "Fráboðanir frá {name}",
  "notification_requests.title": "Sáldaðar fráboðanir",
  "notifications.clear": "Rudda fráboðanir",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@ -11,7 +11,6 @@
  "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
  "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
  "about.rules": "Règles du serveur",
-  "account.account_note_header": "Note",
  "account.add_or_remove_from_list": "Ajouter ou enlever de listes",
  "account.badges.bot": "Bot",
  "account.badges.group": "Groupe",
@ -297,7 +296,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",
-  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
  "filtered_notifications_banner.title": "Notifications filtrées",
  "firehose.all": "Tout",
  "firehose.local": "Ce serveur",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -11,7 +11,6 @@
  "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
  "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
  "about.rules": "Règles du serveur",
-  "account.account_note_header": "Note",
  "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
  "account.badges.bot": "Bot",
  "account.badges.group": "Groupe",
@ -297,7 +296,6 @@
  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
  "filter_modal.select_filter.title": "Filtrer ce message",
  "filter_modal.title.status": "Filtrer un message",
-  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
  "filtered_notifications_banner.title": "Notifications filtrées",
  "firehose.all": "Tout",
  "firehose.local": "Ce serveur",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@ -11,7 +11,6 @@
  "about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.",
  "about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}",
  "about.rules": "Serverrigels",
-  "account.account_note_header": "Opmerking",
  "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
  "account.badges.bot": "Automatisearre",
  "account.badges.group": "Groep",
@ -290,8 +289,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {fermelding} other {fermeldingen}}",
-  "filtered_notifications_banner.pending_requests": "Meldingen fan {count, plural, =0 {net ien} one {ien persoan} other {# minsken}} dy’t jo miskien kenne",
  "filtered_notifications_banner.title": "Filtere meldingen",
  "firehose.all": "Alles",
  "firehose.local": "Dizze server",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -11,7 +11,6 @@
  "about.not_available": "Níor cuireadh an t-eolas seo ar fáil ar an bhfreastalaí seo.",
  "about.powered_by": "Meáin shóisialta díláraithe faoi chumhacht {mastodon}",
  "about.rules": "Rialacha an fhreastalaí",
-  "account.account_note_header": "Nóta",
  "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
  "account.badges.bot": "Bota",
  "account.badges.group": "Grúpa",
@ -300,8 +299,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {tagairt} other {tagairtí}}",
-  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
+  "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",
  "firehose.local": "An freastalaí seo",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -11,7 +11,7 @@
  "about.not_available": "Cha deach am fiosrachadh seo a sholar air an fhrithealaiche seo.",
  "about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
  "about.rules": "Riaghailtean an fhrithealaiche",
-  "account.account_note_header": "Nòta",
+  "account.account_note_header": "Nòta pearsanta",
  "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
  "account.badges.bot": "Fèin-obrachail",
  "account.badges.group": "Buidheann",
@ -35,7 +35,9 @@
  "account.follow_back": "Lean air ais",
  "account.followers": "Luchd-leantainn",
  "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
+  "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} other {{counter} luchd-leantainn}}",
  "account.following": "A’ leantainn",
+  "account.following_counter": "{count, plural, one {Tha {counter} a’ leantainn} other {Tha {counter} a’ leantainn}}",
  "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn neach sam bith fhathast.",
  "account.go_to_profile": "Tadhail air a’ phròifil",
  "account.hide_reblogs": "Falaich na brosnachaidhean o @{name}",
@ -61,6 +63,7 @@
  "account.requested_follow": "Dh’iarr {name} ’gad leantainn",
  "account.share": "Co-roinn a’ phròifil aig @{name}",
  "account.show_reblogs": "Seall na brosnachaidhean o @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
  "account.unblock": "Dì-bhac @{name}",
  "account.unblock_domain": "Dì-bhac an àrainn {domain}",
  "account.unblock_short": "Dì-bhac",
@ -168,21 +171,28 @@
  "confirmations.block.confirm": "Bac",
  "confirmations.delete.confirm": "Sguab às",
  "confirmations.delete.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?",
+  "confirmations.delete.title": "A bheil thu airson am post a sguabadh às?",
  "confirmations.delete_list.confirm": "Sguab às",
  "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
+  "confirmations.delete_list.title": "A bheil thu airson an liosta a sguabadh às?",
  "confirmations.discard_edit_media.confirm": "Tilg air falbh",
  "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
  "confirmations.edit.confirm": "Deasaich",
  "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "confirmations.edit.title": "A bheil thu airson sgrìobhadh thairis air a’ phost?",
  "confirmations.logout.confirm": "Clàraich a-mach",
  "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
+  "confirmations.logout.title": "A bheil thu airson clàradh a-mach?",
  "confirmations.mute.confirm": "Mùch",
  "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
  "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
+  "confirmations.redraft.title": "A bheil thu airson am post a sguabadh às ⁊ dreachd ùr a dhèanamh dheth?",
  "confirmations.reply.confirm": "Freagair",
  "confirmations.reply.message": "Ma bheir thu freagairt an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
+  "confirmations.reply.title": "A bheil thu airson sgrìobhadh thairis air a’ phost?",
  "confirmations.unfollow.confirm": "Na lean tuilleadh",
  "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
+  "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
  "conversation.delete": "Sguab às an còmhradh",
  "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
  "conversation.open": "Seall an còmhradh",
@ -290,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+  "filtered_notifications_banner.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",
  "firehose.local": "Am frithealaiche seo",
@ -301,6 +310,7 @@
  "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
  "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
  "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.featured_longer": "Chaidh a thaghadh a làmh leis an sgioba aig {domain}",
  "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
  "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
  "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
@ -310,6 +320,7 @@
  "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
  "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
  "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Tha e coltach ri pròifilean a lean thu o chionn goirid",
  "follow_suggestions.view_all": "Seall na h-uile",
  "follow_suggestions.who_to_follow": "Molaidhean leantainn",
  "followed_tags": "Tagaichean hais ’gan leantainn",
@ -405,6 +416,8 @@
  "limited_account_hint.action": "Seall a’ phròifil co-dhiù",
  "limited_account_hint.title": "Chaidh a’ phròifil seo fhalach le maoir {domain}.",
  "link_preview.author": "Le {name}",
+  "link_preview.more_from_author": "Barrachd le {name}",
+  "link_preview.shares": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
  "lists.account.add": "Cuir ris an liosta",
  "lists.account.remove": "Thoir air falbh on liosta",
  "lists.delete": "Sguab às an liosta",
@ -432,6 +445,8 @@
  "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
  "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
  "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
+  "name_and_others": "{name} ’s {count, plural, one {# eile} other {# eile}}",
+  "name_and_others_with_link": "{name} ’s <a>{count, plural, one {# eile} other {# eile}}</a>",
  "navigation_bar.about": "Mu dhèidhinn",
  "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
  "navigation_bar.blocks": "Cleachdaichean bacte",
@ -459,13 +474,27 @@
  "navigation_bar.security": "Tèarainteachd",
  "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
  "notification.admin.report": "Rinn {name} gearan mu {target}",
+  "notification.admin.report_account": "Rinn {name} gearan mu {count, plural, one {# phost} two {# phost} few {# postaichean} other {# post}} le {target} air adhbhar {category}",
+  "notification.admin.report_account_other": "Rinn {name} gearan mu {count, plural, one {# phost} two {# phost} few {# postaichean} other {# post}} le {target}",
+  "notification.admin.report_statuses": "Rinn {name} gearan mu {target} air adhbhar {category}",
+  "notification.admin.report_statuses_other": "Rinn {name} gearan mu {target}",
  "notification.admin.sign_up": "Chlàraich {name}",
  "notification.favourite": "Is annsa le {name} am post agad",
  "notification.follow": "Tha {name} ’gad leantainn a-nis",
  "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
  "notification.mention": "Thug {name} iomradh ort",
  "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
+  "notification.moderation_warning": "Fhuair thu rabhadh on mhaorsainneachd",
+  "notification.moderation_warning.action_delete_statuses": "Chaidh cuid dhe na postaichean agad a thoirt air falbh.",
+  "notification.moderation_warning.action_disable": "Chaidh an cunntas agad a chur à comas.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Chaidh comharra a chur ri cuid dhe na postaichean agad gu bheil iad frionasach.",
+  "notification.moderation_warning.action_none": "Fhuair an cunntas agad rabhadh on mhaorsainneachd.",
+  "notification.moderation_warning.action_sensitive": "Thèid comharra na frionasachd a chur ris na postaichean agad o seo a-mach.",
+  "notification.moderation_warning.action_silence": "Chaidh an cunntas agad a chuingeachadh.",
+  "notification.moderation_warning.action_suspend": "Chaidh an cunntas agad a chur à rèim.",
  "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
+  "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
+  "notification.private_mention": "Thug {name} iomradh ort gu prìobhaideach",
  "notification.reblog": "Bhrosnaich {name} am post agad",
  "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
  "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
@ -476,13 +505,18 @@
  "notification.update": "Dheasaich {name} post",
  "notification_requests.accept": "Gabh ris",
  "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.maximize": "Làn-mheudaich",
+  "notification_requests.minimize_banner": "Fìor-lùghdaich bratach nam brathan criathraichte",
  "notification_requests.notifications_from": "Brathan o {name}",
  "notification_requests.title": "Brathan criathraichte",
  "notifications.clear": "Falamhaich na brathan",
  "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
+  "notifications.clear_title": "A bheil thu airson na brathan fhalamhachadh?",
  "notifications.column_settings.admin.report": "Gearanan ùra:",
  "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
  "notifications.column_settings.alert": "Brathan deasga",
+  "notifications.column_settings.beta.category": "Gleusan deuchainneil",
+  "notifications.column_settings.beta.grouping": "Buidhnich na brathan",
  "notifications.column_settings.favourite": "Annsachdan:",
  "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
  "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
@ -646,9 +680,13 @@
  "report.unfollow_explanation": "Tha thu a’ leantainn a’ chunntais seo. Sgur dhen leantainn ach nach fhaic thu na puist aca nad dhachaigh.",
  "report_notification.attached_statuses": "Tha {count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}} ceangailte ris",
  "report_notification.categories.legal": "Laghail",
+  "report_notification.categories.legal_sentence": "susbaint mhì-laghail",
  "report_notification.categories.other": "Eile",
+  "report_notification.categories.other_sentence": "eile",
  "report_notification.categories.spam": "Spama",
+  "report_notification.categories.spam_sentence": "spama",
  "report_notification.categories.violation": "Briseadh riaghailte",
+  "report_notification.categories.violation_sentence": "briseadh riaghailte",
  "report_notification.open": "Fosgail an gearan",
  "search.no_recent_searches": "Cha do rinn thu lorg o chionn goirid",
  "search.placeholder": "Lorg",
@ -676,8 +714,11 @@
  "server_banner.about_active_users": "Daoine a chleachd am frithealaiche seo rè an 30 latha mu dheireadh (Cleachdaichean gnìomhach gach mìos)",
  "server_banner.active_users": "cleachdaichean gnìomhach",
  "server_banner.administered_by": "Rianachd le:",
+  "server_banner.is_one_of_many": "Is {domain} fear de dh’iomadh frithealaiche Mastodon neo-eisimeileach as urrainn dhut cleachdadh airson pàirt a ghabhail sa cho-shaoghal.",
  "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:",
  "sign_in_banner.create_account": "Cruthaich cunntas",
+  "sign_in_banner.follow_anyone": "Lean duine sam bith air a’ cho-shaoghal agus faic a h-uile càil a-rèir an ama. Chan eil sgeul air algairimean, sanasachd no clickbait.",
+  "sign_in_banner.mastodon_is": "Is Mastodon an dòigh as fheàrr airson sùil a chumail air na tha a’ dol.",
  "sign_in_banner.sign_in": "Clàraich a-steach",
  "sign_in_banner.sso_redirect": "Clàraich a-steach no clàraich leinn",
  "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -11,7 +11,7 @@
  "about.not_available": "Esta información non está dispoñible neste servidor.",
  "about.powered_by": "Comunicación social descentralizada grazas a {mastodon}",
  "about.rules": "Regras do servidor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota persoal",
  "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
  "account.badges.bot": "Automatizada",
  "account.badges.group": "Grupo",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {mencións}}",
-  "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.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",
  "firehose.local": "Este servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} editou unha publicación",
  "notification_requests.accept": "Aceptar",
  "notification_requests.dismiss": "Desbotar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar o anuncio de notificacións filtradas",
  "notification_requests.notifications_from": "Notificacións de {name}",
  "notification_requests.title": "Notificacións filtradas",
  "notifications.clear": "Limpar notificacións",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -11,7 +11,7 @@
  "about.not_available": "המידע אינו זמין על שרת זה.",
  "about.powered_by": "רשת חברתית מבוזרת המופעלת על ידי {mastodon}",
  "about.rules": "כללי השרת",
-  "account.account_note_header": "הערה",
+  "account.account_note_header": "הערה אישית",
  "account.add_or_remove_from_list": "הוספה או הסרה מרשימות",
  "account.badges.bot": "בוט",
  "account.badges.group": "קבוצה",
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
  "filter_modal.select_filter.title": "סינון ההודעה הזו",
  "filter_modal.title.status": "סנן הודעה",
-  "filtered_notifications_banner.mentions": "{count, plural, one {איזכור} other {איזכורים} two {איזכוריים}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
  "filtered_notifications_banner.title": "התראות מסוננות",
  "firehose.all": "הכל",
  "firehose.local": "שרת זה",
@ -506,6 +505,8 @@
  "notification.update": "{name} ערכו הודעה",
  "notification_requests.accept": "לקבל",
  "notification_requests.dismiss": "לבטל",
+  "notification_requests.maximize": "הגדלה למקסימום",
+  "notification_requests.minimize_banner": "להקטין את כותרת ההודעות המפולטרות",
  "notification_requests.notifications_from": "התראות מ־ {name}",
  "notification_requests.title": "התראות מסוננות",
  "notifications.clear": "הסרת התראות",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@ -11,7 +11,6 @@
  "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": "समूह",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -11,7 +11,6 @@
  "about.not_available": "Te informacije nisu dostupne na ovom poslužitelju.",
  "about.powered_by": "Decentralizirani društveni mediji koje pokreće {mastodon}",
  "about.rules": "Pravila servera",
-  "account.account_note_header": "Bilješka",
  "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grupa",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -11,7 +11,7 @@
  "about.not_available": "Ez az információ nem lett közzétéve ezen a kiszolgálón.",
  "about.powered_by": "Decentralizált közösségi média a {mastodon} segítségével",
  "about.rules": "Kiszolgáló szabályai",
-  "account.account_note_header": "Feljegyzés",
+  "account.account_note_header": "Személyes megjegyzés",
  "account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listákról",
  "account.badges.bot": "Automatizált",
  "account.badges.group": "Csoport",
@ -160,7 +160,7 @@
  "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
  "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
  "compose_form.poll.type": "Stílus",
-  "compose_form.publish": "Bejegyzés",
+  "compose_form.publish": "Közzététel",
  "compose_form.publish_form": "Új bejegyzés",
  "compose_form.reply": "Válasz",
  "compose_form.save_changes": "Frissítés",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {említés} other {említés}}",
-  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
+  "filtered_notifications_banner.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",
  "firehose.local": "Ez a kiszolgáló",
@ -506,6 +505,8 @@
  "notification.update": "{name} szerkesztett egy bejegyzést",
  "notification_requests.accept": "Elfogadás",
  "notification_requests.dismiss": "Elvetés",
+  "notification_requests.maximize": "Maximalizálás",
+  "notification_requests.minimize_banner": "Szűrt értesítések sávjának minimalizálása",
  "notification_requests.notifications_from": "{name} értesítései",
  "notification_requests.title": "Szűrt értesítések",
  "notifications.clear": "Értesítések törlése",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -7,7 +7,6 @@
  "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": "Խումբ",
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@ -11,7 +11,7 @@
  "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
  "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
  "about.rules": "Regulas del servitor",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Nota personal",
  "account.add_or_remove_from_list": "Adder a, o remover de listas",
  "account.badges.bot": "Automatisate",
  "account.badges.group": "Gruppo",
@ -298,8 +298,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
-  "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
  "filtered_notifications_banner.title": "Notificationes filtrate",
  "firehose.all": "Toto",
  "firehose.local": "Iste servitor",
@ -672,8 +670,11 @@
  "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
  "report_notification.categories.legal": "Juridic",
  "report_notification.categories.other": "Alteres",
+  "report_notification.categories.other_sentence": "alteres",
  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
  "report_notification.categories.violation": "Violation del regulas",
+  "report_notification.categories.violation_sentence": "violation del regulas",
  "report_notification.open": "Aperir reporto",
  "search.no_recent_searches": "Nulle recercas recente",
  "search.placeholder": "Cercar",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -11,7 +11,6 @@
  "about.not_available": "Informasi ini belum tersedia di server ini.",
  "about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
  "about.rules": "Aturan server",
-  "account.account_note_header": "Catatan",
  "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grup",
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@ -11,7 +11,6 @@
  "about.not_available": "On ne ha disponibilisat ti-ci information sur ti-ci servitor.",
  "about.powered_by": "Decentralisat social medie disponibilisat de {mastodon}",
  "about.rules": "Regules del servitor",
-  "account.account_note_header": "Nota",
  "account.add_or_remove_from_list": "Adjunter o remover de listes",
  "account.badges.bot": "Automatisat",
  "account.badges.group": "Gruppe",
@ -290,8 +289,6 @@
  "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
  "filter_modal.select_filter.title": "Filtrar ti-ci posta",
  "filter_modal.title.status": "Filtrar un posta",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
-  "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
  "filtered_notifications_banner.title": "Filtrat notificationes",
  "firehose.all": "Omno",
  "firehose.local": "Ti-ci servitor",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -10,7 +10,6 @@
  "about.not_available": "Ca informo ne igesis che ca servilo.",
  "about.powered_by": "Necentraligita sociala ret quo povigesas da {mastodon}",
  "about.rules": "Servilreguli",
-  "account.account_note_header": "Noto",
  "account.add_or_remove_from_list": "Insertez o removez de listi",
  "account.badges.bot": "Boto",
  "account.badges.group": "Grupo",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -11,7 +11,7 @@
  "about.not_available": "Þessar upplýsingar hafa ekki verið gerðar aðgengilegar á þessum netþjóni.",
  "about.powered_by": "Dreifhýstur samskiptamiðill keyrður með {mastodon}",
  "about.rules": "Reglur netþjónsins",
-  "account.account_note_header": "Minnispunktur",
+  "account.account_note_header": "Einkaminnispunktur",
  "account.add_or_remove_from_list": "Bæta við eða fjarlægja af listum",
  "account.badges.bot": "Yrki",
  "account.badges.group": "Hópur",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {tilvísun} other {tilvísanir}}",
-  "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.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",
  "firehose.local": "þessum netþjóni",
@ -506,6 +505,8 @@
  "notification.update": "{name} breytti færslu",
  "notification_requests.accept": "Samþykkja",
  "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.maximize": "Hámarka",
+  "notification_requests.minimize_banner": "Minnka borða með síuðum tilkynningum",
  "notification_requests.notifications_from": "Tilkynningar frá {name}",
  "notification_requests.title": "Síaðar tilkynningar",
  "notifications.clear": "Hreinsa tilkynningar",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -11,7 +11,7 @@
  "about.not_available": "Queste informazioni non sono state rese disponibili su questo server.",
  "about.powered_by": "Social media decentralizzato alimentato da {mastodon}",
  "about.rules": "Regole del server",
-  "account.account_note_header": "Nota",
+  "account.account_note_header": "Note personali",
  "account.add_or_remove_from_list": "Aggiungi o Rimuovi dalle liste",
  "account.badges.bot": "Bot",
  "account.badges.group": "Gruppo",
@ -300,8 +300,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",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menzione} other {menzioni}}",
-  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
  "filtered_notifications_banner.title": "Notifiche filtrate",
  "firehose.all": "Tutto",
  "firehose.local": "Questo server",
@ -506,6 +505,8 @@
  "notification.update": "{name} ha modificato un post",
  "notification_requests.accept": "Accetta",
  "notification_requests.dismiss": "Ignora",
+  "notification_requests.maximize": "Ingrandisci",
+  "notification_requests.minimize_banner": "Minimizza il banner delle notifiche filtrate",
  "notification_requests.notifications_from": "Notifiche da {name}",
  "notification_requests.title": "Notifiche filtrate",
  "notifications.clear": "Cancella le notifiche",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -11,7 +11,6 @@
  "about.not_available": "この情報はこのサーバーでは利用できません。",
  "about.powered_by": "{mastodon}による分散型ソーシャルメディア",
  "about.rules": "サーバーのルール",
-  "account.account_note_header": "メモ",
  "account.add_or_remove_from_list": "リストから追加または外す",
  "account.badges.bot": "Bot",
  "account.badges.group": "Group",
@ -293,8 +292,7 @@
  "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
  "filter_modal.select_filter.title": "この投稿をフィルターする",
  "filter_modal.title.status": "投稿をフィルターする",
-  "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
-  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
+  "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
  "filtered_notifications_banner.title": "保留中の通知",
  "firehose.all": "すべて",
  "firehose.local": "このサーバー",
@ -491,6 +489,7 @@
  "notification.update": "{name}さんが投稿を編集しました",
  "notification_requests.accept": "受け入れる",
  "notification_requests.dismiss": "無視",
+  "notification_requests.minimize_banner": "「保留中の通知」のバナーを最小化する",
  "notification_requests.notifications_from": "{name}からの通知",
  "notification_requests.title": "保留中の通知",
  "notifications.clear": "通知を消去",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@ -1,7 +1,6 @@
 {
  "about.contact": "კონტაქტი:",
  "about.domain_blocks.no_reason_available": "მიზეზი მიუწვდომელია",
-  "account.account_note_header": "ჩანაწერი",
  "account.add_or_remove_from_list": "სიებში დამატება ან წაშლა",
  "account.badges.bot": "ბოტი",
  "account.badges.group": "ჯგუფი",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -8,7 +8,6 @@
  "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
  "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
  "about.rules": "Ilugan n uqeddac",
-  "account.account_note_header": "Tazmilt",
  "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
  "account.badges.bot": "Aṛubut",
  "account.badges.group": "Agraw",
@ -76,14 +75,16 @@
  "block_modal.show_less": "Ssken-d drus",
  "block_modal.show_more": "Ssken-d ugar",
  "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
-  "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+  "block_modal.they_cant_see_posts": "Ur yezmir ad wali tisuffaɣ-ik·im, ur tettwaliḍ tidak-is.",
  "block_modal.title": "Sewḥel aseqdac ?",
+  "block_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
  "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
  "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
  "bundle_column_error.error.title": "Uh, ala !",
  "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
  "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
  "bundle_column_error.return": "Uɣal ɣer ugejdan",
+  "bundle_column_error.routing.body": "Asebter i d-yettwasutren ur yettwaf ara. Tetḥeqqeḍ belli tansa URL deg ufeggag n tansa tṣeḥḥa?",
  "bundle_column_error.routing.title": "404",
  "bundle_modal_error.close": "Mdel",
  "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
@ -143,20 +144,22 @@
  "confirmations.block.confirm": "Sewḥel",
  "confirmations.delete.confirm": "Kkes",
  "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
+  "confirmations.delete.title": "Tukksa n tasuffeɣt?",
  "confirmations.delete_list.confirm": "Kkes",
  "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
+  "confirmations.delete_list.title": "Tukksa n tebdart?",
  "confirmations.discard_edit_media.confirm": "Sefsex",
  "confirmations.edit.confirm": "Ẓreg",
  "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
  "confirmations.logout.confirm": "Ffeɣ",
  "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
  "confirmations.mute.confirm": "Sgugem",
-  "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
+  "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
  "confirmations.reply.confirm": "Err",
  "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
  "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
  "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
-  "conversation.delete": "Sfeḍ adiwenni",
+  "conversation.delete": "Kkes adiwenni",
  "conversation.mark_as_read": "Creḍ yettwaɣṛa",
  "conversation.open": "Ssken adiwenni",
  "conversation.with": "Akked {names}",
@ -174,7 +177,9 @@
  "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
  "domain_block_modal.block": "Sewḥel aqeddac",
  "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_block_modal.they_wont_know": "Ur-d yettawi ara s lexbaṛ belli yettuseḥbes.",
  "domain_block_modal.title": "Sewḥel taɣult?",
+  "domain_block_modal.you_wont_see_posts": "Ur tettuɣaleḍ ara ttwaliḍ tisuffaɣ neɣ ulɣuten n iseqdacen n uqeddac-a.",
  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
  "domain_pill.server": "Aqeddac",
  "domain_pill.username": "Isem n useqdac",
@ -346,9 +351,15 @@
  "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
  "loading_indicator.label": "Yessalay-d …",
  "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
+  "mute_modal.hide_from_notifications": "Ffer-it deg ulɣuten",
  "mute_modal.hide_options": "Ffer tinefrunin",
+  "mute_modal.indefinite": "Alamma ssnesreɣ asgugem fell-as",
  "mute_modal.show_options": "Sken-d tinefrunin",
-  "mute_modal.title": "Sgugem aseqdac?",
+  "mute_modal.they_can_mention_and_follow": "Yezmer ad k·m-id-yebder, ad k·m-yeḍfer, maca ur t-tettwaliḍt ara.",
+  "mute_modal.they_wont_know": "Ur yezmir ara ad iẓer dakken tesgugmeṭ.",
+  "mute_modal.title": "Asgugem n useqdac?",
+  "mute_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
+  "mute_modal.you_wont_see_posts": "Yezmer ad yettwali tisuffaɣ-ik·im, maca ur tettwaliḍ ara tidak-is.",
  "navigation_bar.about": "Ɣef",
  "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
  "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@ -11,7 +11,6 @@
  "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": "Топ",
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@ -4,7 +4,6 @@
  "about.disclaimer": "ಮಾಸ್ಟೋಡಾನ್ ಇದು ಉಚಿತ, ಮುಕ್ತ ತಂತ್ರಾಂಶ ಮತ್ತು Mastodon gGmbH ಇದರ ನೊಂದಾಯಿತ ಗುರುತು.",
  "about.domain_blocks.no_reason_available": "ಕಾರಣ ಲಭ್ಯವಿಲ್ಲ",
  "about.domain_blocks.preamble": "ಸಾಮಾನ್ಯವಾಗಿ ಮಾಸ್ಟೊಡಾನ್ ನಿಮಗೆ ಇತರೆ ಬಳಕೆದಾರರಿಂದ ಹಂಚಲ್ಪಟ್ಟ ವಿಷಯಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಅವರೊಂದಿಗೆ ಸಂಭಾಷಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.\nಆದರೆ ಈ ಸರ್ವ್ರರ್‌ನಲ್ಲಿ ಅಳವಡಿಸಲಾದ ಕೆಲವು ವಿನಾಯಿತಿಗಳು ಇಂತಿವೆ.",
-  "account.account_note_header": "ಟಿಪ್ಪಣಿ",
  "account.add_or_remove_from_list": "ಪಟ್ಟಿಗೆ ಸೇರಿಸು ಅಥವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು",
  "account.badges.bot": "Bot",
  "account.badges.group": "ಗುಂಪು",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -11,7 +11,7 @@
  "about.not_available": "이 정보는 이 서버에서 사용할 수 없습니다.",
  "about.powered_by": "{mastodon}으로 구동되는 분산 소셜 미디어",
  "about.rules": "서버 규칙",
-  "account.account_note_header": "노트",
+  "account.account_note_header": "개인 메모",
  "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
  "account.badges.bot": "자동화됨",
  "account.badges.group": "그룹",
@ -171,21 +171,28 @@
  "confirmations.block.confirm": "차단",
  "confirmations.delete.confirm": "삭제",
  "confirmations.delete.message": "정말로 이 게시물을 삭제하시겠습니까?",
+  "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": "수정",
  "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
+  "confirmations.edit.title": "게시물을 덮어쓸까요?",
  "confirmations.logout.confirm": "로그아웃",
  "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
+  "confirmations.logout.title": "로그아웃 할까요?",
  "confirmations.mute.confirm": "뮤트",
  "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
  "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
+  "confirmations.redraft.title": "삭제하고 다시 작성할까요?",
  "confirmations.reply.confirm": "답글",
  "confirmations.reply.message": "지금 답장하면 작성 중인 메시지를 덮어쓰게 됩니다. 정말 진행합니까?",
+  "confirmations.reply.title": "게시물을 덮어쓸까요?",
  "confirmations.unfollow.confirm": "팔로우 해제",
  "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
+  "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
  "conversation.delete": "대화 삭제",
  "conversation.mark_as_read": "읽은 상태로 표시",
  "conversation.open": "대화 보기",
@ -293,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
  "filter_modal.select_filter.title": "이 게시물을 필터",
  "filter_modal.title.status": "게시물 필터",
-  "filtered_notifications_banner.mentions": "{count, plural, other {멘션}}",
-  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
  "filtered_notifications_banner.title": "걸러진 알림",
  "firehose.all": "모두",
  "firehose.local": "이 서버",
@ -439,6 +445,8 @@
  "mute_modal.title": "사용자를 뮤트할까요?",
  "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
  "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
+  "name_and_others": "{name} 외 {count, plural, other {# 명}}",
+  "name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>",
  "navigation_bar.about": "정보",
  "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
  "navigation_bar.blocks": "차단한 사용자",
@ -466,6 +474,10 @@
  "navigation_bar.security": "보안",
  "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
  "notification.admin.report": "{name} 님이 {target}를 신고했습니다",
+  "notification.admin.report_account": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 {category}로 신고했습니다",
+  "notification.admin.report_account_other": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 신고했습니다",
+  "notification.admin.report_statuses": "{name} 님이 {target}을 {category}로 신고했습니다",
+  "notification.admin.report_statuses_other": "{name} 님이 {target}을 신고했습니다",
  "notification.admin.sign_up": "{name} 님이 가입했습니다",
  "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
  "notification.follow": "{name} 님이 나를 팔로우했습니다",
@ -481,6 +493,8 @@
  "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
  "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
  "notification.own_poll": "설문을 마침",
+  "notification.poll": "참여한 투표가 끝났습니다",
+  "notification.private_mention": "{name} 님이 나를 개인적으로 멘션했습니다",
  "notification.reblog": "{name} 님이 부스트했습니다",
  "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
  "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
@ -491,13 +505,18 @@
  "notification.update": "{name} 님이 게시물을 수정했습니다",
  "notification_requests.accept": "수락",
  "notification_requests.dismiss": "지우기",
+  "notification_requests.maximize": "최대화",
+  "notification_requests.minimize_banner": "걸러진 알림 배너 최소화",
  "notification_requests.notifications_from": "{name} 님으로부터의 알림",
  "notification_requests.title": "걸러진 알림",
  "notifications.clear": "알림 비우기",
  "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
+  "notifications.clear_title": "알림을 모두 지울까요?",
  "notifications.column_settings.admin.report": "새 신고:",
  "notifications.column_settings.admin.sign_up": "새로운 가입:",
  "notifications.column_settings.alert": "데스크탑 알림",
+  "notifications.column_settings.beta.category": "실험적인 기능",
+  "notifications.column_settings.beta.grouping": "알림 그룹화",
  "notifications.column_settings.favourite": "좋아요:",
  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
  "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
@ -526,6 +545,8 @@
  "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
  "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
  "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한됨",
+  "notifications.policy.filter_limited_accounts_title": "중재된 계정",
  "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
  "notifications.policy.filter_new_accounts_title": "새 계정",
  "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
@ -661,9 +682,13 @@
  "report.unfollow_explanation": "이 계정을 팔로우하고 있습니다. 홈 피드에서 더 이상 게시물을 받아 보지 않으려면 팔로우를 해제하십시오.",
  "report_notification.attached_statuses": "{count}개의 게시물 첨부됨",
  "report_notification.categories.legal": "법령",
+  "report_notification.categories.legal_sentence": "불법적인 내용",
  "report_notification.categories.other": "기타",
+  "report_notification.categories.other_sentence": "기타",
  "report_notification.categories.spam": "스팸",
+  "report_notification.categories.spam_sentence": "스팸",
  "report_notification.categories.violation": "규칙 위반",
+  "report_notification.categories.violation_sentence": "규칙 위반",
  "report_notification.open": "신고 열기",
  "search.no_recent_searches": "최근 검색 기록이 없습니다",
  "search.placeholder": "검색",
@ -755,7 +780,7 @@
  "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
  "status.translate": "번역",
  "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
-  "status.uncached_media_warning": "마리보기 허용되지 않음",
+  "status.uncached_media_warning": "미리보기를 사용할 수 없습니다",
  "status.unmute_conversation": "이 대화의 뮤트 해제하기",
  "status.unpin": "고정 해제",
  "subscribed_languages.lead": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
@ -782,11 +807,11 @@
  "upload_button.label": "이미지, 영상, 오디오 파일 추가",
  "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
  "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
-  "upload_form.audio_description": "청각 장애인을 위한 설명",
-  "upload_form.description": "시각장애인을 위한 설명",
+  "upload_form.audio_description": "청각장애인이나 저청각자를 위한 설명",
+  "upload_form.description": "시각장애인이나 저시력자를 위한 설명",
  "upload_form.edit": "수정",
  "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
+  "upload_form.video_description": "청각장애인, 저청각자, 시각장애인, 저시력자를 위한 설명",
  "upload_modal.analyzing_picture": "사진 분석 중…",
  "upload_modal.apply": "적용",
  "upload_modal.applying": "적용 중...",
--- a/Show more
+++ b/Show more