Merge remote-tracking branch 'upstream/main'

2024-04-26 13:26:00 +02:00 · 2024-04-26 13:26:00 +02:00 · 61c71f9c5b
commit 61c71f9c5b
parent 12ef898447 5201882a23
141 changed files with 1037 additions and 298 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -182,6 +182,11 @@ Style/FormatStringToken:
  AllowedMethods:
    - redirect_with_vary

+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop/cops_style.html#stylehashaslastarrayitem
+Style/HashAsLastArrayItem:
+  Enabled: false
+
 # Reason: Enforce modern Ruby style
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -128,19 +128,6 @@ Style/GuardClause:
    - 'lib/mastodon/cli/media.rb'
    - 'lib/tasks/repo.rake'

-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces
-Style/HashAsLastArrayItem:
-  Exclude:
-    - 'app/controllers/admin/statuses_controller.rb'
-    - 'app/controllers/api/v1/statuses_controller.rb'
-    - 'app/models/concerns/account/counters.rb'
-    - 'app/models/concerns/status/threading_concern.rb'
-    - 'app/models/status.rb'
-    - 'app/services/batched_remove_status_service.rb'
-    - 'app/services/notify_service.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
  Exclude:
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-3.2.3
+3.2.4
--- a/10
+++ b/10
@ -7,15 +7,15 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}

-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.3"]
-ARG RUBY_VERSION="3.2.3"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.4"]
+ARG RUBY_VERSION="3.2.4"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.2.3-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.2.4-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby

 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
@ -29,7 +29,7 @@ ARG MASTODON_VERSION_METADATA="dev"
 # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files
 ARG RAILS_SERVE_STATIC_FILES="true"
 # Allow to use YJIT compiler
-# See: https://github.com/ruby/ruby/blob/v3_2_3/doc/yjit/yjit.md
+# See: https://github.com/ruby/ruby/blob/v3_2_4/doc/yjit/yjit.md
 ARG RUBY_YJIT_ENABLE="1"
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"
@ -262,4 +262,4 @@ USER mastodon
 # Expose default Puma ports
 EXPOSE 3000
 # Set container tini as default entry point
-ENTRYPOINT ["/usr/bin/tini", "--"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -113,6 +113,14 @@ module ApplicationHelper
    content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
  end

+  def material_symbol(icon, attributes = {})
+    inline_svg_tag(
+      "400-24px/#{icon}.svg",
+      class: %w(icon).concat(attributes[:class].to_s.split),
+      role: :img
+    )
+  end
+
  def check_icon
    inline_svg_tag 'check.svg'
  end
--- a/app/javascript/entrypoints/admin.tsx
+++ b/app/javascript/entrypoints/admin.tsx
--- a/app/javascript/entrypoints/application.js
+++ b/app/javascript/entrypoints/application.js
--- a/app/javascript/entrypoints/error.js
+++ b/app/javascript/entrypoints/error.js
--- a/app/javascript/entrypoints/inert.js
+++ b/app/javascript/entrypoints/inert.js
--- a/app/javascript/entrypoints/mailer.js
+++ b/app/javascript/entrypoints/mailer.js
--- a/app/javascript/entrypoints/public-path.js
+++ b/app/javascript/entrypoints/public-path.js
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
--- a/app/javascript/entrypoints/remote_interaction_helper.ts
+++ b/app/javascript/entrypoints/remote_interaction_helper.ts
--- a/app/javascript/entrypoints/share.jsx
+++ b/app/javascript/entrypoints/share.jsx
--- a/app/javascript/entrypoints/sign_up.js
+++ b/app/javascript/entrypoints/sign_up.js
--- a/app/javascript/entrypoints/two_factor_authentication.js
+++ b/app/javascript/entrypoints/two_factor_authentication.js
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@ -1,17 +1,19 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';

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

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

 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';

+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { EmptyAccount } from 'mastodon/components/empty_account';
 import { ShortNumber } from 'mastodon/components/short_number';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';

+import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { me } from '../initial_state';

 import { Avatar } from './avatar';
@ -30,151 +32,151 @@ const messages = defineMessages({
  unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' },
  mute: { id: 'account.mute_short', defaultMessage: 'Mute' },
  block: { id: 'account.block_short', defaultMessage: 'Block' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });

-class Account extends ImmutablePureComponent {
+const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifications, hidden, minimal, defaultAction, withBio }) => {
+  const intl = useIntl();

-  static propTypes = {
-    size: PropTypes.number,
-    account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func,
-    onBlock: PropTypes.func,
-    onMute: PropTypes.func,
-    onMuteNotifications: PropTypes.func,
-    intl: PropTypes.object.isRequired,
-    hidden: PropTypes.bool,
-    minimal: PropTypes.bool,
-    defaultAction: PropTypes.string,
-    withBio: PropTypes.bool,
-  };
+  const handleFollow = useCallback(() => {
+    onFollow(account);
+  }, [onFollow, account]);

-  static defaultProps = {
-    size: 46,
-  };
+  const handleBlock = useCallback(() => {
+    onBlock(account);
+  }, [onBlock, account]);

-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
+  const handleMute = useCallback(() => {
+    onMute(account);
+  }, [onMute, account]);

-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
+  const handleMuteNotifications = useCallback(() => {
+    onMuteNotifications(account, true);
+  }, [onMuteNotifications, account]);

-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
+  const handleUnmuteNotifications = useCallback(() => {
+    onMuteNotifications(account, false);
+  }, [onMuteNotifications, account]);

-  handleMuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, true);
-  };
-
-  handleUnmuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, false);
-  };
-
-  render () {
-    const { account, intl, hidden, withBio, defaultAction, size, minimal } = this.props;
-
-    if (!account) {
-      return <EmptyAccount size={size} minimal={minimal} />;
-    }
-
-    if (hidden) {
-      return (
-        <>
-          {account.get('display_name')}
-          {account.get('username')}
-        </>
-      );
-    }
-
-    let buttons;
-
-    if (account.get('id') !== me && account.get('relationship', null) !== null) {
-      const following = account.getIn(['relationship', 'following']);
-      const requested = account.getIn(['relationship', 'requested']);
-      const blocking  = account.getIn(['relationship', 'blocking']);
-      const muting  = account.getIn(['relationship', 'muting']);
-
-      if (requested) {
-        buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={this.handleFollow} />;
-      } else if (blocking) {
-        buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      } else if (muting) {
-        let hidingNotificationsButton;
-
-        if (account.getIn(['relationship', 'muting_notifications'])) {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.unmute_notifications)} onClick={this.handleUnmuteNotifications} />;
-        } else {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.mute_notifications)} onClick={this.handleMuteNotifications} />;
-        }
-
-        buttons = (
-          <>
-            <Button text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />
-            {hidingNotificationsButton}
-          </>
-        );
-      } else if (defaultAction === 'mute') {
-        buttons = <Button title={intl.formatMessage(messages.mute)} onClick={this.handleMute} />;
-      } else if (defaultAction === 'block') {
-        buttons = <Button text={intl.formatMessage(messages.block)} onClick={this.handleBlock} />;
-      } else if (!account.get('suspended') && !account.get('moved') || following) {
-        buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
-      }
-    }
-
-    let muteTimeRemaining;
-
-    if (account.get('mute_expires_at')) {
-      muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
-    }
-
-    let verification;
-
-    const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
-
-    if (firstVerifiedField) {
-      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
-    }
+  if (!account) {
+    return <EmptyAccount size={size} minimal={minimal} />;
+  }

+  if (hidden) {
    return (
-      <div className={classNames('account', { 'account--minimal': minimal })}>
-        <div className='account__wrapper'>
-          <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
-            <div className='account__avatar-wrapper'>
-              <Avatar account={account} size={size} />
-            </div>
-
-            <div className='account__contents'>
-              <DisplayName account={account} />
-              {!minimal && (
-                <div className='account__details'>
-                  <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
-                </div>
-              )}
-            </div>
-          </Link>
-
-          {!minimal && (
-            <div className='account__relationship'>
-              {buttons}
-            </div>
-          )}
-        </div>
-
-        {withBio && (account.get('note').length > 0 ? (
-          <div
-            className='account__note translate'
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        ) : (
-          <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
-        ))}
-      </div>
+      <>
+        {account.get('display_name')}
+        {account.get('username')}
+      </>
    );
  }

-}
+  let buttons;

-export default injectIntl(Account);
+  if (account.get('id') !== me && account.get('relationship', null) !== null) {
+    const following = account.getIn(['relationship', 'following']);
+    const requested = account.getIn(['relationship', 'requested']);
+    const blocking  = account.getIn(['relationship', 'blocking']);
+    const muting  = account.getIn(['relationship', 'muting']);
+
+    if (requested) {
+      buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={handleFollow} />;
+    } else if (blocking) {
+      buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={handleBlock} />;
+    } else if (muting) {
+      let menu;
+
+      if (account.getIn(['relationship', 'muting_notifications'])) {
+        menu = [{ text: intl.formatMessage(messages.unmute_notifications), action: handleUnmuteNotifications }];
+      } else {
+        menu = [{ text: intl.formatMessage(messages.mute_notifications), action: handleMuteNotifications }];
+      }
+
+      buttons = (
+        <>
+          <DropdownMenuContainer
+            items={menu}
+            icon='ellipsis-h'
+            iconComponent={MoreHorizIcon}
+            direction='right'
+            title={intl.formatMessage(messages.more)}
+          />
+
+          <Button text={intl.formatMessage(messages.unmute)} onClick={handleMute} />
+        </>
+      );
+    } else if (defaultAction === 'mute') {
+      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+    } else if (defaultAction === 'block') {
+      buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
+    } else if (!account.get('suspended') && !account.get('moved') || following) {
+      buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />;
+    }
+  }
+
+  let muteTimeRemaining;
+
+  if (account.get('mute_expires_at')) {
+    muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+  }
+
+  let verification;
+
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+
+  if (firstVerifiedField) {
+    verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
+  }
+
+  return (
+    <div className={classNames('account', { 'account--minimal': minimal })}>
+      <div className='account__wrapper'>
+        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+          <div className='account__avatar-wrapper'>
+            <Avatar account={account} size={size} />
+          </div>
+
+          <div className='account__contents'>
+            <DisplayName account={account} />
+            {!minimal && (
+              <div className='account__details'>
+                <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
+              </div>
+            )}
+          </div>
+        </Link>
+
+        {!minimal && (
+          <div className='account__relationship'>
+            {buttons}
+          </div>
+        )}
+      </div>
+
+      {withBio && (account.get('note').length > 0 ? (
+        <div
+          className='account__note translate'
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      ) : (
+        <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
+      ))}
+    </div>
+  );
+};
+
+Account.propTypes = {
+  size: PropTypes.number,
+  account: ImmutablePropTypes.record,
+  onFollow: PropTypes.func,
+  onBlock: PropTypes.func,
+  onMute: PropTypes.func,
+  onMuteNotifications: PropTypes.func,
+  intl: PropTypes.object.isRequired,
+  hidden: PropTypes.bool,
+  minimal: PropTypes.bool,
+  defaultAction: PropTypes.string,
+  withBio: PropTypes.bool,
+};
+
+export default Account;
--- a/app/javascript/mastodon/features/explore/components/card.jsx
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { domain } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  let label;
+
+  switch (source) {
+  case 'friends_of_friends':
+    label = <FormattedMessage id='follow_suggestions.friends_of_friends_longer' defaultMessage='Popular among people you follow' />;
+    break;
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.similar_to_recently_followed_longer' defaultMessage='Similar to profiles you recently followed' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.featured_longer' defaultMessage='Hand-picked by the {domain} team' values={{ domain }} />;
+    break;
+  case 'most_followed':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  }
+
+  return (
+    <div className='explore__suggestions__card'>
+      <div className='explore__suggestions__card__source'>
+        {label}
+      </div>
+
+      <div className='explore__suggestions__card__body'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+
+        <div className='explore__suggestions__card__body__main'>
+          <div className='explore__suggestions__card__body__main__name-button'>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+            <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
--- a/app/javascript/mastodon/features/explore/suggestions.jsx
+++ b/app/javascript/mastodon/features/explore/suggestions.jsx
@ -10,9 +10,10 @@ import { connect } from 'react-redux';

 import { fetchSuggestions } from 'mastodon/actions/suggestions';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import AccountCard from 'mastodon/features/directory/components/account_card';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';

+import { Card } from './components/card';
+
 const mapStateToProps = state => ({
  suggestions: state.getIn(['suggestions', 'items']),
  isLoading: state.getIn(['suggestions', 'isLoading']),
@ -54,7 +55,11 @@ class Suggestions extends PureComponent {
    return (
      <div className='explore__suggestions scrollable' data-nosnippet>
        {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
-          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} />
+          <Card
+            key={suggestion.get('account')}
+            id={suggestion.get('account')}
+            source={suggestion.getIn(['sources', 0])}
+          />
        ))}
      </div>
    );
--- a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@ -0,0 +1,78 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+  none: {
+    id: 'notification.moderation_warning.action_none',
+    defaultMessage: 'Your account has received a moderation warning.',
+  },
+  disable: {
+    id: 'notification.moderation_warning.action_disable',
+    defaultMessage: 'Your account has been disabled.',
+  },
+  mark_statuses_as_sensitive: {
+    id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+    defaultMessage: 'Some of your posts have been marked as sensitive.',
+  },
+  delete_statuses: {
+    id: 'notification.moderation_warning.action_delete_statuses',
+    defaultMessage: 'Some of your posts have been removed.',
+  },
+  sensitive: {
+    id: 'notification.moderation_warning.action_sensitive',
+    defaultMessage: 'Your posts will be marked as sensitive from now on.',
+  },
+  silence: {
+    id: 'notification.moderation_warning.action_silence',
+    defaultMessage: 'Your account has been limited.',
+  },
+  suspend: {
+    id: 'notification.moderation_warning.action_suspend',
+    defaultMessage: 'Your account has been suspended.',
+  },
+});
+
+interface Props {
+  action:
+    | 'none'
+    | 'disable'
+    | 'mark_statuses_as_sensitive'
+    | 'delete_statuses'
+    | 'sensitive'
+    | 'silence'
+    | 'suspend';
+  id: string;
+  hidden: boolean;
+}
+
+export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a
+      href={`/disputes/strikes/${id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='notification__moderation-warning'
+    >
+      <Icon id='warning' icon={WarningIcon} />
+
+      <div className='notification__moderation-warning__content'>
+        <p>{intl.formatMessage(messages[action])}</p>
+        <span className='link-button'>
+          <FormattedMessage
+            id='notification.moderation-warning.learn_more'
+            defaultMessage='Learn more'
+          />
+        </span>
+      </div>
+    </a>
+  );
+};
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@ -26,6 +26,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';

 import FollowRequestContainer from '../containers/follow_request_container';

+import { ModerationWarning } from './moderation_warning';
 import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';

@ -40,6 +41,7 @@ const messages = defineMessages({
  adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
  adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
  relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
 });

 const notificationForScreenReader = (intl, message, timestamp) => {
@ -383,6 +385,27 @@ class Notification extends ImmutablePureComponent {
    );
  }

+  renderModerationWarning (notification) {
+    const { intl, unread, hidden } = this.props;
+    const warning = notification.get('moderation_warning');
+
+    if (!warning) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
+          <ModerationWarning
+            action={warning.get('action')}
+            id={warning.get('id')}
+            hidden={hidden}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
  renderAdminSignUp (notification, account, link) {
    const { intl, unread } = this.props;

@ -456,6 +479,8 @@ class Notification extends ImmutablePureComponent {
      return this.renderPoll(notification, account);
    case 'severed_relationships':
      return this.renderRelationshipsSevered(notification);
+    case 'moderation_warning':
+      return this.renderModerationWarning(notification);
    case 'admin.sign_up':
      return this.renderAdminSignUp(notification, account, link);
    case 'admin.report':
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -297,6 +297,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.title": "Филтрирани известия",
  "firehose.all": "Всичко",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
  "follow_suggestions.curated_suggestion": "Tria de l'equip",
  "follow_suggestions.dismiss": "No ho tornis a mostrar",
+  "follow_suggestions.featured_longer": "Triat personalment per l'equip de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre la gent que segueixes",
  "follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
  "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
  "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
  "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
  "follow_suggestions.popular_suggestion": "Suggeriment popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que has seguit fa poc",
  "follow_suggestions.view_all": "Mostra-ho tot",
  "follow_suggestions.who_to_follow": "A qui seguir",
  "followed_tags": "Etiquetes seguides",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -306,6 +306,8 @@
  "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
  "follow_suggestions.curated_suggestion": "Personaleudvalgt",
  "follow_suggestions.dismiss": "Vis ikke igen",
+  "follow_suggestions.featured_longer": "Håndplukket af {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populært blandt personer, som følges",
  "follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
  "follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
  "follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
@ -313,6 +315,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
  "follow_suggestions.personalized_suggestion": "Personligt forslag",
  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
  "follow_suggestions.view_all": "Vis alle",
  "follow_suggestions.who_to_follow": "Hvem, som skal følges",
  "followed_tags": "Hashtag, som følges",
@ -467,6 +471,15 @@
  "notification.follow": "{name} begyndte at følge dig",
  "notification.follow_request": "{name} har anmodet om at følge dig",
  "notification.mention": "{name} nævnte dig",
+  "notification.moderation-warning.learn_more": "Læs mere",
+  "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+  "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
+  "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+  "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+  "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
+  "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
  "notification.own_poll": "Din afstemning er afsluttet",
  "notification.poll": "En afstemning, hvori du stemte, er slut",
  "notification.reblog": "{name} boostede dit indlæg",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
  "follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
  "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+  "follow_suggestions.featured_longer": "Vom {domain}-Team ausgewählt",
+  "follow_suggestions.friends_of_friends_longer": "Beliebt bei Leuten, denen du folgst",
  "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
  "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
  "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
  "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
  "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+  "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
  "follow_suggestions.view_all": "Alle anzeigen",
  "follow_suggestions.who_to_follow": "Empfohlene Profile",
  "followed_tags": "Gefolgte Hashtags",
@ -469,6 +473,15 @@
  "notification.follow": "{name} folgt dir",
  "notification.follow_request": "{name} möchte dir folgen",
  "notification.mention": "{name} erwähnte dich",
+  "notification.moderation-warning.learn_more": "Mehr erfahren",
+  "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
+  "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
+  "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
+  "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
+  "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
  "notification.own_poll": "Deine Umfrage ist beendet",
  "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
  "notification.reblog": "{name} teilte deinen Beitrag",
@ -536,11 +549,11 @@
  "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
  "onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
  "onboarding.follows.title": "Personalisiere deine Startseite",
-  "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+  "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
  "onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
  "onboarding.profile.display_name": "Anzeigename",
  "onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
-  "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+  "onboarding.profile.lead": "Du kannst dein Profil später in den Einstellungen vervollständigen. Dort stehen weitere Anpassungsmöglichkeiten zur Verfügung.",
  "onboarding.profile.note": "Über mich",
  "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
  "onboarding.profile.save_and_continue": "Speichern und fortfahren",
@ -556,16 +569,16 @@
  "onboarding.start.title": "Du hast es geschafft!",
  "onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
  "onboarding.steps.follow_people.title": "Personalisiere deine Startseite",
-  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen {emoji}",
+  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen. {emoji}",
  "onboarding.steps.publish_status.title": "Erstelle deinen ersten Beitrag",
  "onboarding.steps.setup_profile.body": "Mit einem vollständigen Profil interagieren andere eher mit dir.",
  "onboarding.steps.setup_profile.title": "Personalisiere dein Profil",
-  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können",
+  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.",
  "onboarding.steps.share_profile.title": "Teile dein Mastodon-Profil",
  "onboarding.tips.2fa": "<strong>Wusstest du schon?</strong> Du kannst die Sicherheit deines Kontos erhöhen, indem du die Zwei-Faktor-Authentisierung in deinen Kontoeinstellungen aktivierst. Dafür ist keine Telefonnummer notwendig und es funktioniert jede beliebige TOTP-App!",
  "onboarding.tips.accounts_from_other_servers": "<strong>Wusstest du schon?</strong> Da Mastodon dezentralisiert ist, werden einige Profile, denen du begegnest, auf anderen Servern als deinem bereitgestellt. Und trotzdem kannst du uneingeschränkt mit ihnen interagieren! Der Servername befindet sich in der zweiten Hälfte ihres Profilnamens!",
  "onboarding.tips.migration": "<strong>Wusstest du schon?</strong> Wenn du das Gefühl hast, dass {domain} in Zukunft nicht die richtige Serverwahl für dich ist, kannst du auf einen anderen Mastodon-Server umziehen, ohne deine Follower zu verlieren. Du kannst sogar deinen eigenen Server betreiben!",
-  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Keine Gebühren oder Dokumente erforderlich!",
+  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Völlig kostenlos und ohne Dokumente einsenden zu müssen!",
  "password_confirmation.exceeds_maxlength": "Passwortbestätigung überschreitet die maximal erlaubte Zeichenanzahl",
  "password_confirmation.mismatching": "Passwortbestätigung stimmt nicht überein",
  "picture_in_picture.restore": "Zurücksetzen",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
  "follow_suggestions.curated_suggestion": "Staff pick",
  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
  "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
  "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
  "follow_suggestions.personalized_suggestion": "Personalized suggestion",
  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
  "follow_suggestions.view_all": "View all",
  "follow_suggestions.who_to_follow": "Who to follow",
  "followed_tags": "Followed hashtags",
@ -469,6 +473,15 @@
  "notification.follow": "{name} followed you",
  "notification.follow_request": "{name} has requested to follow you",
  "notification.mention": "{name} mentioned you",
+  "notification.moderation-warning.learn_more": "Learn more",
+  "notification.moderation_warning": "Your have received a moderation warning",
+  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
  "notification.own_poll": "Your poll has ended",
  "notification.poll": "A poll you have voted in has ended",
  "notification.reblog": "{name} boosted your post",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
  "follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
  "follow_suggestions.dismiss": "Ez erakutsi berriro",
+  "follow_suggestions.featured_longer": "{domain} domeinuko taldeak hautaturikoak",
+  "follow_suggestions.friends_of_friends_longer": "Jarraitzen duzun jendearen artean ezagunak direnak",
  "follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
  "follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
  "follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
  "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
  "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+  "follow_suggestions.popular_suggestion_longer": "{domain} domeinuan ezagunak direnak",
+  "follow_suggestions.similar_to_recently_followed_longer": "Berriki jarraitu dituzun profilen antzekoa",
  "follow_suggestions.view_all": "Ikusi denak",
  "follow_suggestions.who_to_follow": "Zein jarraitu",
  "followed_tags": "Jarraitutako traolak",
@ -469,6 +473,15 @@
  "notification.follow": "{name}(e)k jarraitzen dizu",
  "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
  "notification.mention": "{name}(e)k aipatu zaitu",
+  "notification.moderation-warning.learn_more": "Informazio gehiago",
+  "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
+  "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
+  "notification.moderation_warning.action_disable": "Zure kontua desaktibatua izan da.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Argitalpen batzuk hunkigarri gisa ezarri dira.",
+  "notification.moderation_warning.action_none": "Kontuak moderazio-abisu bat jaso du.",
+  "notification.moderation_warning.action_sensitive": "Argitalpenak hunkigarri gisa markatuko dira hemendik aurrera.",
+  "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
+  "notification.moderation_warning.action_suspend": "Kontua itxi da.",
  "notification.own_poll": "Zure inkesta amaitu da",
  "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
  "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
  "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
  "follow_suggestions.dismiss": "Älä näytä uudelleen",
+  "follow_suggestions.featured_longer": "Käsin valinnut palvelimen {domain} tiimi",
+  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
  "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.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
  "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
  "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+  "follow_suggestions.popular_suggestion_longer": "Suosittu palvelimella {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
  "follow_suggestions.view_all": "Näytä kaikki",
  "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
  "followed_tags": "Seuratut aihetunnisteet",
@ -469,6 +473,15 @@
  "notification.follow": "{name} seurasi sinua",
  "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
  "notification.mention": "{name} mainitsi sinut",
+  "notification.moderation-warning.learn_more": "Lue lisää",
+  "notification.moderation_warning": "Olet saanut moderointivaroituksen",
+  "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+  "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+  "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
+  "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
+  "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
+  "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
  "notification.own_poll": "Äänestyksesi on päättynyt",
  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
  "notification.reblog": "{name} tehosti julkaisuasi",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
  "follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
  "follow_suggestions.dismiss": "Lat vera við at vísa",
+  "follow_suggestions.featured_longer": "Vald burturúr av {domain} toyminum",
+  "follow_suggestions.friends_of_friends_longer": "Vælumtókt millum fólk, sum tú fylgir",
  "follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
  "follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
  "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
  "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+  "follow_suggestions.popular_suggestion_longer": "Vælumtókt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Líkist vangum, sum tú nýliga hevur fylgt",
  "follow_suggestions.view_all": "Vís øll",
  "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
  "followed_tags": "Fylgd frámerki",
@ -469,6 +473,15 @@
  "notification.follow": "{name} fylgdi tær",
  "notification.follow_request": "{name} biður um at fylgja tær",
  "notification.mention": "{name} nevndi teg",
+  "notification.moderation-warning.learn_more": "Lær meira",
+  "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávarðing",
+  "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
+  "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
+  "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávarðing.",
+  "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
+  "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
+  "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
  "notification.own_poll": "Tín atkvøðugreiðsla er endað",
  "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
  "notification.reblog": "{name} lyfti tín post",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -297,6 +297,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.title": "Brathan criathraichte",
  "firehose.all": "Na h-uile",
@ -307,6 +308,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.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.",
  "follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
@ -314,6 +316,7 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
  "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.view_all": "Seall na h-uile",
  "follow_suggestions.who_to_follow": "Molaidhean leantainn",
  "followed_tags": "Tagaichean hais ’gan leantainn",
@ -468,6 +471,7 @@
  "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.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.reblog": "Bhrosnaich {name} am post agad",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
  "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
  "follow_suggestions.dismiss": "Non mostrar máis",
+  "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
  "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
  "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
  "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
  "follow_suggestions.popular_suggestion": "Suxestión popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Perfís semellantes aos que seguiches recentemente",
  "follow_suggestions.view_all": "Ver todas",
  "follow_suggestions.who_to_follow": "A quen seguir",
  "followed_tags": "Cancelos seguidos",
@ -469,6 +473,15 @@
  "notification.follow": "{name} comezou a seguirte",
  "notification.follow_request": "{name} solicitou seguirte",
  "notification.mention": "{name} mencionoute",
+  "notification.moderation-warning.learn_more": "Saber máis",
+  "notification.moderation_warning": "Recibiches unha advertencia da moderación",
+  "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
+  "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
+  "notification.moderation_warning.action_none": "A túa conta recibeu unha advertencia da moderación.",
+  "notification.moderation_warning.action_sensitive": "De agora en diante as túas publicacións van ser marcadas como sensibles.",
+  "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
  "notification.own_poll": "A túa enquisa rematou",
  "notification.poll": "Rematou a enquisa na que votaches",
  "notification.reblog": "{name} compartiu a túa publicación",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
  "follow_suggestions.curated_suggestion": "בחירת הצוות",
  "follow_suggestions.dismiss": "לא להציג שוב",
+  "follow_suggestions.featured_longer": "נבחר ידנית על ידי הצוות של {domain}",
+  "follow_suggestions.friends_of_friends_longer": "פופולרי בין הנעקבים שלך",
  "follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
  "follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
  "follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
  "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
  "follow_suggestions.popular_suggestion": "הצעה פופולרית",
+  "follow_suggestions.popular_suggestion_longer": "פופולרי בקהילת {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "דומה למשתמשות.ים שעקבת אחריהן.ם לאחרונה",
  "follow_suggestions.view_all": "צפיה בכל",
  "follow_suggestions.who_to_follow": "אחרי מי לעקוב",
  "followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
  "follow_suggestions.curated_suggestion": "A stáb választása",
  "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+  "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
+  "follow_suggestions.friends_of_friends_longer": "Népszerű az Ön által követett emberek körében",
  "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
  "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
  "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
  "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
  "follow_suggestions.popular_suggestion": "Népszerű javaslat",
+  "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Hasonló profilok, melyeket nemrég követett",
  "follow_suggestions.view_all": "Összes megtekintése",
  "follow_suggestions.who_to_follow": "Kit érdemes követni",
  "followed_tags": "Követett hashtagek",
@ -469,6 +473,15 @@
  "notification.follow": "{name} követ téged",
  "notification.follow_request": "{name} követni szeretne téged",
  "notification.mention": "{name} megemlített",
+  "notification.moderation-warning.learn_more": "További információk",
+  "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
+  "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
+  "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Néhány bejegyzésedet kényesnek jelölték.",
+  "notification.moderation_warning.action_none": "A fiókod moderációs figyelmeztetést kapott.",
+  "notification.moderation_warning.action_sensitive": "A bejegyzéseid mostantól érzékenynek lesznek jelölve.",
+  "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
+  "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
  "notification.own_poll": "A szavazásod véget ért",
  "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
  "notification.reblog": "{name} megtolta a bejegyzésedet",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -123,6 +123,7 @@
  "column.directory": "Jelajahi profil",
  "column.domain_blocks": "Domain tersembunyi",
  "column.favourites": "Favorit",
+  "column.firehose": "Feed yang sedang berlangsung",
  "column.follow_requests": "Permintaan mengikuti",
  "column.home": "Beranda",
  "column.lists": "List",
@ -143,7 +144,9 @@
  "community.column_settings.remote_only": "Hanya jarak jauh",
  "compose.language.change": "Ganti bahasa",
  "compose.language.search": "Telusuri bahasa...",
+  "compose.published.body": "Postingan diterbitkan.",
  "compose.published.open": "Buka",
+  "compose.saved.body": "Postingan tersimpan.",
  "compose_form.direct_message_warning_learn_more": "Pelajari lebih lanjut",
  "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi secara end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
  "compose_form.hashtag_warning": "Kiriman ini tidak akan didaftarkan di bawah tagar apapun selama tidak diatur ke publik. Hanya kiriman publik yang dapat dicari dengan tagar.",
@ -151,11 +154,19 @@
  "compose_form.lock_disclaimer.lock": "terkunci",
  "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
  "compose_form.poll.duration": "Durasi japat",
+  "compose_form.poll.multiple": "Pilihan ganda",
+  "compose_form.poll.option_placeholder": "Opsi {number}",
+  "compose_form.poll.single": "Pilih Satu",
  "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
  "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
+  "compose_form.poll.type": "Gaya",
+  "compose_form.publish": "Postingan",
  "compose_form.publish_form": "Terbitkan",
+  "compose_form.reply": "Balas",
+  "compose_form.save_changes": "Perbarui",
  "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
  "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
+  "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
  "confirmation_modal.cancel": "Batal",
  "confirmations.block.confirm": "Blokir",
  "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
@ -166,12 +177,15 @@
  "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
  "confirmations.discard_edit_media.confirm": "Buang",
  "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
+  "confirmations.domain_block.confirm": "Blokir server",
  "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
  "confirmations.edit.confirm": "Ubah",
+  "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
  "confirmations.logout.confirm": "Keluar",
  "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
  "confirmations.mute.confirm": "Bisukan",
  "confirmations.redraft.confirm": "Hapus dan susun ulang",
+  "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
  "confirmations.reply.confirm": "Balas",
  "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
  "confirmations.unfollow.confirm": "Berhenti mengikuti",
@ -180,6 +194,7 @@
  "conversation.mark_as_read": "Tandai sudah dibaca",
  "conversation.open": "Lihat percakapan",
  "conversation.with": "Dengan {names}",
+  "copy_icon_button.copied": "Disalin ke clipboard",
  "copypaste.copied": "Disalin",
  "copypaste.copy_to_clipboard": "Salin ke clipboard",
  "directory.federated": "Dari fediverse yang dikenal",
@ -191,7 +206,27 @@
  "dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
  "dismissable_banner.dismiss": "Abaikan",
  "dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.explore_statuses": "Ini adalah postingan dari seluruh web sosial yang mendapatkan daya tarik saat ini. Postingan baru dengan lebih banyak peningkatan dan favorit memiliki peringkat lebih tinggi.",
  "dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.public_timeline": "Ini adalah postingan publik dari orang-orang di web sosial yang diikuti oleh {domain}.",
+  "domain_block_modal.block": "Blokir server",
+  "domain_block_modal.block_account_instead": "Blokir @{name} saja",
+  "domain_block_modal.they_can_interact_with_old_posts": "Orang-orang dari server ini dapat berinteraksi dengan kiriman lama anda.",
+  "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
+  "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
+  "domain_block_modal.title": "Blokir domain?",
+  "domain_block_modal.you_will_lose_followers": "Semua pengikut anda dari server ini akan dihapus.",
+  "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
+  "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
+  "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Nama penggunanya:",
+  "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
+  "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
+  "domain_pill.username": "Nama pengguna",
+  "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
+  "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial  <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Nama pengguna anda:",
  "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
  "embed.preview": "Tampilan akan seperti ini nantinya:",
  "emoji_button.activity": "Aktivitas",
@ -260,6 +295,10 @@
  "follow_request.authorize": "Izinkan",
  "follow_request.reject": "Tolak",
  "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "Pilihan staf",
+  "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+  "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
  "followed_tags": "Tagar yang diikuti",
  "footer.about": "Tentang",
  "footer.directory": "Direktori profil",
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@ -20,6 +20,7 @@
  "column.bookmarks": "Ebenrụtụakā",
  "column.home": "Be",
  "column.lists": "Ndepụta",
+  "column.notifications": "Nziọkwà",
  "column.pins": "Pinned post",
  "column_header.pin": "Gbado na profaịlụ gị",
  "column_subheading.settings": "Mwube",
@ -42,17 +43,28 @@
  "confirmations.reply.confirm": "Zaa",
  "confirmations.unfollow.confirm": "Kwụsị iso",
  "conversation.delete": "Hichapụ nkata",
+  "disabled_account_banner.account_settings": "Mwube akaụntụ",
  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.username": "Ahaojiaru",
  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "emoji_button.activity": "Mmemme",
+  "emoji_button.label": "Tibanye emoji",
  "emoji_button.search": "Chọọ...",
+  "emoji_button.symbols": "Ọdịmara",
  "empty_column.account_timeline": "No posts found",
  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
  "errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+  "explore.trending_links": "Akụkọ",
+  "firehose.all": "Ha niine",
+  "follow_request.authorize": "Nye ikike",
  "footer.privacy_policy": "Iwu nzuzu",
  "getting_started.heading": "Mbido",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.show_replies": "Gosi nzaghachị",
+  "home.hide_announcements": "Zoo ọkwa",
+  "home.show_announcements": "Gosi ọkwa",
  "keyboard_shortcuts.back": "to navigate back",
  "keyboard_shortcuts.blocked": "to open blocked users list",
  "keyboard_shortcuts.boost": "to boost",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
  "follow_suggestions.curated_suggestion": "Úrval starfsfólks",
  "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+  "follow_suggestions.featured_longer": "Handvalið af {domain}-teyminu",
+  "follow_suggestions.friends_of_friends_longer": "Vinsælt hjá fólki sem þú fylgist með",
  "follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
  "follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
  "follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
  "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
  "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+  "follow_suggestions.popular_suggestion_longer": "Vinsælt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svipar til notenda sem þú hefur nýlega farið að fylgjast með",
  "follow_suggestions.view_all": "Skoða allt",
  "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
  "followed_tags": "Myllumerki sem fylgst er með",
@ -469,6 +473,15 @@
  "notification.follow": "{name} fylgist með þér",
  "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
  "notification.mention": "{name} minntist á þig",
+  "notification.moderation-warning.learn_more": "Kanna nánar",
+  "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
+  "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
+  "notification.moderation_warning.action_disable": "Aðgangurinn þinn hefur verið gerður óvirkur.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sumar færslurnar þínar hafa verið merktar sem viðkvæmt efni.",
+  "notification.moderation_warning.action_none": "Aðgangurinn þinn hefur fengið aðvörun frá umsjónarmanni.",
+  "notification.moderation_warning.action_sensitive": "Færslur þínar á verða héðan í frá merktar sem viðkvæmar.",
+  "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
+  "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
  "notification.own_poll": "Könnuninni þinni er lokið",
  "notification.poll": "Könnun sem þú tókst þátt í er lokið",
  "notification.reblog": "{name} endurbirti færsluna þína",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
  "follow_suggestions.curated_suggestion": "Scelta personale",
  "follow_suggestions.dismiss": "Non visualizzare più",
+  "follow_suggestions.featured_longer": "Selezionato personalmente dal team di {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popolare tra le persone che segui",
  "follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
  "follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
  "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
  "follow_suggestions.popular_suggestion": "Suggerimento frequente",
+  "follow_suggestions.popular_suggestion_longer": "Popolare su {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Simile ai profili che hai seguito di recente",
  "follow_suggestions.view_all": "Vedi tutto",
  "follow_suggestions.who_to_follow": "Chi seguire",
  "followed_tags": "Hashtag seguiti",
@ -469,6 +473,15 @@
  "notification.follow": "{name} ha iniziato a seguirti",
  "notification.follow_request": "{name} ha richiesto di seguirti",
  "notification.mention": "{name} ti ha menzionato",
+  "notification.moderation-warning.learn_more": "Scopri di più",
+  "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
+  "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
+  "notification.moderation_warning.action_disable": "Il tuo account è stato disattivato.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcuni dei tuoi post sono stati contrassegnati come sensibili.",
+  "notification.moderation_warning.action_none": "Il tuo account ha ricevuto un avviso di moderazione.",
+  "notification.moderation_warning.action_sensitive": "I tuoi post d'ora in poi saranno contrassegnati come sensibili.",
+  "notification.moderation_warning.action_silence": "Il tuo account è stato limitato.",
+  "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
  "notification.own_poll": "Il tuo sondaggio è terminato",
  "notification.poll": "Un sondaggio in cui hai votato è terminato",
  "notification.reblog": "{name} ha rebloggato il tuo post",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -298,7 +298,7 @@
  "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": "このサーバー",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -308,13 +308,17 @@
  "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
  "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
  "follow_suggestions.dismiss": "Niet meer weergeven",
-  "follow_suggestions.hints.featured": "Deze gebruiker is geselecteerd door het team van {domain}.",
+  "follow_suggestions.featured_longer": "Handmatig geselecteerd door het team van {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populair onder mensen die je volgt",
+  "follow_suggestions.hints.featured": "Deze gebruiker is handmatig geselecteerd door het team van {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
  "follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
  "follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
  "follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
  "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
  "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+  "follow_suggestions.popular_suggestion_longer": "Populair op {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Vergelijkbaar met accounts die je recentelijk bent gaan volgen",
  "follow_suggestions.view_all": "Alles weergeven",
  "follow_suggestions.who_to_follow": "Wie te volgen",
  "followed_tags": "Gevolgde hashtags",
@ -469,6 +473,15 @@
  "notification.follow": "{name} volgt jou nu",
  "notification.follow_request": "{name} wil jou graag volgen",
  "notification.mention": "{name} vermeldde jou",
+  "notification.moderation-warning.learn_more": "Meer informatie",
+  "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
+  "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
+  "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
+  "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
+  "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
+  "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
+  "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
  "notification.own_poll": "Jouw peiling is beëindigd",
  "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
  "notification.reblog": "{name} boostte jouw bericht",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -468,6 +468,15 @@
  "notification.follow": "{name} fylgde deg",
  "notification.follow_request": "{name} har bedt om å fylgja deg",
  "notification.mention": "{name} nemnde deg",
+  "notification.moderation-warning.learn_more": "Lær meir",
+  "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
+  "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
+  "notification.moderation_warning.action_disable": "Kontoen din har blitt deaktivert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nokre av innlegga dine har blitt markert som sensitive.",
+  "notification.moderation_warning.action_none": "Kontoen din har mottatt ei moderasjonsåtvaring.",
+  "notification.moderation_warning.action_sensitive": "Innlegga dine vil bli markerte som sensitive frå no av.",
+  "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
+  "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
  "notification.own_poll": "Rundspørjinga di er ferdig",
  "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
  "notification.reblog": "{name} framheva innlegget ditt",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
  "follow_suggestions.curated_suggestion": "Wybrane przez personel",
  "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+  "follow_suggestions.featured_longer": "Wybrane przez zespół {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popularni wśród ludzi których obserwujesz",
  "follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
  "follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
  "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
  "follow_suggestions.popular_suggestion": "Sugestia popularna",
+  "follow_suggestions.popular_suggestion_longer": "Popularni na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobne do ostatnio zaobserwowanych przez ciebie profilów",
  "follow_suggestions.view_all": "Pokaż wszystkie",
  "follow_suggestions.who_to_follow": "Kogo obserwować",
  "followed_tags": "Obserwowane hasztagi",
@ -469,6 +473,15 @@
  "notification.follow": "{name} obserwuje Cię",
  "notification.follow_request": "{name} chce cię zaobserwować",
  "notification.mention": "Wspomniało o Tobie przez {name}",
+  "notification.moderation-warning.learn_more": "Dowiedz się więcej",
+  "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
+  "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
+  "notification.moderation_warning.action_disable": "Twoje konto zostało wyłączone.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektóre twoje wpisy zostały oznaczone jako wrażliwe.",
+  "notification.moderation_warning.action_none": "Twoje konto otrzymało ostrzeżenie moderacyjne.",
+  "notification.moderation_warning.action_sensitive": "Twoje wpisy będą od teraz oznaczane jako wrażliwe.",
+  "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
+  "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
  "notification.own_poll": "Twoje głosowanie zakończyło się",
  "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
  "notification.reblog": "Twój post został podbity przez {name}",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -297,6 +297,7 @@
  "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
  "filter_modal.select_filter.title": "Filtrar esta publicação",
  "filter_modal.title.status": "Filtrar uma publicação",
+  "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",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
  "follow_suggestions.curated_suggestion": "Escolha da equipe",
  "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.featured_longer": "Escolhido a dedo pela equipa de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que segue",
  "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
  "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
  "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
  "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
  "follow_suggestions.view_all": "Ver tudo",
  "follow_suggestions.who_to_follow": "Quem seguir",
  "followed_tags": "Hashtags seguidas",
@ -469,6 +473,15 @@
  "notification.follow": "{name} começou a seguir-te",
  "notification.follow_request": "{name} pediu para segui-lo",
  "notification.mention": "{name} mencionou-te",
+  "notification.moderation-warning.learn_more": "Saber mais",
+  "notification.moderation_warning": "Recebeu um aviso de moderação",
+  "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+  "notification.moderation_warning.action_disable": "A sua conta foi desativada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas das suas publicações foram assinaladas como sensíveis.",
+  "notification.moderation_warning.action_none": "A sua conta recebeu um aviso de moderação.",
+  "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
+  "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
  "notification.own_poll": "A sua votação terminou",
  "notification.poll": "Uma votação em que participaste chegou ao fim",
  "notification.reblog": "{name} reforçou a tua publicação",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -468,6 +468,11 @@
  "notification.follow": "{name} följer dig",
  "notification.follow_request": "{name} har begärt att följa dig",
  "notification.mention": "{name} nämnde dig",
+  "notification.moderation-warning.learn_more": "Läs mer",
+  "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
+  "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+  "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
  "notification.own_poll": "Din röstning har avslutats",
  "notification.poll": "En omröstning du röstat i har avslutats",
  "notification.reblog": "{name} boostade ditt inlägg",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
  "follow_suggestions.curated_suggestion": "站务人员精选",
  "follow_suggestions.dismiss": "不再显示",
+  "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
+  "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
  "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
  "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
  "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
  "follow_suggestions.personalized_suggestion": "个性化建议",
  "follow_suggestions.popular_suggestion": "热门建议",
+  "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
+  "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
  "follow_suggestions.view_all": "查看全部",
  "follow_suggestions.who_to_follow": "推荐关注",
  "followed_tags": "关注的话题标签",
@ -469,6 +473,15 @@
  "notification.follow": "{name} 开始关注你",
  "notification.follow_request": "{name} 向你发送了关注请求",
  "notification.mention": "{name} 提及了你",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "你收到了一条管理警告",
+  "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
+  "notification.moderation_warning.action_disable": "你的账号已被禁用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
+  "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
+  "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
+  "notification.moderation_warning.action_silence": "你的账号已被限制。",
+  "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
  "notification.own_poll": "你的投票已经结束",
  "notification.poll": "你参与的一个投票已经结束",
  "notification.reblog": "{name} 转发了你的嘟文",
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@ -297,6 +297,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 {0 位} other {# 位}}你可能認識的人的通知",
  "filtered_notifications_banner.title": "已過濾之通知",
  "firehose.all": "全部",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -308,6 +308,8 @@
  "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
  "follow_suggestions.curated_suggestion": "精選內容",
  "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.featured_longer": "{domain} 團隊精選",
+  "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
  "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
  "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
  "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
@ -315,6 +317,8 @@
  "follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
  "follow_suggestions.personalized_suggestion": "個人化推薦",
  "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.popular_suggestion_longer": "{domain} 上的人氣王",
+  "follow_suggestions.similar_to_recently_followed_longer": "與您近日跟隨相近之帳號",
  "follow_suggestions.view_all": "檢視全部",
  "follow_suggestions.who_to_follow": "推薦跟隨帳號",
  "followed_tags": "已跟隨主題標籤",
@ -469,6 +473,15 @@
  "notification.follow": "{name} 已跟隨您",
  "notification.follow_request": "{name} 要求跟隨您",
  "notification.mention": "{name} 已提到您",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "您已收到管理員警告",
+  "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
+  "notification.moderation_warning.action_disable": "您的帳號已被停用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
+  "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
+  "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將會被標記為敏感內容。",
+  "notification.moderation_warning.action_silence": "您的帳號已被限制。",
+  "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
  "notification.own_poll": "您的投票已結束",
  "notification.poll": "您曾投過的投票已經結束",
  "notification.reblog": "{name} 已轉嘟您的嘟文",
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@ -56,6 +56,7 @@ export const notificationToMap = notification => ImmutableMap({
  status: notification.status ? notification.status.id : null,
  report: notification.report ? fromJS(notification.report) : null,
  event: notification.event ? fromJS(notification.event) : null,
+  moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
 });

 const normalizeNotification = (state, notification, usePendingItems) => {
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -10,6 +10,13 @@ $content-width: 840px;
  width: 100%;
  min-height: 100vh;

+  .icon {
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+    margin: 0 2px;
+  }
+
  .sidebar-wrapper {
    min-height: 100vh;
    overflow: hidden;
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2015,7 +2015,22 @@ a .account__avatar {
  white-space: nowrap;
  display: flex;
  align-items: center;
-  gap: 4px;
+  gap: 8px;
+}
+
+.account__relationship,
+.explore__suggestions__card {
+  .icon-button {
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+    box-sizing: content-box;
+    padding: 5px;
+
+    .icon {
+      width: 24px;
+      height: 24px;
+    }
+  }
 }

 .account-authorize {
@ -2165,7 +2180,8 @@ a.account__display-name {
  }
 }

-.notification__relationships-severance-event {
+.notification__relationships-severance-event,
+.notification__moderation-warning {
  display: flex;
  gap: 16px;
  color: $secondary-text-color;
@ -2952,6 +2968,75 @@ $ui-header-logo-wordmark-width: 99px;
  display: none;
 }

+.explore__suggestions__card {
+  padding: 12px 16px;
+  gap: 8px;
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &__source {
+    padding-inline-start: 60px;
+    font-size: 13px;
+    line-height: 16px;
+    color: $dark-text-color;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  &__body {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    &__main {
+      flex: 1 1 auto;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      min-width: 0;
+
+      &__name-button {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        &__name {
+          display: block;
+          color: inherit;
+          text-decoration: none;
+          flex: 1 1 auto;
+          min-width: 0;
+        }
+
+        .button {
+          min-width: 80px;
+        }
+
+        .display-name {
+          font-size: 15px;
+          line-height: 20px;
+          color: $secondary-text-color;
+
+          strong {
+            font-weight: 700;
+          }
+
+          &__account {
+            color: $darker-text-color;
+            display: block;
+          }
+        }
+      }
+    }
+  }
+}
+
@media screen and (max-width: $no-gap-breakpoint - 1px) {
  .columns-area__panels__pane--compositional {
    display: none;
@ -7281,10 +7366,11 @@ a.status-card {
        content: '';
        position: absolute;
        bottom: -1px;
-        left: 0;
-        width: 100%;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 40px;
        height: 3px;
-        border-radius: 4px;
+        border-radius: 4px 4px 0 0;
        background: $highlight-text-color;
      }
    }
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@ -156,7 +156,7 @@ class LinkDetailsExtractor
  end

  def title
-    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
+    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
  end

  def description
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@ -13,10 +13,12 @@
 #

 class AccountModerationNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 500
+
  belongs_to :account
  belongs_to :target_account, class_name: 'Account'

  scope :latest, -> { reorder('created_at DESC') }

-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
--- a/app/models/account_note.rb
+++ b/app/models/account_note.rb
@ -14,9 +14,11 @@
 class AccountNote < ApplicationRecord
  include RelationshipCacheable

+  COMMENT_SIZE_LIMIT = 2_000
+
  belongs_to :account
  belongs_to :target_account, class_name: 'Account'

  validates :account_id, uniqueness: { scope: :target_account_id }
-  validates :comment, length: { maximum: 2_000 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 end
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@ -52,7 +52,7 @@ class Admin::AccountAction
      process_reports!
    end

-    process_email!
+    process_notification!
    process_queue!
  end

@ -158,8 +158,11 @@ class Admin::AccountAction
    queue_suspension_worker! if type == 'suspend'
  end

-  def process_email!
-    UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, warning.id, 'AccountWarning', 'moderation_warning')
  end

  def warnable?
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@ -65,7 +65,8 @@ class Admin::StatusBatchAction
      statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
    end

-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
+
    RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
  end

@ -101,7 +102,7 @@ class Admin::StatusBatchAction
      text: text
    )

-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
  end

  def handle_report!
@ -127,6 +128,13 @@ class Admin::StatusBatchAction
    !report.nil?
  end

+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, @warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, @warning.id, 'AccountWarning', 'moderation_warning')
+  end
+
  def warnable?
    send_email_notification && target_account.local?
  end
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@ -19,12 +19,14 @@
 class Invite < ApplicationRecord
  include Expireable

+  COMMENT_SIZE_LIMIT = 420
+
  belongs_to :user, inverse_of: :invites
  has_many :users, inverse_of: :invite, dependent: nil

  scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }

-  validates :comment, length: { maximum: 420 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }

  before_validation :set_code

--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@ -57,6 +57,9 @@ class Notification < ApplicationRecord
    severed_relationships: {
      filterable: false,
    }.freeze,
+    moderation_warning: {
+      filterable: false,
+    }.freeze,
    'admin.sign_up': {
      filterable: false,
    }.freeze,
@ -90,6 +93,7 @@ class Notification < ApplicationRecord
    belongs_to :poll, inverse_of: false
    belongs_to :report, inverse_of: false
    belongs_to :account_relationship_severance_event, inverse_of: false
+    belongs_to :account_warning, inverse_of: false
  end

  validates :type, inclusion: { in: TYPES }
@ -180,7 +184,7 @@ class Notification < ApplicationRecord
    return unless new_record?

    case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'AccountWarning'
      self.from_account_id = activity&.account_id
    when 'Mention'
      self.from_account_id = activity&.status&.account_id
--- a/app/models/report.rb
+++ b/app/models/report.rb
@ -26,6 +26,8 @@ class Report < ApplicationRecord
  include Paginable
  include RateLimitable

+  COMMENT_SIZE_LIMIT = 1_000
+
  rate_limit by: :account, family: :reports

  belongs_to :account
@ -46,7 +48,7 @@ class Report < ApplicationRecord
  # A report is considered local if the reporter is local
  delegate :local?, to: :account

-  validates :comment, length: { maximum: 1_000 }, if: :local?
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }, if: :local?
  validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }

  validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@ -13,10 +13,12 @@
 #

 class ReportNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 500
+
  belongs_to :account
  belongs_to :report, inverse_of: :notes, touch: true

  scope :latest, -> { reorder(created_at: :desc) }

-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@ -15,9 +15,11 @@
 class Rule < ApplicationRecord
  include Discard::Model

+  TEXT_SIZE_LIMIT = 300
+
  self.discard_column = :deleted_at

-  validates :text, presence: true, length: { maximum: 300 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }

  scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
 end
--- a/app/models/user_invite_request.rb
+++ b/app/models/user_invite_request.rb
@ -12,6 +12,8 @@
 #

 class UserInviteRequest < ApplicationRecord
+  TEXT_SIZE_LIMIT = 420
+
  belongs_to :user, inverse_of: :invite_request
-  validates :text, presence: true, length: { maximum: 420 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
 end
--- a/app/serializers/rest/account_warning_serializer.rb
+++ b/app/serializers/rest/account_warning_serializer.rb
@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::AccountWarningSerializer < ActiveModel::Serializer
+  attributes :id, :action, :text, :status_ids, :created_at
+
+  has_one :target_account, serializer: REST::AccountSerializer
+  has_one :appeal, serializer: REST::AppealSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def status_ids
+    object&.status_ids&.map(&:to_s)
+  end
+end
--- a/app/serializers/rest/appeal_serializer.rb
+++ b/app/serializers/rest/appeal_serializer.rb
@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::AppealSerializer < ActiveModel::Serializer
+  attributes :text, :state
+
+  def state
+    if object.approved?
+      'approved'
+    elsif object.rejected?
+      'rejected'
+    else
+      'pending'
+    end
+  end
+end
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@ -7,6 +7,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
  belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
  belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
  belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+  belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer

  def id
    object.id.to_s
@ -23,4 +24,8 @@ class REST::NotificationSerializer < ActiveModel::Serializer
  def relationship_severance_event?
    object.type == :severed_relationships
  end
+
+  def moderation_warning_event?
+    object.type == :moderation_warning
+  end
 end
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@ -9,6 +9,7 @@ class NotifyService < BaseService
    update
    poll
    status
+    moderation_warning
    # TODO: this probably warrants an email notification
    severed_relationships
  ).freeze
@ -22,7 +23,7 @@ class NotifyService < BaseService

    def dismiss?
      blocked   = @recipient.unavailable?
-      blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships
+      blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)

      return blocked if message? && from_staff?

@ -75,6 +76,7 @@ class NotifyService < BaseService
      admin.report
      poll
      update
+      account_warning
    ).freeze

    def initialize(notification)
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@ -2,7 +2,7 @@
  .log-entry__header
    .log-entry__avatar
      .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
-        = fa_icon 'warning'
+        = material_symbol 'warning'
    .log-entry__content
      .log-entry__title
        = t(account_warning.action,
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@ -2,14 +2,14 @@
  %th= t('admin.accounts.inbox_url')
  %td
    = account.inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
  %td
    = table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
 %tr
  %th= t('admin.accounts.shared_inbox_url')
  %td
    = account.shared_inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
  %td
    - if domain_block.nil?
      = table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@ -53,19 +53,19 @@
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
        - if @accounts.any?(&:user_pending?)
-          = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
+          = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
                     class: 'table-action-link',
                     data: { confirm: t('admin.reports.are_you_sure') },
                     name: :approve,
                     type: :submit

-          = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
+          = f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
                     class: 'table-action-link',
                     data: { confirm: t('admin.reports.are_you_sure') },
                     name: :reject,
                     type: :submit

-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :suspend,
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@ -20,7 +20,7 @@
              %dd{ title: field.value, class: custom_field_classes(field) }
                - if field.verified?
                  %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
-                    = fa_icon 'check'
+                    = material_symbol 'check'
                = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)

    - if account.note.present?
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@ -48,19 +48,19 @@
        - if params[:local] == '1'
          = f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

-          = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

-          = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

        = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

        = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

        - if can?(:destroy, :custom_emoji)
-          = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

        - if can?(:copy, :custom_emoji) && params[:local] != '1'
-          = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('content_copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }

    - if params[:local] == '1'
      .batch-table__form.simple_form
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@ -57,19 +57,19 @@
  .dashboard__item
    = link_to admin_reports_path, class: 'dashboard__quick-access' do
      %span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'

    = link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
      %span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'

    = link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
      %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'

    = link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
      %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
  .dashboard__item
    = react_admin_component :dimension,
                            dimension: 'sources',
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@ -12,7 +12,7 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]),
+        = f.button safe_join([material_symbol('close'), t('admin.email_domain_blocks.delete')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :delete,
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@ -23,5 +23,5 @@
        = f.object.public_comment
      - if existing_relationships
        ·
-        = fa_icon 'warning fw'
+        = material_symbol 'warning'
        = t('admin.export_domain_blocks.import.existing_relationships_warning')
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@ -12,7 +12,7 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]),
+        = f.button safe_join([material_symbol('content_copy'), t('admin.domain_blocks.import')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :save,
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@ -31,13 +31,13 @@
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
        - if params[:status].blank? && can?(:suppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]),
+          = f.button safe_join([material_symbol('close'), t('admin.follow_recommendations.suppress')]),
                     class: 'table-action-link',
                     data: { confirm: t('admin.reports.are_you_sure') },
                     name: :suppress,
                     type: :submit
        - if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]),
+          = f.button safe_join([material_symbol('add'), t('admin.follow_recommendations.unsuppress')]),
                     class: 'table-action-link',
                     name: :unsuppress,
                     type: :submit
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@ -9,7 +9,7 @@

  - if @instance.persisted?
    %p
-      = fa_icon 'info fw'
+      = material_symbol 'info'
      = t('admin.instances.totals_time_period_hint_html')

    .dashboard
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@ -12,7 +12,7 @@

  - if invite.valid_for_use?
    %td
-      = fa_icon 'user fw'
+      = material_symbol 'person'
      = invite.uses
      = " / #{invite.max_uses}" unless invite.max_uses.nil?
    %td
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@ -14,7 +14,7 @@
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
        - if can?(:destroy, :ip_block)
-          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]),
+          = f.button safe_join([material_symbol('close'), t('admin.ip_blocks.delete')]),
                     class: 'table-action-link',
                     data: { confirm: t('admin.reports.are_you_sure') },
                     name: :delete,
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@ -19,7 +19,7 @@

  .back-link
    = link_to admin_account_path(@account.id) do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
      = t('admin.statuses.back_to_account')

 %hr.spacer/
@ -30,7 +30,7 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :suspend,
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@ -4,7 +4,7 @@
  %td
    - if relay.accepted?
      %span.positive-hint
-        = fa_icon('check')
+        = material_symbol('check')
        &nbsp;
        = t 'admin.relays.enabled'
    - elsif relay.pending?
@ -13,7 +13,7 @@
      = t 'admin.relays.pending'
    - else
      %span.negative-hint
-        = fa_icon('times')
+        = material_symbol('close')
        &nbsp;
        = t 'admin.relays.disabled'
  %td
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@ -16,7 +16,7 @@
          %strong.emojify.p-name= display_name(report.target_account, custom_emojify: true)
        %span
          = acct(report.target_account)
-          = fa_icon('lock') if report.target_account.locked?
+          = material_symbol('lock') if report.target_account.locked?
    - if report.target_account.note.present?
      .account-card__bio.emojify
        = prerender_custom_emojis(account_bio_format(report.target_account), report.target_account.emojis)
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@ -37,5 +37,5 @@
        = t("statuses.visibilities.#{status.visibility}")
      - if status.proper.sensitive?
        ·
-        = fa_icon('eye-slash fw')
+        = material_symbol('visibility_off')
        = t('stream_entries.sensitive_content')
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@ -58,7 +58,7 @@

                  - status.ordered_media_attachments.each do |media_attachment|
                    %abbr{ title: media_attachment.description }
-                      = fa_icon 'link'
+                      = material_symbol 'link'
                      = media_attachment.file_file_name
                .strike-card__statuses-list__item__meta
                  = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@ -41,7 +41,7 @@
 %p
  = t 'admin.reports.statuses_description_html'
  —
-  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]),
+  = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
            admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
            class: 'table-action-link'

@ -52,7 +52,7 @@
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
        - if !@statuses.empty? && @report.unresolved?
-          = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+          = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
    .batch-table__body
      - if @statuses.empty?
        = nothing_here 'nothing-here--under-tabs'
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@ -2,7 +2,7 @@
  - if can?(:update, role)
    = link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
      %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'

        - if role.everyone?
          = t('admin.roles.everyone')
@ -11,7 +11,7 @@
  - else
    %span.announcements-list__item__title
      %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'

        - if role.everyone?
          = t('admin.roles.everyone')
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@ -3,7 +3,7 @@
    :ruby
      primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
      primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
-      primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+      primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
      primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
      primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
      primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@ -26,5 +26,5 @@

        - if status_edit.sensitive?
          ·
-          = fa_icon('eye-slash fw')
+          = material_symbol('visibility_off')
          = t('stream_entries.sensitive_content')
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@ -12,11 +12,11 @@
  .back-link
    - if params[:report_id]
      = link_to admin_report_path(params[:report_id].to_i) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
        = t('admin.statuses.back_to_report')
    - else
      = link_to admin_account_path(@account.id) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
        = t('admin.statuses.back_to_account')

 %hr.spacer/
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@ -52,26 +52,26 @@
      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
        - if @tag.usable?
          %span= t('admin.trends.tags.usable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
        - else
          %span= t('admin.trends.tags.not_usable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'

      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
        - if @tag.trendable?
          %span= t('admin.trends.tags.trendable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
        - else
          %span= t('admin.trends.tags.not_trendable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'

      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
        - if @tag.listable?
          %span= t('admin.trends.tags.listable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
        - else
          %span= t('admin.trends.tags.not_listable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'

  %hr.spacer/

--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@ -24,7 +24,7 @@
    .back-link
      = link_to admin_trends_links_preview_card_providers_path do
        = t('admin.trends.preview_card_providers.title')
-        = fa_icon 'chevron-right fw'
+        = material_symbol 'chevron_right'

 = form_for(@form, url: batch_admin_trends_links_path) do |f|
  = hidden_field_tag :page, params[:page] || 1
@ -37,22 +37,22 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve,
                   type: :submit
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve_providers,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject_providers,
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@ -15,7 +15,7 @@
      %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
  .back-link
    = link_to admin_trends_links_path do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
      = t('admin.trends.links.title')

 %hr.spacer/
@ -31,12 +31,12 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject,
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@ -11,7 +11,7 @@

        - status.ordered_media_attachments.each do |media_attachment|
          %abbr{ title: media_attachment.description }
-            = fa_icon 'link'
+            = material_symbol 'link'
            = media_attachment.file_file_name

    = t 'admin.trends.statuses.shared_by',
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@ -31,22 +31,22 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve,
                   type: :submit
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve_accounts,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject_accounts,
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@ -5,7 +5,7 @@
  .batch-table__row__content.pending-account
    .pending-account__header
      = link_to admin_tag_path(tag.id) do
-        = fa_icon 'hashtag'
+        = material_symbol 'tag'
        = tag.display_name

      %br/
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@ -25,12 +25,12 @@
      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :approve,
                   type: :submit
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
                   class: 'table-action-link',
                   data: { confirm: t('admin.reports.are_you_sure') },
                   name: :reject,
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@ -1,7 +1,7 @@
 <%= raw t('admin_mailer.new_critical_software_updates.body') %>

 <% @software_updates.each do |update| %>
- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
 <% end %>

 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@ -1,7 +1,7 @@
 <%= raw t('admin_mailer.new_software_updates.body') %>

 <% @software_updates.each do |update| %>
- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
 <% end %>

 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
--- a/config/initializers/propshaft.rb
+++ b/config/initializers/propshaft.rb
@ -1,3 +1,7 @@
 # frozen_string_literal: true

+# SVG icons
 Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')
+
+# Material Design icons
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'material-icons')
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -1046,7 +1046,7 @@ de:
    apply_for_account: Konto beantragen
    captcha_confirmation:
      help_html: Falls du Probleme beim Lösen des CAPTCHA hast, dann kannst uns über %{email} kontaktieren und wir werden versuchen, dir zu helfen.
-      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Weiter“.
+      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Fortfahren“.
      title: Sicherheitsüberprüfung
    confirmations:
      awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
@ -1449,7 +1449,7 @@ de:
      cooldown: Nach dem Umzug wird es eine Weile dauern, bis du erneut umziehen darfst
      disabled_account: Dein altes Konto ist nur noch eingeschränkt nutzbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
      followers: Alle Follower werden vom alten zum neuen Konto übertragen
-      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Profil</a> einrichten, ohne die Follower zu übertragen.
+      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Konto</a> einrichten, ohne die Follower zu übertragen.
      other_data: Keine anderen Daten werden automatisch zum neuen Konto übertragen
      redirect: Dein altes Konto wird einen Hinweis erhalten, dass du umgezogen bist. Außerdem wird das Profil von Suchanfragen ausgeschlossen
  moderation:
@ -1845,7 +1845,7 @@ de:
        mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen
        none: Warnung für %{acct}
        sensitive: Deine Beiträge von %{acct} werden künftig mit einer Inhaltswarnung versehen
-        silence: Dein Konto %{acct} wurde stummgeschaltet
+        silence: Dein Konto %{acct} wurde eingeschränkt
        suspend: Dein Konto %{acct} wurde gesperrt
      title:
        delete_statuses: Beiträge entfernt
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@ -25,7 +25,7 @@ de:
        explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mail-Adresse beworben. Sobald du deine E-Mail-Adresse bestätigt hast, werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt – von dir ist keine weitere Handlung notwendig. Wenn du das nicht warst, dann kannst du diese E-Mail ignorieren.
        extra_html: Bitte beachte auch die <a href="%{terms_path}">Serverregeln</a> und <a href="%{policy_path}">unsere Datenschutzerklärung</a>.
        subject: 'Mastodon: Anleitung zum Bestätigen deines Kontos auf %{instance}'
-        title: Verifiziere E-Mail-Adresse
+        title: Verifiziere deine E-Mail-Adresse
      email_changed:
        explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
--- a/Show more
+++ b/Show more
 @ -1 +1 @@
 .2.3
 .2.4