Merge remote-tracking branch 'parent/main' into upstream-20240806

2024-08-06 08:16:16 +09:00 · 2024-08-06 08:16:16 +09:00 · 8e5fe5ccb9
commit 8e5fe5ccb9
parent 9e1c63aa2c c01a6a6eeb
166 changed files with 2268 additions and 1390 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)
@ -517,7 +517,7 @@ GEM
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-active_support (~> 0.1)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.3)
+    opentelemetry-instrumentation-active_job (0.7.4)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
    opentelemetry-instrumentation-active_model_serializers (0.20.2)
@ -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)
@ -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
@ -84,7 +85,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/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

@ -32,6 +33,16 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
    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
+
  private

  def load_requests
@ -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_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@ -33,7 +33,8 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
        'app.notification_grouping.status.unique_count' => statuses.uniq.size
      )

-      render json: @grouped_notifications, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+      presenter = GroupedNotificationsPresenter.new(@grouped_notifications)
+      render json: presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
    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
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@ -6,7 +6,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?

@ -79,10 +78,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/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);
    }
@ -78,7 +74,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;
@ -98,7 +96,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/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@ -1,5 +1,8 @@
 import api, { apiRequest, getLinks } from 'mastodon/api';
-import type { ApiNotificationGroupJSON } from 'mastodon/api_types/notifications';
+import type {
+  ApiNotificationGroupsResultJSON,
+  ApiNotificationGroupJSON,
+} from 'mastodon/api_types/notifications';
 import type { ApiStatusJSON } from 'mastodon/api_types/statuses';

 const exceptInvalidNotifications = (
@ -17,14 +20,18 @@ 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,
  });

+  const { statuses, accounts, notification_groups } = response.data;
+
  return {
-    notifications: exceptInvalidNotifications(response.data),
+    statuses,
+    accounts,
+    notifications: exceptInvalidNotifications(notification_groups),
    links: getLinks(response),
  };
 };
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@ -55,7 +55,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;
@ -64,7 +64,7 @@ export interface BaseNotificationGroupJSON {

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

 interface NotificationWithStatusJSON extends BaseNotificationJSON {
@ -147,3 +147,9 @@ export type ApiNotificationGroupJSON =
  | AccountRelationshipSeveranceNotificationGroupJSON
  | NotificationGroupWithStatusJSON
  | ModerationWarningNotificationGroupJSON;
+
+export interface ApiNotificationGroupsResultJSON {
+  accounts: ApiAccountJSON[];
+  statuses: ApiStatusJSON[];
+  notification_groups: ApiNotificationGroupJSON[];
+}
--- 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/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
@ -9,9 +9,9 @@ import { identityContextPropShape, withIdentity } from 'mastodon/identity_contex
 import { enableEmojiReaction } from 'mastodon/initial_state';
 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 {
@ -25,8 +25,6 @@ class ColumnSettings extends PureComponent {
    alertsEnabled: PropTypes.bool,
    browserSupport: PropTypes.bool,
    browserPermission: PropTypes.string,
-    notificationPolicy: PropTypes.object.isRequired,
-    onChangePolicy: PropTypes.func.isRequired,
  };

  onPushChange = (path, checked) => {
@ -38,24 +36,8 @@ class ColumnSettings extends PureComponent {
    }
  };

-  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' />;
@ -85,31 +67,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,141 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { CheckboxWithLabel } from './checkbox_with_label';
+
+export const PolicyControls: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const notificationPolicy = useAppSelector(
+    (state) => state.notificationPolicy,
+  );
+
+  const handleFilterNotFollowing = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_following: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNotFollowers = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_not_followers: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterNewAccounts = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_new_accounts: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleFilterPrivateMentions = useCallback(
+    (checked: boolean) => {
+      void dispatch(
+        updateNotificationsPolicy({ filter_private_mentions: checked }),
+      );
+    },
+    [dispatch],
+  );
+
+  if (!notificationPolicy) return null;
+
+  return (
+    <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={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={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={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={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>
+  );
+};
--- 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
@ -7,9 +7,9 @@ import { Helmet } from 'react-helmet';

 import { useSelector, useDispatch } from 'react-redux';

+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@ -101,7 +101,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
        showBackButton
        extraButton={!removed && (
          <>
-            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
            <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
          </>
        )}
--- 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,5 +1,6 @@
 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 type { NotificationGroupMention } from 'mastodon/models/notification_group';
@ -39,7 +40,7 @@ export const NotificationMention: React.FC<{
  return (
    <NotificationWithStatus
      type='mention'
-      icon={ReplyIcon}
+      icon={statusVisibility === 'direct' ? AlternateEmailIcon : ReplyIcon}
      iconId='reply'
      accountIds={notification.sampleAccountIds}
      count={notification.notifications_count}
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@ -43,7 +43,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';

@ -306,16 +309,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/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -291,8 +291,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/be.json
+++ b/app/javascript/mastodon/locales/be.json
@ -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 {згадванне} 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 +349,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 +445,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 +474,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 +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": "Групаваць апавяшчэннi",
  "notifications.column_settings.favourite": "Упадабанае:",
  "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
@ -661,9 +680,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 +714,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 +793,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
@ -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/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -252,7 +252,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
@ -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/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -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",
@ -481,6 +486,7 @@
  "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.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 +497,17 @@
  "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.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 +671,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.",
@ -300,8 +300,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 +503,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 +711,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
@ -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",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -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
@ -293,8 +293,6 @@
  "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.title": "Φιλτραρισμένες ειδοποιήσεις",
  "firehose.all": "Όλα",
  "firehose.local": "Αυτός ο διακομιστής",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -293,8 +293,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
@ -403,8 +403,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",
@ -625,6 +624,8 @@
  "notification.update": "{name} edited a post",
  "notification_requests.accept": "Accept",
  "notification_requests.dismiss": "Dismiss",
+  "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",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -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",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -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",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -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",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -290,8 +290,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
@ -294,8 +294,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
@ -86,6 +86,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 +164,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 +205,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 +403,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 +437,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 +606,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
@ -1,9 +1,9 @@
 {
  "about.blocks": "Moderoidut palvelimet",
-  "about.contact": "Ota yhteys:",
+  "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.",
@ -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",
@ -45,7 +45,7 @@
  "account.joined_short": "Liittynyt",
  "account.languages": "Vaihda tilattuja kieliä",
  "account.link_verified_on": "Linkin omistus tarkistettiin {date}",
-  "account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu ja tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
+  "account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu. Tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
  "account.media": "Media",
  "account.mention": "Mainitse @{name}",
  "account.moved_to": "{name} on ilmoittanut uudeksi tilikseen",
@ -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",
@ -119,7 +119,7 @@
  "column.blocks": "Estetyt käyttäjät",
  "column.bookmarks": "Kirjanmerkit",
  "column.community": "Paikallinen aikajana",
-  "column.direct": "Yksityiset maininnat",
+  "column.direct": "Yksityismaininnat",
  "column.directory": "Selaa profiileja",
  "column.domain_blocks": "Estetyt verkkotunnukset",
  "column.favourites": "Suosikit",
@ -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": "Etsi...",
+  "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,23 +535,23 @@
  "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_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "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_following_hint": "Kunnes hyväksyt ne manuaalisesti",
-  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
-  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
+  "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": "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…",
  "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
@ -573,8 +574,8 @@
  "onboarding.profile.note_hint": "Voit @mainita muita käyttäjiä tai #aihetunnisteita…",
  "onboarding.profile.save_and_continue": "Tallenna ja jatka",
  "onboarding.profile.title": "Profiilin määritys",
-  "onboarding.profile.upload_avatar": "Lataa profiilikuva",
-  "onboarding.profile.upload_header": "Lataa profiilin otsakekuva",
+  "onboarding.profile.upload_avatar": "Lähetä profiilikuva",
+  "onboarding.profile.upload_header": "Lähetä profiilin otsakekuva",
  "onboarding.share.lead": "Kerro ihmisille, kuinka he voivat löytää sinut Mastodonista!",
  "onboarding.share.message": "Olen {username} #Mastodon⁠issa! Seuraa minua osoitteessa {url}",
  "onboarding.share.next_steps": "Mahdolliset seuraavat vaiheet:",
@ -582,7 +583,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 +598,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,17 +610,17 @@
  "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",
  "privacy.public.short": "Julkinen",
-  "privacy.unlisted.additional": "Tämä on muutoin kuin julkinen julkaisu, mutta sitä ei näytetä livesyöte-, aihetunniste- tai selailunäkymissä eikä Mastodon-hakutuloksissakaan, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
+  "privacy.unlisted.additional": "Tämä toimii muuten kuin julkinen, mutta julkaisut eivät näy livesyöte-, aihetunniste- tai selausnäkymissä eivätkä Mastodonin hakutuloksissa, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
  "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
  "privacy.unlisted.short": "Vaivihkaisesti julkinen",
-  "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
+  "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!",
@ -692,7 +693,7 @@
  "search.quick_action.account_search": "Profiilit haulla {x}",
  "search.quick_action.go_to_account": "Siirry profiiliin {x}",
  "search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
-  "search.quick_action.open_url": "Avaa verkko-osoite Mastodonissa",
+  "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
  "search.quick_action.status_search": "Julkaisut haulla {x}",
  "search.search_or_paste": "Hae tai liitä URL-osoite",
  "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
@ -731,7 +732,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 +783,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,20 +791,20 @@
  "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.",
  "units.short.million": "{count} milj.",
  "units.short.thousand": "{count} t.",
-  "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
+  "upload_area.title": "Lähetä raahaamalla ja pudottamalla tähän",
  "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
-  "upload_error.limit": "Tiedostolatauksien rajoitus ylitetty.",
-  "upload_error.poll": "Tiedostojen lisääminen ei ole sallittua kyselyjen ohessa.",
+  "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",
+  "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
  "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
  "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
  "upload_form.edit": "Muokkaa",
@ -819,7 +820,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": "Tallennetaan...",
+  "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/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -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
@ -297,7 +297,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
@ -297,7 +297,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
@ -290,8 +290,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
@ -300,8 +300,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
@ -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.",
@ -480,9 +509,12 @@
  "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 +678,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 +712,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
@ -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
@ -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/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -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/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@ -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",
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@ -290,8 +290,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/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -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
@ -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": "Riduci al minimo 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
@ -387,8 +387,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": "このサーバー",
@ -597,6 +596,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/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -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}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
@ -495,9 +509,12 @@
  "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": "빠른 필터 막대",
@ -661,9 +678,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 +776,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": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@ -82,7 +82,6 @@
  "empty_column.notification_requests": "Omnia clara sunt! Nihil hic est. Cum novās notificātiōnēs accipīs, hic secundum tua praecepta apparebunt.",
  "empty_column.notifications": "Nōn adhūc habēs ullo notificātiōnēs. Cum aliī tē interagunt, hīc videbis.",
  "explore.trending_statuses": "Contributa",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mentiō} other {mentiōnēs}}",
  "firehose.all": "Omnis",
  "footer.about": "De",
  "generic.saved": "Servavit",
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@ -278,7 +278,6 @@
  "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
  "filter_modal.select_filter.title": "Filtra esta publikasyon",
  "filter_modal.title.status": "Filtra una publikasyon",
-  "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
  "filtered_notifications_banner.title": "Avizos filtrados",
  "firehose.all": "Todo",
  "firehose.local": "Este sirvidor",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -300,8 +300,6 @@
  "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
  "filter_modal.select_filter.title": "Filtruoti šį įrašą",
  "filter_modal.title.status": "Filtruoti įrašą",
-  "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
-  "filtered_notifications_banner.pending_requests": "Pranešimai iš {count, plural, =0 {nė vieno} one {vienos žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
  "filtered_notifications_banner.title": "Filtruojami pranešimai",
  "firehose.all": "Visi",
  "firehose.local": "Šis serveris",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -268,7 +268,6 @@
  "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
  "filter_modal.select_filter.title": "Filtrēt šo ziņu",
  "filter_modal.title.status": "Filtrēt ziņu",
-  "filtered_notifications_banner.pending_requests": "Paziņojumi no {count, plural, =0 {neviena} one {viena cilvēka} other {# cilvēkiem}}, ko Tu varētu zināt",
  "firehose.all": "Visi",
  "firehose.local": "Šis serveris",
  "firehose.remote": "Citi serveri",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
  "filter_modal.select_filter.title": "Dit bericht filteren",
  "filter_modal.title.status": "Een bericht filteren",
-  "filtered_notifications_banner.mentions": "{count, plural, one {vermelding} other {vermeldingen}}",
-  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
  "filtered_notifications_banner.title": "Gefilterde meldingen",
  "firehose.all": "Alles",
  "firehose.local": "Deze server",
@ -506,6 +505,8 @@
  "notification.update": "{name} heeft een bericht bewerkt",
  "notification_requests.accept": "Accepteren",
  "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.maximize": "Maximaliseer",
+  "notification_requests.minimize_banner": "Banner met gefilterde meldingen minimaliseren",
  "notification_requests.notifications_from": "Meldingen van {name}",
  "notification_requests.title": "Gefilterde meldingen",
  "notifications.clear": "Meldingen verwijderen",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -293,8 +293,7 @@
  "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
  "filter_modal.select_filter.title": "Filtrer dette innlegget",
  "filter_modal.title.status": "Filtrer eit innlegg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
-  "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
  "filtered_notifications_banner.title": "Filtrerte varslingar",
  "firehose.all": "Alle",
  "firehose.local": "Denne tenaren",
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@ -29,6 +29,9 @@
  "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
  "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
  "account.media": "ਮੀਡੀਆ",
+  "account.mute": "{name} ਨੂੰ ਮੌਨ ਕਰੋ",
+  "account.mute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮੌਨ ਕਰੋ",
+  "account.mute_short": "ਮੌਨ ਕਰੋ",
  "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
  "account.mutual": "ਸਾਂਝੇ",
  "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
  "filter_modal.select_filter.title": "Filtruj ten wpis",
  "filter_modal.title.status": "Filtruj wpis",
-  "filtered_notifications_banner.mentions": "{count, plural, one {wzmianka} few {wzmianki} other {wzmianek}}",
-  "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+  "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
  "filtered_notifications_banner.title": "Powiadomienia filtrowane",
  "firehose.all": "Wszystko",
  "firehose.local": "Ten serwer",
@ -505,6 +504,8 @@
  "notification.update": "{name} edytował(a) post",
  "notification_requests.accept": "Akceptuj",
  "notification_requests.dismiss": "Odrzuć",
+  "notification_requests.maximize": "Zmaksymalizuj",
+  "notification_requests.minimize_banner": "Zminimalizuj baner powiadomień filtrowanych",
  "notification_requests.notifications_from": "Powiadomienia od {name}",
  "notification_requests.title": "Powiadomienia filtrowane",
  "notifications.clear": "Wyczyść powiadomienia",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -297,8 +297,6 @@
  "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
  "filter_modal.select_filter.title": "Filtrar esta publicação",
  "filter_modal.title.status": "Filtrar uma publicação",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
-  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
  "filtered_notifications_banner.title": "Notificações filtradas",
  "firehose.all": "Tudo",
  "firehose.local": "Este servidor",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
  "filter_modal.select_filter.title": "Filtrar esta publicação",
  "filter_modal.title.status": "Filtrar uma publicação",
-  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
-  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
  "filtered_notifications_banner.title": "Notificações filtradas",
  "firehose.all": "Todas",
  "firehose.local": "Este servidor",
@ -506,6 +505,8 @@
  "notification.update": "{name} editou uma publicação",
  "notification_requests.accept": "Aceitar",
  "notification_requests.dismiss": "Descartar",
+  "notification_requests.maximize": "Maximizar",
+  "notification_requests.minimize_banner": "Minimizar o cabeçalho das notificações filtradas",
  "notification_requests.notifications_from": "Notificações de {name}",
  "notification_requests.title": "Notificações filtradas",
  "notifications.clear": "Limpar notificações",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -290,8 +290,6 @@
  "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.title": "Отфильтрованные уведомления",
  "firehose.all": "Все",
  "firehose.local": "Текущий сервер",
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@ -129,6 +129,7 @@
  "compose.language.change": "Поміняти язык",
  "compose.language.search": "Глядати языкы...",
  "compose.published.body": "Пост опубликованый.",
+  "compose.published.open": "Удкрыти",
  "compose.saved.body": "Пост усокоченый.",
  "compose_form.direct_message_warning_learn_more": "Читайте бульше",
  "compose_form.encryption_warning": "Публикації на Mastodon не шіфрувут ся. Не шырьте чутливу інформацію через Mastodon.",
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@ -241,8 +241,6 @@
  "filter_modal.select_filter.subtitle": "Imprea una categoria chi esistit giai o crea·nde una",
  "filter_modal.select_filter.title": "Filtra custa publicatzione",
  "filter_modal.title.status": "Filtra una publicatzione",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mèntovu} other {mèntovos}}",
-  "filtered_notifications_banner.pending_requests": "Notìficas dae {count, plural, =0 {nemos} one {una persone} other {# persones}} chi connosches",
  "filtered_notifications_banner.title": "Notìficas filtradas",
  "firehose.all": "Totus",
  "firehose.local": "Custu serbidore",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -285,7 +285,6 @@
  "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
  "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
  "filter_modal.title.status": "Filtrovanie príspevku",
-  "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
  "filtered_notifications_banner.title": "Filtrované oznámenia",
  "firehose.all": "Všetko",
  "firehose.local": "Tento server",
@ -450,12 +449,14 @@
  "navigation_bar.security": "Zabezpečenie",
  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
  "notification.admin.report": "Účet {name} nahlásil {target}",
+  "notification.admin.report_statuses_other": "{name} nahlásil/a {target}",
  "notification.admin.sign_up": "Nová registráciu účtu {name}",
  "notification.favourite": "{name} hviezdičkuje váš príspevok",
  "notification.follow": "{name} vás sleduje",
  "notification.follow_request": "{name} vás žiada sledovať",
  "notification.mention": "{name} vás spomína",
  "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
  "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
  "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
  "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
@ -472,6 +473,7 @@
  "notification_requests.title": "Filtrované oboznámenia",
  "notifications.clear": "Vyčistiť upozornenia",
  "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
+  "notifications.clear_title": "Vyčistiť upozornenia?",
  "notifications.column_settings.admin.report": "Nové hlásenia:",
  "notifications.column_settings.admin.sign_up": "Nové registrácie:",
  "notifications.column_settings.alert": "Upozornenia na ploche",
@ -633,7 +635,9 @@
  "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, prestaňte ho sledovať.",
  "report_notification.attached_statuses": "{count, plural, one {{count} príspevok} few {{count} príspevky} other {{count} príspevkov}} ako príloha",
  "report_notification.categories.legal": "Právne",
+  "report_notification.categories.legal_sentence": "nelegálny obsah",
  "report_notification.categories.other": "Ostatné",
+  "report_notification.categories.other_sentence": "ostatné",
  "report_notification.categories.spam": "Spam",
  "report_notification.categories.violation": "Porušenie pravidla",
  "report_notification.open": "Otvoriť hlásenie",
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@ -293,8 +293,6 @@
  "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
  "filter_modal.select_filter.title": "Filtriraj to objavo",
  "filter_modal.title.status": "Filtrirajte objavo",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omemba} two {omembi} few {omembe} other {omemb}}",
-  "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
  "filtered_notifications_banner.title": "Filtrirana obvestila",
  "firehose.all": "Vse",
  "firehose.local": "Ta strežnik",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
  "filter_modal.select_filter.title": "Filtroje këtë postim",
  "filter_modal.title.status": "Filtroni një postim",
-  "filtered_notifications_banner.mentions": "{count, plural, one {përmendje} other {përmendje}}",
-  "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
+  "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
  "filtered_notifications_banner.title": "Njoftime të filtruar",
  "firehose.all": "Krejt",
  "firehose.local": "Këtë shërbyes",
@ -506,6 +505,8 @@
  "notification.update": "{name} përpunoi një postim",
  "notification_requests.accept": "Pranoje",
  "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.maximize": "Maksimizoje",
+  "notification_requests.minimize_banner": "Minimizo banderolë njoftimesh të filtruara",
  "notification_requests.notifications_from": "Njoftime prej {name}",
  "notification_requests.title": "Njoftime të filtruar",
  "notifications.clear": "Spastroji njoftimet",
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@ -293,8 +293,6 @@
  "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
  "filter_modal.select_filter.title": "Filtriraj ovu objavu",
  "filter_modal.title.status": "Filtriraj objavu",
-  "filtered_notifications_banner.mentions": "{count, plural, one {pominjanje} few {pominjanja} other {pominjanja}}",
-  "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
  "filtered_notifications_banner.title": "Filtrirana obaveštenja",
  "firehose.all": "Sve",
  "firehose.local": "Ovaj server",
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@ -293,8 +293,6 @@
  "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
  "filter_modal.select_filter.title": "Филтрирај ову објаву",
  "filter_modal.title.status": "Филтрирај објаву",
-  "filtered_notifications_banner.mentions": "{count, plural, one {помињање} few {помињања} other {помињања}}",
-  "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
  "filtered_notifications_banner.title": "Филтрирана обавештења",
  "firehose.all": "Све",
  "firehose.local": "Овај сервер",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -300,8 +300,6 @@
  "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
  "filter_modal.select_filter.title": "Filtrera detta inlägg",
  "filter_modal.title.status": "Filtrera ett inlägg",
-  "filtered_notifications_banner.mentions": "{count, plural, one {omnämning} other {omnämnanden}}",
-  "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
  "filtered_notifications_banner.title": "Filtrerade aviseringar",
  "firehose.all": "Allt",
  "firehose.local": "Denna server",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -300,8 +300,6 @@
  "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 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
  "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
  "firehose.all": "ทั้งหมด",
  "firehose.local": "เซิร์ฟเวอร์นี้",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
  "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
  "filter_modal.title.status": "Bir gönderi süzgeçle",
-  "filtered_notifications_banner.mentions": "{count, plural, one {bahsetme} other {bahsetme}}",
-  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
+  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}}",
  "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
  "firehose.all": "Tümü",
  "firehose.local": "Bu sunucu",
@ -506,6 +505,8 @@
  "notification.update": "{name} bir gönderiyi düzenledi",
  "notification_requests.accept": "Onayla",
  "notification_requests.dismiss": "Yoksay",
+  "notification_requests.maximize": "Büyüt",
+  "notification_requests.minimize_banner": "Filtrelenmiş bildirimler başlığını küçült",
  "notification_requests.notifications_from": "{name} bildirimleri",
  "notification_requests.title": "Filtrelenmiş bildirimler",
  "notifications.clear": "Bildirimleri temizle",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -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 {mention} other {mentions}}",
-  "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": "Цей сервер",
@ -475,10 +474,10 @@
  "navigation_bar.security": "Безпека",
  "not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.",
  "notification.admin.report": "Скарга від {name} на {target}",
-  "notification.admin.report_account": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}",
-  "notification.admin.report_account_other": "{name} повідомив(ла) про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target}",
-  "notification.admin.report_statuses": "{name} повідомив(ла) про {target} в категорії {category}",
-  "notification.admin.report_statuses_other": "{name} повідомив(ла) про {target}",
+  "notification.admin.report_account": "{name} повідомляє про {count, plural, one {один допис} few {# дописи} many {# дописів} other {# дописів}} від {target} в категорії {category}",
+  "notification.admin.report_account_other": "{name} повідомляє про {count, plural, one {один допис} few {# дописи} 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} підписалися на вас",
@ -495,7 +494,7 @@
  "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
  "notification.own_poll": "Ваше опитування завершилося",
  "notification.poll": "Опитування, в якому ви проголосували, завершено",
-  "notification.private_mention": "{name} приватно згадав(ла) вас",
+  "notification.private_mention": "{name} приватно згадує вас",
  "notification.reblog": "{name} поширює ваш допис",
  "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
  "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
@ -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/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@ -300,8 +300,7 @@
  "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
  "filter_modal.select_filter.title": "Lọc tút này",
  "filter_modal.title.status": "Lọc một tút",
-  "filtered_notifications_banner.mentions": "{count, plural, other {lượt nhắc}}",
-  "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
+  "filtered_notifications_banner.pending_requests": "Từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
  "filtered_notifications_banner.title": "Thông báo đã lọc",
  "firehose.all": "Toàn bộ",
  "firehose.local": "Máy chủ này",
@ -506,6 +505,8 @@
  "notification.update": "{name} đã sửa tút",
  "notification_requests.accept": "Chấp nhận",
  "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.maximize": "Tối đa",
+  "notification_requests.minimize_banner": "Tinh giản banner lọc thông báo",
  "notification_requests.notifications_from": "Thông báo từ {name}",
  "notification_requests.title": "Thông báo đã lọc",
  "notifications.clear": "Xóa hết thông báo",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -1,5 +1,5 @@
 {
-  "about.blocks": "服务器被限制",
+  "about.blocks": "被限制的服务器",
  "about.contact": "联系方式：",
  "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。",
  "about.domain_blocks.no_reason_available": "原因不可用",
@ -63,7 +63,7 @@
  "account.requested_follow": "{name} 已经向你发送了关注请求",
  "account.share": "分享 @{name} 的个人资料页",
  "account.show_reblogs": "显示来自 @{name} 的转嘟",
-  "account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
+  "account.statuses_counter": "{count, plural, other {{counter} 条嘟文}}",
  "account.unblock": "取消屏蔽 @{name}",
  "account.unblock_domain": "取消屏蔽 {domain} 域名",
  "account.unblock_short": "取消屏蔽",
@ -89,14 +89,14 @@
  "announcement.announcement": "公告",
  "attachments_list.unprocessed": "(未处理)",
  "audio.hide": "隐藏音频",
-  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，无法保证对方一定遵从，因为某些服务器可能会以不同的方式处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
-  "block_modal.show_less": "显示更少",
+  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
+  "block_modal.show_less": "隐藏",
  "block_modal.show_more": "显示更多",
  "block_modal.they_cant_mention": "他们不能提及或关注你。",
  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
-  "block_modal.they_will_know": "他们可以看到他们被屏蔽。",
-  "block_modal.title": "屏蔽用户？",
-  "block_modal.you_wont_see_mentions": "你不会看到提及他们的嘟文。",
+  "block_modal.they_will_know": "他们将能看到他们被屏蔽。",
+  "block_modal.title": "屏蔽该用户？",
+  "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
  "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
  "bundle_column_error.copy_stacktrace": "复制错误报告",
  "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@ -171,28 +171,28 @@
  "confirmations.block.confirm": "屏蔽",
  "confirmations.delete.confirm": "删除",
  "confirmations.delete.message": "你确定要删除这条嘟文吗？",
-  "confirmations.delete.title": "删除嘟文？",
+  "confirmations.delete.title": "确认删除嘟文？",
  "confirmations.delete_list.confirm": "删除",
  "confirmations.delete_list.message": "确定永久删除这个列表吗？",
-  "confirmations.delete_list.title": "删除列表？",
+  "confirmations.delete_list.title": "确认删除列表？",
  "confirmations.discard_edit_media.confirm": "丢弃",
  "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
  "confirmations.edit.confirm": "编辑",
  "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
-  "confirmations.edit.title": "覆盖嘟文？",
+  "confirmations.edit.title": "确认覆盖嘟文？",
  "confirmations.logout.confirm": "退出登录",
  "confirmations.logout.message": "确定要退出登录吗？",
-  "confirmations.logout.title": "退出登录？",
+  "confirmations.logout.title": "是否退出登录？",
  "confirmations.mute.confirm": "隐藏",
  "confirmations.redraft.confirm": "删除并重新编辑",
  "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
-  "confirmations.redraft.title": "删除并重新嘟文？",
+  "confirmations.redraft.title": "是否删除并重新编辑嘟文？",
  "confirmations.reply.confirm": "回复",
  "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
-  "confirmations.reply.title": "覆盖嘟文？",
+  "confirmations.reply.title": "确认覆盖嘟文？",
  "confirmations.unfollow.confirm": "取消关注",
  "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
-  "confirmations.unfollow.title": "取消关注用户？",
+  "confirmations.unfollow.title": "是否取消关注用户？",
  "conversation.delete": "删除对话",
  "conversation.mark_as_read": "标记为已读",
  "conversation.open": "查看对话",
@ -300,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 个人} other {# 个人}}的通知",
+  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}",
  "filtered_notifications_banner.title": "通知（已过滤）",
  "firehose.all": "全部",
  "firehose.local": "此服务器",
@ -506,11 +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.clear_title": "是否清空通知？",
  "notifications.column_settings.admin.report": "新举报：",
  "notifications.column_settings.admin.sign_up": "新注册：",
  "notifications.column_settings.alert": "桌面通知",
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@ -168,6 +168,7 @@
  "confirmations.block.confirm": "封鎖",
  "confirmations.delete.confirm": "刪除",
  "confirmations.delete.message": "你確定要刪除這文章嗎？",
+  "confirmations.delete.title": "刪除帖文？",
  "confirmations.delete_list.confirm": "刪除",
  "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
  "confirmations.discard_edit_media.confirm": "捨棄",
@ -176,6 +177,7 @@
  "confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
  "confirmations.logout.confirm": "登出",
  "confirmations.logout.message": "確定要登出嗎？",
+  "confirmations.logout.title": "登出？",
  "confirmations.mute.confirm": "靜音",
  "confirmations.redraft.confirm": "刪除並編輯",
  "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
@ -290,8 +292,6 @@
  "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 {0 位} other {# 位}}你可能認識的人的通知",
  "filtered_notifications_banner.title": "已過濾之通知",
  "firehose.all": "全部",
  "firehose.local": "本伺服器",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -300,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 人} other {# 人}} 之通知",
+  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} 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/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@ -14,7 +14,7 @@ import type { ApiReportJSON } from 'mastodon/api_types/reports';
 export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;

 interface BaseNotificationGroup
-  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  extends Omit<BaseNotificationGroupJSON, 'sample_account_ids'> {
  sampleAccountIds: string[];
 }

@ -122,8 +122,7 @@ function createAccountRelationshipSeveranceEventFromJSON(
 export function createNotificationGroupFromJSON(
  groupJson: ApiNotificationGroupJSON,
 ): NotificationGroup {
-  const { sample_accounts, ...group } = groupJson;
-  const sampleAccountIds = sample_accounts.map((account) => account.id);
+  const { sample_account_ids: sampleAccountIds, ...group } = groupJson;

  switch (group.type) {
    case 'favourite':
@ -134,9 +133,9 @@ export function createNotificationGroupFromJSON(
    case 'status_reference':
    case 'poll':
    case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
      return {
-        statusId: status.id,
+        statusId,
        sampleAccountIds,
        ...groupWithoutStatus,
      };
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@ -58,6 +58,7 @@ const initialState = ImmutableMap({

    dismissPermissionBanner: false,
    showUnread: true,
+    minimizeFilteredBanner: false,

    shows: ImmutableMap({
      follow: true,
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@ -37,4 +37,9 @@ export const selectNeedsNotificationPermission = (state: RootState) =>
      'dismissPermissionBanner',
    ])) as boolean;

+export const selectSettingsNotificationsMinimizeFilteredBanner = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'minimizeFilteredBanner']) as boolean;
+
 /* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@ -1,16 +1,3 @@
-@mixin avatar-radius {
-  border-radius: 4px;
-  background: transparent no-repeat;
-  background-position: 50%;
-  background-clip: padding-box;
-}
-
-@mixin avatar-size($size: 48px) {
-  width: $size;
-  height: $size;
-  background-size: $size $size;
-}
-
@mixin search-input {
  outline: 0;
  box-sizing: border-box;
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@ -66,10 +66,6 @@ body {
    }
  }

-  &.lighter {
-    background: $ui-base-color;
-  }
-
  &.with-modals {
    overflow-x: hidden;
    overflow-y: scroll;
@ -109,7 +105,6 @@ body {
  }

  &.embed {
-    background: lighten($ui-base-color, 4%);
    margin: 0;
    padding-bottom: 0;

@ -122,15 +117,12 @@ body {
  }

  &.admin {
-    background: var(--background-color);
    padding: 0;
  }

  &.error {
    position: absolute;
    text-align: center;
-    color: $darker-text-color;
-    background: $ui-base-color;
    width: 100%;
    height: 100%;
    padding: 0;
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2050,17 +2050,15 @@ body > [data-popper-placement] {
 }

 .account__avatar {
-  @include avatar-radius;
-
  display: block;
  position: relative;
-  overflow: hidden;

  img {
    display: block;
    width: 100%;
    height: 100%;
    object-fit: cover;
+    border-radius: 4px;
  }

  &-inline {
@ -2097,6 +2095,29 @@ body > [data-popper-placement] {
      font-size: 15px;
    }
  }
+
+  &__counter {
+    $height: 16px;
+    $h-padding: 5px;
+
+    position: absolute;
+    bottom: -3px;
+    inset-inline-end: -3px;
+    padding-left: $h-padding;
+    padding-right: $h-padding;
+    height: $height;
+    border-radius: $height;
+    min-width: $height - 2 * $h-padding; // to ensure that it is never narrower than a circle
+    line-height: $height + 1px; // to visually center the numbers
+    background-color: $ui-button-background-color;
+    color: $white;
+    border-width: 1px;
+    border-style: solid;
+    border-color: var(--background-color);
+    font-size: 11px;
+    font-weight: 500;
+    text-align: center;
+  }
 }

 a .account__avatar {
@ -3159,6 +3180,11 @@ $ui-header-logo-wordmark-width: 99px;
  .explore__search-header {
    display: flex;
  }
+
+  .explore__search-results {
+    border: 0;
+    border-radius: 0;
+  }
 }

 .icon-with-badge {
@ -7635,7 +7661,7 @@ a.status-card {
  display: flex;
  flex-shrink: 0;

-  @media screen and (max-width: $no-gap-breakpoint) {
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
    border-right: 0;
    border-left: 0;
  }
@ -8485,16 +8511,17 @@ noscript {
      .verified {
        border: 1px solid rgba($valid-value-color, 0.5);
        margin-top: -1px;
+        margin-inline: -1px;

        &:first-child {
          border-top-left-radius: 4px;
          border-top-right-radius: 4px;
-          margin-top: 0;
        }

        &:last-child {
          border-bottom-left-radius: 4px;
          border-bottom-right-radius: 4px;
+          margin-bottom: -1px;
        }

        dt,
@ -10602,25 +10629,10 @@ noscript {
  }

  &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
-    &__badge {
-      background: $ui-button-background-color;
-      color: $white;
-      border-radius: 100px;
-      padding: 2px 8px;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
  }
 }

@ -10661,6 +10673,12 @@ noscript {
      letter-spacing: 0.5px;
      line-height: 24px;
      color: $secondary-text-color;
+
+      bdi {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
    }

    .filtered-notifications-banner__badge {
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -432,13 +432,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity

  def fetch_replies(status)
    collection = @object['replies']
-    return if collection.nil?
+    return if collection.blank?

    replies = ActivityPub::FetchRepliesService.new.call(status, collection, allow_synchronous_requests: false, request_id: @options[:request_id])
    return unless replies.nil?

    uri = value_or_id(collection)
    ActivityPub::FetchRepliesWorker.perform_async(status.id, uri, { 'request_id' => @options[:request_id] }) unless uri.nil?
+  rescue => e
+    Rails.logger.warn "Error fetching replies: #{e}"
  end

  def conversation_from_activity
--- a/Show more
+++ b/Show more