Merge branch 'main' into patch-1

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.75.1.
+# using RuboCop version 1.75.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -58,12 +58,6 @@ Style/FormatStringToken:
 Style/GuardClause:
   Enabled: false
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/HashTransformValues:
-  Exclude:
-    - 'app/serializers/rest/web_push_subscription_serializer.rb'
-    - 'app/services/import_service.rb'
-
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:

.ruby-version

@@ -1 +1 @@
-3.4.2
+3.4.3

Dockerfile

@@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.4.2"
+ARG RUBY_VERSION="3.4.3"
 # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="22"

FEDERATION.md

@@ -13,6 +13,7 @@
 - [FEP-f1d5: NodeInfo in Fediverse Software](https://codeberg.org/fediverse/fep/src/branch/main/fep/f1d5/fep-f1d5.md)
 - [FEP-8fcf: Followers collection synchronization across servers](https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md)
 - [FEP-5feb: Search indexing consent for actors](https://codeberg.org/fediverse/fep/src/branch/main/fep/5feb/fep-5feb.md)
+- [FEP-044f: Consent-respecting quote posts](https://codeberg.org/fediverse/fep/src/branch/main/fep/044f/fep-044f.md): partial support for incoming quote-posts
 
 ## ActivityPub in Mastodon
 

Gemfile.lock

@@ -94,7 +94,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1080.0)
+    aws-partitions (1.1087.0)
     aws-sdk-core (3.215.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -120,7 +120,7 @@ GEM
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
     bigdecimal (3.1.9)
-    bindata (2.5.0)
+    bindata (2.5.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
     blurhash (0.1.8)
@@ -160,7 +160,7 @@ GEM
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.1)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -170,7 +170,7 @@ GEM
     crass (1.0.6)
     css_parser (1.21.1)
       addressable
-    csv (3.3.3)
+    csv (3.3.4)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
@@ -201,7 +201,7 @@ GEM
     domain_name (0.6.20240107)
     doorkeeper (5.8.2)
       railties (>= 5)
-    dotenv (3.1.7)
+    dotenv (3.1.8)
     drb (2.2.1)
     elasticsearch (7.17.11)
       elasticsearch-api (= 7.17.11)
@@ -227,7 +227,7 @@ GEM
     fabrication (2.31.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.2)
+    faraday (2.13.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -239,7 +239,7 @@ GEM
       net-http (>= 0.5.0)
     fast_blank (1.0.1)
     fastimage (2.4.0)
-    ffi (1.17.1)
+    ffi (1.17.2)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -426,7 +426,7 @@ GEM
     mime-types (3.6.2)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0402)
+    mime-types-data (3.2025.0408)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.5)
@@ -495,6 +495,8 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
+    opentelemetry-helpers-sql (0.1.1)
+      opentelemetry-api (~> 1.0)
     opentelemetry-helpers-sql-obfuscation (0.3.0)
       opentelemetry-common (~> 0.21)
     opentelemetry-instrumentation-action_mailer (0.4.0)
@@ -548,8 +550,9 @@ GEM
     opentelemetry-instrumentation-net_http (0.23.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-pg (0.30.0)
+    opentelemetry-instrumentation-pg (0.30.1)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-rack (0.26.0)
@@ -585,8 +588,8 @@ GEM
     ostruct (0.6.1)
     ox (2.14.22)
       bigdecimal (>= 3.0)
-    parallel (1.26.3)
+    parallel (1.27.0)
-    parser (3.3.7.4)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -751,7 +754,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -1085,4 +1088,4 @@ RUBY VERSION
    ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.7
+   2.6.8

app/controllers/api/v1/accounts/endorsements_controller.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::EndorsementsController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
+  before_action :require_user!, except: :index
+  before_action :set_account
+  before_action :set_endorsed_accounts, only: :index
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    cache_if_unauthenticated!
+    render json: @endorsed_accounts, each_serializer: REST::AccountSerializer
+  end
+
+  def create
+    AccountPin.find_or_create_by!(account: current_account, target_account: @account)
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
+  end
+
+  def destroy
+    pin = AccountPin.find_by(account: current_account, target_account: @account)
+    pin&.destroy!
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+
+  def set_endorsed_accounts
+    @endorsed_accounts = @account.unavailable? ? [] : paginated_endorsed_accounts
+  end
+
+  def paginated_endorsed_accounts
+    @account.endorsed_accounts.without_suspended.includes(:account_stat, :user).paginate_by_max_id(
+      limit_param(DEFAULT_ACCOUNTS_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def relationships_presenter
+    AccountRelationshipsPresenter.new([@account], current_user.account_id)
+  end
+
+  def next_path
+    api_v1_account_endorsements_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_account_endorsements_url pagination_params(since_id: pagination_since_id) unless @endorsed_accounts.empty?
+  end
+
+  def pagination_collection
+    @endorsed_accounts
+  end
+
+  def records_continue?
+    @endorsed_accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+end

app/controllers/api/v1/accounts/featured_tags_controller.rb

@@ -17,6 +17,6 @@ class Api::V1::Accounts::FeaturedTagsController < Api::BaseController
   end
 
   def set_featured_tags
-    @featured_tags = @account.suspended? ? [] : @account.featured_tags
+    @featured_tags = @account.unavailable? ? [] : @account.featured_tags
   end
 end

app/controllers/api/v1/accounts/pins_controller.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Accounts::PinsController < Api::BaseController
-  include Authorization
-
-  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
-  before_action :require_user!
-  before_action :set_account
-
-  def create
-    AccountPin.find_or_create_by!(account: current_account, target_account: @account)
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
-  end
-
-  def destroy
-    pin = AccountPin.find_by(account: current_account, target_account: @account)
-    pin&.destroy!
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
-  end
-
-  private
-
-  def set_account
-    @account = Account.find(params[:account_id])
-  end
-
-  def relationships_presenter
-    AccountRelationshipsPresenter.new([@account], current_user.account_id)
-  end
-end

app/controllers/api/v1/lists_controller.rb

@@ -7,10 +7,6 @@ class Api::V1::ListsController < Api::BaseController
   before_action :require_user!
   before_action :set_list, except: [:index, :create]
 
-  rescue_from ArgumentError do |e|
-    render json: { error: e.to_s }, status: 422
-  end
-
   def index
     @lists = List.where(account: current_account).all
     render json: @lists, each_serializer: REST::ListSerializer

app/javascript/mastodon/actions/accounts_typed.ts

@@ -1,7 +1,9 @@
 import { createAction } from '@reduxjs/toolkit';
 
+import { apiRemoveAccountFromFollowers } from 'mastodon/api/accounts';
 import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
 export const revealAccount = createAction<{
   id: string;
@@ -95,3 +97,10 @@ export const fetchRelationshipsSuccess = createAction(
   'relationships/fetch/SUCCESS',
   actionWithSkipLoadingTrue<{ relationships: ApiRelationshipJSON[] }>,
 );
+
+export const removeAccountFromFollowers = createDataLoadingThunk(
+  'accounts/remove_from_followers',
+  ({ accountId }: { accountId: string }) =>
+    apiRemoveAccountFromFollowers(accountId),
+  (relationship) => ({ relationship }),
+);

app/javascript/mastodon/api/accounts.ts

@@ -18,3 +18,8 @@ export const apiFollowAccount = (
 
 export const apiUnfollowAccount = (id: string) =>
   apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/unfollow`);
+
+export const apiRemoveAccountFromFollowers = (id: string) =>
+  apiRequestPost<ApiRelationshipJSON>(
+    `v1/accounts/${id}/remove_from_followers`,
+  );

app/javascript/mastodon/components/dropdown_menu.tsx

@@ -71,6 +71,8 @@ type RenderItemFn<Item = MenuItem> = (
   },
 ) => React.ReactNode;
 
+type ItemClickFn<Item = MenuItem> = (item: Item, index: number) => void;
+
 type RenderHeaderFn<Item = MenuItem> = (items: Item[]) => React.ReactNode;
 
 interface DropdownMenuProps<Item = MenuItem> {
@@ -81,10 +83,10 @@ interface DropdownMenuProps<Item = MenuItem> {
   openedViaKeyboard: boolean;
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
-  onItemClick: (e: React.MouseEvent | React.KeyboardEvent) => void;
+  onItemClick?: ItemClickFn<Item>;
 }
 
-const DropdownMenu = <Item = MenuItem,>({
+export const DropdownMenu = <Item = MenuItem,>({
   items,
   loading,
   scrollable,
@@ -176,20 +178,35 @@ const DropdownMenu = <Item = MenuItem,>({
     [],
   );
 
+  const handleItemClick = useCallback(
+    (e: React.MouseEvent | React.KeyboardEvent) => {
+      const i = Number(e.currentTarget.getAttribute('data-index'));
+      const item = items?.[i];
+
+      onClose();
+
+      if (!item) {
+        return;
+      }
+
+      if (typeof onItemClick === 'function') {
+        e.preventDefault();
+        onItemClick(item, i);
+      } else if (isActionItem(item)) {
+        e.preventDefault();
+        item.action();
+      }
+    },
+    [onClose, onItemClick, items],
+  );
+
   const handleItemKeyUp = useCallback(
     (e: React.KeyboardEvent) => {
       if (e.key === 'Enter' || e.key === ' ') {
-        onItemClick(e);
+        handleItemClick(e);
       }
     },
-    [onItemClick],
+    [handleItemClick],
-  );
-
-  const handleClick = useCallback(
-    (e: React.MouseEvent | React.KeyboardEvent) => {
-      onItemClick(e);
-    },
-    [onItemClick],
   );
 
   const nativeRenderItem = (option: Item, i: number) => {
@@ -209,7 +226,7 @@ const DropdownMenu = <Item = MenuItem,>({
       element = (
         <button
           ref={i === 0 ? handleFocusedItemRef : undefined}
-          onClick={handleClick}
+          onClick={handleItemClick}
           onKeyUp={handleItemKeyUp}
           data-index={i}
         >
@@ -224,7 +241,7 @@ const DropdownMenu = <Item = MenuItem,>({
           data-method={option.method}
           rel='noopener'
           ref={i === 0 ? handleFocusedItemRef : undefined}
-          onClick={handleClick}
+          onClick={handleItemClick}
           onKeyUp={handleItemKeyUp}
           data-index={i}
         >
@@ -236,7 +253,7 @@ const DropdownMenu = <Item = MenuItem,>({
         <Link
           to={option.to}
           ref={i === 0 ? handleFocusedItemRef : undefined}
-          onClick={handleClick}
+          onClick={handleItemClick}
           onKeyUp={handleItemKeyUp}
           data-index={i}
         >
@@ -282,7 +299,7 @@ const DropdownMenu = <Item = MenuItem,>({
         >
           {items.map((option, i) =>
             renderItemMethod(option, i, {
-              onClick: handleClick,
+              onClick: handleItemClick,
               onKeyUp: handleItemKeyUp,
             }),
           )}
@@ -306,7 +323,7 @@ interface DropdownProps<Item = MenuItem> {
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
   onOpen?: () => void;
-  onItemClick?: (arg0: Item, arg1: number) => void;
+  onItemClick?: ItemClickFn<Item>;
 }
 
 const offset = [5, 5] as OffsetValue;
@@ -354,6 +371,28 @@ export const Dropdown = <Item = MenuItem,>({
     dispatch(closeDropdownMenu({ id: currentId }));
   }, [dispatch, currentId]);
 
+  const handleItemClick = useCallback(
+    (e: React.MouseEvent | React.KeyboardEvent) => {
+      const i = Number(e.currentTarget.getAttribute('data-index'));
+      const item = items?.[i];
+
+      handleClose();
+
+      if (!item) {
+        return;
+      }
+
+      if (typeof onItemClick === 'function') {
+        e.preventDefault();
+        onItemClick(item, i);
+      } else if (isActionItem(item)) {
+        e.preventDefault();
+        item.action();
+      }
+    },
+    [handleClose, onItemClick, items],
+  );
+
   const handleClick = useCallback(
     (e: React.MouseEvent | React.KeyboardEvent) => {
       const { type } = e;
@@ -374,7 +413,7 @@ export const Dropdown = <Item = MenuItem,>({
               modalProps: {
                 status,
                 actions: items,
-                onClick: onItemClick,
+                onClick: handleItemClick,
               },
             }),
           );
@@ -394,7 +433,7 @@ export const Dropdown = <Item = MenuItem,>({
       currentId,
       scrollKey,
       onOpen,
-      onItemClick,
+      handleItemClick,
       open,
       status,
       items,
@@ -434,28 +473,6 @@ export const Dropdown = <Item = MenuItem,>({
     [handleClick],
   );
 
-  const handleItemClick = useCallback(
-    (e: React.MouseEvent | React.KeyboardEvent) => {
-      const i = Number(e.currentTarget.getAttribute('data-index'));
-      const item = items?.[i];
-
-      handleClose();
-
-      if (!item) {
-        return;
-      }
-
-      if (typeof onItemClick === 'function') {
-        e.preventDefault();
-        onItemClick(item, i);
-      } else if (isActionItem(item)) {
-        e.preventDefault();
-        item.action();
-      }
-    },
-    [handleClose, onItemClick, items],
-  );
-
   useEffect(() => {
     return () => {
       if (currentId === openDropdownId) {
@@ -521,7 +538,7 @@ export const Dropdown = <Item = MenuItem,>({
                 openedViaKeyboard={openedViaKeyboard}
                 renderItem={renderItem}
                 renderHeader={renderHeader}
-                onItemClick={handleItemClick}
+                onItemClick={onItemClick}
               />
             </div>
           </div>

app/javascript/mastodon/components/edited_timestamp/index.tsx

@@ -36,11 +36,11 @@ export const EditedTimestamp: React.FC<{
   }, [dispatch, statusId]);
 
   const handleItemClick = useCallback(
-    (_item: HistoryItem, i: number) => {
+    (_item: HistoryItem, index: number) => {
       dispatch(
         openModal({
           modalType: 'COMPARE_HISTORY',
-          modalProps: { index: i, statusId },
+          modalProps: { index, statusId },
         }),
       );
     },

app/javascript/mastodon/components/hashtag_bar.tsx

@@ -20,6 +20,7 @@ export type StatusLike = Record<{
   contentHTML: string;
   media_attachments: List<unknown>;
   spoiler_text?: string;
+  account: Record<{ id: string }>;
 }>;
 
 function normalizeHashtag(hashtag: string) {
@@ -195,13 +196,19 @@ export function getHashtagBarForStatus(status: StatusLike) {
 
   return {
     statusContentProps,
-    hashtagBar: <HashtagBar hashtags={hashtagsInBar} />,
+    hashtagBar: (
+      <HashtagBar
+        hashtags={hashtagsInBar}
+        accountId={status.getIn(['account', 'id']) as string}
+      />
+    ),
   };
 }
 
 const HashtagBar: React.FC<{
   hashtags: string[];
-}> = ({ hashtags }) => {
+  accountId: string;
+}> = ({ hashtags, accountId }) => {
   const [expanded, setExpanded] = useState(false);
   const handleClick = useCallback(() => {
     setExpanded(true);
@@ -218,7 +225,11 @@ const HashtagBar: React.FC<{
   return (
     <div className='hashtag-bar'>
       {revealedHashtags.map((hashtag) => (
-        <Link key={hashtag} to={`/tags/${hashtag}`}>
+        <Link
+          key={hashtag}
+          to={`/tags/${hashtag}`}
+          data-menu-hashtag={accountId}
+        >
           #<span>{hashtag}</span>
         </Link>
       ))}

app/javascript/mastodon/components/status_action_bar.jsx

@@ -274,10 +274,9 @@ class StatusActionBar extends ImmutablePureComponent {
 
       if (writtenByMe && pinnableStatus) {
         menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
+        menu.push(null);
       }
 
-      menu.push(null);
-
       if (writtenByMe || withDismiss) {
         menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
         menu.push(null);

app/javascript/mastodon/components/status_content.jsx

@@ -115,6 +115,7 @@ class StatusContent extends PureComponent {
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
         link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
+        link.setAttribute('data-menu-hashtag', this.props.status.getIn(['account', 'id']));
       } else {
         link.setAttribute('title', link.href);
         link.classList.add('unhandled-link');

app/javascript/mastodon/features/account_featured/components/empty_message.tsx

@@ -1,6 +1,9 @@
 import { FormattedMessage } from 'react-intl';
 
+import { useParams } from 'react-router';
+
 import { LimitedAccountHint } from 'mastodon/features/account_timeline/components/limited_account_hint';
+import { me } from 'mastodon/initial_state';
 
 interface EmptyMessageProps {
   suspended: boolean;
@@ -15,13 +18,21 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
   hidden,
   blockedBy,
 }) => {
+  const { acct } = useParams<{ acct?: string }>();
   if (!accountId) {
     return null;
   }
 
   let message: React.ReactNode = null;
 
-  if (suspended) {
+  if (me === accountId) {
+    message = (
+      <FormattedMessage
+        id='empty_column.account_featured.me'
+        defaultMessage='You have not featured anything yet. Did you know that you can feature your posts, hashtags you use the most, and even your friend’s accounts on your profile?'
+      />
+    );
+  } else if (suspended) {
     message = (
       <FormattedMessage
         id='empty_column.account_suspended'
@@ -37,11 +48,19 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
         defaultMessage='Profile unavailable'
       />
     );
+  } else if (acct) {
+    message = (
+      <FormattedMessage
+        id='empty_column.account_featured.other'
+        defaultMessage='{acct} has not featured anything yet. Did you know that you can feature your posts, hashtags you use the most, and even your friend’s accounts on your profile?'
+        values={{ acct }}
+      />
+    );
   } else {
     message = (
       <FormattedMessage
-        id='empty_column.account_featured'
+        id='empty_column.account_featured_other.unknown'
-        defaultMessage='This list is empty'
+        defaultMessage='This account has not featured anything yet.'
       />
     );
   }

app/javascript/mastodon/features/account_featured/components/featured_tag.tsx

@@ -42,6 +42,7 @@ export const FeaturedTag: React.FC<FeaturedTagProps> = ({ tag, account }) => {
               date: intl.formatDate(tag.get('last_status_at') ?? '', {
                 month: 'short',
                 day: '2-digit',
+                year: 'numeric',
               }),
             })
           : intl.formatMessage(messages.empty)

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -18,6 +18,7 @@ import {
   unmuteAccount,
   pinAccount,
   unpinAccount,
+  removeAccountFromFollowers,
 } from 'mastodon/actions/accounts';
 import { initBlockModal } from 'mastodon/actions/blocks';
 import { mentionCompose, directCompose } from 'mastodon/actions/compose';
@@ -62,18 +63,6 @@ import { MemorialNote } from './memorial_note';
 import { MovedNote } from './moved_note';
 
 const messages = defineMessages({
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
-  mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
-  cancel_follow_request: {
-    id: 'account.cancel_follow_request',
-    defaultMessage: 'Withdraw follow request',
-  },
-  requested: {
-    id: 'account.requested',
-    defaultMessage: 'Awaiting approval. Click to cancel follow request',
-  },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
   linkVerifiedOn: {
@@ -164,6 +153,23 @@ const messages = defineMessages({
     id: 'account.open_original_page',
     defaultMessage: 'Open original page',
   },
+  removeFromFollowers: {
+    id: 'account.remove_from_followers',
+    defaultMessage: 'Remove {name} from followers',
+  },
+  confirmRemoveFromFollowersTitle: {
+    id: 'confirmations.remove_from_followers.title',
+    defaultMessage: 'Remove follower?',
+  },
+  confirmRemoveFromFollowersMessage: {
+    id: 'confirmations.remove_from_followers.message',
+    defaultMessage:
+      '{name} will stop following you. Are you sure you want to proceed?',
+  },
+  confirmRemoveFromFollowersButton: {
+    id: 'confirmations.remove_from_followers.confirm',
+    defaultMessage: 'Remove follower',
+  },
 });
 
 const titleFromAccount = (account: Account) => {
@@ -495,9 +501,7 @@ export const AccountHeader: React.FC<{
 
         arr.push({
           text: intl.formatMessage(
-            account.getIn(['relationship', 'endorsed'])
+            relationship.endorsed ? messages.unendorse : messages.endorse,
-              ? messages.unendorse
-              : messages.endorse,
           ),
           action: handleEndorseToggle,
         });
@@ -508,6 +512,39 @@ export const AccountHeader: React.FC<{
         arr.push(null);
       }
 
+      if (relationship?.followed_by) {
+        const handleRemoveFromFollowers = () => {
+          dispatch(
+            openModal({
+              modalType: 'CONFIRM',
+              modalProps: {
+                title: intl.formatMessage(
+                  messages.confirmRemoveFromFollowersTitle,
+                ),
+                message: intl.formatMessage(
+                  messages.confirmRemoveFromFollowersMessage,
+                  { name: <strong>{account.acct}</strong> },
+                ),
+                confirm: intl.formatMessage(
+                  messages.confirmRemoveFromFollowersButton,
+                ),
+                onConfirm: () => {
+                  void dispatch(removeAccountFromFollowers({ accountId }));
+                },
+              },
+            }),
+          );
+        };
+
+        arr.push({
+          text: intl.formatMessage(messages.removeFromFollowers, {
+            name: account.username,
+          }),
+          action: handleRemoveFromFollowers,
+          dangerous: true,
+        });
+      }
+
       if (relationship?.muting) {
         arr.push({
           text: intl.formatMessage(messages.unmute, {
@@ -606,6 +643,8 @@ export const AccountHeader: React.FC<{
 
     return arr;
   }, [
+    dispatch,
+    accountId,
     account,
     relationship,
     permissions,
@@ -637,29 +676,65 @@ export const AccountHeader: React.FC<{
 
   const info: React.ReactNode[] = [];
 
-  if (me !== account.id && relationship?.blocking) {
+  if (me !== account.id && relationship) {
-    info.push(
+    if (
-      <span key='blocked' className='relationship-tag'>
+      relationship.followed_by &&
-        <FormattedMessage id='account.blocked' defaultMessage='Blocked' />
+      (relationship.following || relationship.requested)
-      </span>,
+    ) {
-    );
+      info.push(
-  }
+        <span key='mutual' className='relationship-tag'>
+          <FormattedMessage
+            id='account.mutual'
+            defaultMessage='You follow each other'
+          />
+        </span>,
+      );
+    } else if (relationship.followed_by) {
+      info.push(
+        <span key='followed_by' className='relationship-tag'>
+          <FormattedMessage
+            id='account.follows_you'
+            defaultMessage='Follows you'
+          />
+        </span>,
+      );
+    } else if (relationship.requested_by) {
+      info.push(
+        <span key='requested_by' className='relationship-tag'>
+          <FormattedMessage
+            id='account.requests_to_follow_you'
+            defaultMessage='Requests to follow you'
+          />
+        </span>,
+      );
+    }
 
-  if (me !== account.id && relationship?.muting) {
+    if (relationship.blocking) {
-    info.push(
+      info.push(
-      <span key='muted' className='relationship-tag'>
+        <span key='blocking' className='relationship-tag'>
-        <FormattedMessage id='account.muted' defaultMessage='Muted' />
+          <FormattedMessage id='account.blocking' defaultMessage='Blocking' />
-      </span>,
+        </span>,
-    );
+      );
-  } else if (me !== account.id && relationship?.domain_blocking) {
+    }
-    info.push(
+
-      <span key='domain_blocked' className='relationship-tag'>
+    if (relationship.muting) {
-        <FormattedMessage
+      info.push(
-          id='account.domain_blocked'
+        <span key='muting' className='relationship-tag'>
-          defaultMessage='Domain blocked'
+          <FormattedMessage id='account.muting' defaultMessage='Muting' />
-        />
+        </span>,
-      </span>,
+      );
-    );
+    }
+
+    if (relationship.domain_blocking) {
+      info.push(
+        <span key='domain_blocking' className='relationship-tag'>
+          <FormattedMessage
+            id='account.domain_blocking'
+            defaultMessage='Blocking domain'
+          />
+        </span>,
+      );
+    }
   }
 
   if (relationship?.requested || relationship?.following) {
@@ -746,7 +821,7 @@ export const AccountHeader: React.FC<{
     badges.push(<GroupBadge key='group-badge' />);
   }
 
-  account.get('roles', []).forEach((role) => {
+  account.roles.forEach((role) => {
     badges.push(
       <Badge
         key={`role-badge-${role.get('id')}`}

app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx

@@ -0,0 +1,157 @@
+import { useEffect, useRef, useState, useCallback, useMemo } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import { useLocation } from 'react-router-dom';
+
+import Overlay from 'react-overlays/Overlay';
+import type {
+  OffsetValue,
+  UsePopperOptions,
+} from 'react-overlays/esm/usePopper';
+
+import { DropdownMenu } from 'mastodon/components/dropdown_menu';
+import { useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+  browseHashtag: {
+    id: 'hashtag.browse',
+    defaultMessage: 'Browse posts in #{hashtag}',
+  },
+  browseHashtagFromAccount: {
+    id: 'hashtag.browse_from_account',
+    defaultMessage: 'Browse posts from @{name} in #{hashtag}',
+  },
+  muteHashtag: { id: 'hashtag.mute', defaultMessage: 'Mute #{hashtag}' },
+});
+
+const offset = [5, 5] as OffsetValue;
+const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
+
+const isHashtagLink = (
+  element: HTMLAnchorElement | null,
+): element is HTMLAnchorElement => {
+  if (!element) {
+    return false;
+  }
+
+  return element.matches('[data-menu-hashtag]');
+};
+
+interface TargetParams {
+  hashtag?: string;
+  accountId?: string;
+}
+
+export const HashtagMenuController: React.FC = () => {
+  const intl = useIntl();
+  const [open, setOpen] = useState(false);
+  const [{ accountId, hashtag }, setTargetParams] = useState<TargetParams>({});
+  const targetRef = useRef<HTMLAnchorElement | null>(null);
+  const location = useLocation();
+  const account = useAppSelector((state) =>
+    accountId ? state.accounts.get(accountId) : undefined,
+  );
+
+  useEffect(() => {
+    setOpen(false);
+    targetRef.current = null;
+  }, [setOpen, location]);
+
+  useEffect(() => {
+    const handleClick = (e: MouseEvent) => {
+      const target = (e.target as HTMLElement).closest('a');
+
+      if (e.button !== 0 || e.ctrlKey || e.metaKey) {
+        return;
+      }
+
+      if (!isHashtagLink(target)) {
+        return;
+      }
+
+      const hashtag = target.text.replace(/^#/, '');
+      const accountId = target.getAttribute('data-menu-hashtag');
+
+      if (!hashtag || !accountId) {
+        return;
+      }
+
+      e.preventDefault();
+      e.stopPropagation();
+      targetRef.current = target;
+      setOpen(true);
+      setTargetParams({ hashtag, accountId });
+    };
+
+    document.addEventListener('click', handleClick, { capture: true });
+
+    return () => {
+      document.removeEventListener('click', handleClick);
+    };
+  }, [setTargetParams, setOpen]);
+
+  const handleClose = useCallback(() => {
+    setOpen(false);
+    targetRef.current = null;
+  }, [setOpen]);
+
+  const menu = useMemo(
+    () => [
+      {
+        text: intl.formatMessage(messages.browseHashtag, {
+          hashtag,
+        }),
+        to: `/tags/${hashtag}`,
+      },
+      {
+        text: intl.formatMessage(messages.browseHashtagFromAccount, {
+          hashtag,
+          name: account?.username,
+        }),
+        to: `/@${account?.acct}/tagged/${hashtag}`,
+      },
+      null,
+      {
+        text: intl.formatMessage(messages.muteHashtag, {
+          hashtag,
+        }),
+        href: '/filters',
+        dangerous: true,
+      },
+    ],
+    [intl, hashtag, account],
+  );
+
+  if (!open) {
+    return null;
+  }
+
+  return (
+    <Overlay
+      show={open}
+      offset={offset}
+      placement='bottom'
+      flip
+      target={targetRef}
+      popperConfig={popperConfig}
+    >
+      {({ props, arrowProps, placement }) => (
+        <div {...props}>
+          <div className={`dropdown-animation dropdown-menu ${placement}`}>
+            <div
+              className={`dropdown-menu__arrow ${placement}`}
+              {...arrowProps}
+            />
+
+            <DropdownMenu
+              items={menu}
+              onClose={handleClose}
+              openedViaKeyboard={false}
+            />
+          </div>
+        </div>
+      )}
+    </Overlay>
+  );
+};

app/javascript/mastodon/features/ui/index.jsx

@@ -31,6 +31,7 @@ import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding
 import BundleColumnError from './components/bundle_column_error';
 import Header from './components/header';
 import { UploadArea } from './components/upload_area';
+import { HashtagMenuController } from './components/hashtag_menu_controller';
 import ColumnsAreaContainer from './containers/columns_area_container';
 import LoadingBarContainer from './containers/loading_bar_container';
 import ModalContainer from './containers/modal_container';
@@ -611,6 +612,7 @@ class UI extends PureComponent {
           {layout !== 'mobile' && <PictureInPicture />}
           <AlertsController />
           {!disableHoverCards && <HoverCardController />}
+          <HashtagMenuController />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />

app/javascript/mastodon/locales/af.json

@@ -18,7 +18,6 @@
   "account.blocked": "Geblokkeer",
   "account.cancel_follow_request": "Herroep volgversoek",
   "account.disable_notifications": "Hou op om my van @{name} se plasings te laat weet",
-  "account.domain_blocked": "Domein geblokkeer",
   "account.edit_profile": "Redigeer profiel",
   "account.enable_notifications": "Laat weet my wanneer @{name} iets plaas",
   "account.endorse": "Toon op profiel",

app/javascript/mastodon/locales/an.json

@@ -19,13 +19,11 @@
   "account.blocked": "Blocau",
   "account.cancel_follow_request": "Retirar solicitut de seguimiento",
   "account.disable_notifications": "Deixar de notificar-me quan @{name} publique bella cosa",
-  "account.domain_blocked": "Dominio blocau",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificar-me quan @{name} publique bella cosa",
   "account.endorse": "Amostrar en perfil",
   "account.featured_tags.last_status_at": "Zaguera publicación lo {date}",
   "account.featured_tags.last_status_never": "Sin publicacions",
-  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Encara no sigue dengún a este usuario.",

app/javascript/mastodon/locales/ar.json

@@ -23,13 +23,11 @@
   "account.copy": "نسخ الرابط إلى الملف الشخصي",
   "account.direct": "إشارة خاصة لـ @{name}",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
-  "account.domain_blocked": "اسم النِّطاق محظور",
   "account.edit_profile": "تعديل الملف الشخصي",
   "account.enable_notifications": "أشعرني عندما ينشر @{name}",
   "account.endorse": "أوصِ به على صفحتك الشخصية",
   "account.featured_tags.last_status_at": "آخر منشور في {date}",
   "account.featured_tags.last_status_never": "لا توجد رسائل",
-  "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
   "account.follow_back": "تابعه بالمثل",
   "account.followers": "مُتابِعون",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "كتم الإشعارات",
   "account.mute_short": "اكتم",
   "account.muted": "مَكتوم",
-  "account.mutual": "متبادلة",
   "account.no_bio": "لم يتم تقديم وصف.",
   "account.open_original_page": "افتح الصفحة الأصلية",
   "account.posts": "منشورات",

app/javascript/mastodon/locales/ast.json

@@ -22,12 +22,10 @@
   "account.copy": "Copiar l'enlllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
-  "account.domain_blocked": "Dominiu bloquiáu",
   "account.edit_profile": "Editar el perfil",
   "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
   "account.featured_tags.last_status_never": "Nun hai nenguna publicación",
-  "account.featured_tags.title": "Etiquetes destacaes de: {name}",
   "account.follow": "Siguir",
   "account.follow_back": "Siguir tamién",
   "account.followers": "Siguidores",

app/javascript/mastodon/locales/az.json

@@ -23,13 +23,11 @@
   "account.copy": "Profil linkini kopyala",
   "account.direct": "@{name} istifadəçisini fərdi olaraq etiketlə",
   "account.disable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndərməyi dayandır",
-  "account.domain_blocked": "Domen bloklanıb",
   "account.edit_profile": "Profili redaktə et",
   "account.enable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndər",
   "account.endorse": "Profildə seçilmişlərə əlavə et",
   "account.featured_tags.last_status_at": "Son paylaşım {date} tarixində olub",
   "account.featured_tags.last_status_never": "Paylaşım yoxdur",
-  "account.featured_tags.title": "{name} istifadəçisinin seçilmiş heşteqləri",
   "account.follow": "İzlə",
   "account.follow_back": "Sən də izlə",
   "account.followers": "İzləyicilər",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Bildirişləri səssizləşdir",
   "account.mute_short": "Səssizləşdir",
   "account.muted": "Səssizləşdirilib",
-  "account.mutual": "Ortaq",
   "account.no_bio": "Təsvir göstərilməyib.",
   "account.open_original_page": "Orijinal səhifəni aç",
   "account.posts": "Paylaşım",

app/javascript/mastodon/locales/be.json

@@ -23,13 +23,11 @@
   "account.copy": "Скапіраваць спасылку на профіль",
   "account.direct": "Згадаць асабіста @{name}",
   "account.disable_notifications": "Не паведамляць мне пра публікацыі @{name}",
-  "account.domain_blocked": "Дамен заблакаваны",
   "account.edit_profile": "Рэдагаваць профіль",
   "account.enable_notifications": "Апавяшчаць мяне пра допісы @{name}",
   "account.endorse": "Паказваць у профілі",
   "account.featured_tags.last_status_at": "Апошні допіс ад {date}",
   "account.featured_tags.last_status_never": "Няма допісаў",
-  "account.featured_tags.title": "Тэгі, выбраныя {name}",
   "account.follow": "Падпісацца",
   "account.follow_back": "Падпісацца ў адказ",
   "account.followers": "Падпісчыкі",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Не апавяшчаць",
   "account.mute_short": "Ігнараваць",
   "account.muted": "Ігнаруецца",
-  "account.mutual": "Узаемныя",
   "account.no_bio": "Апісанне адсутнічае.",
   "account.open_original_page": "Адкрыць арыгінальную старонку",
   "account.posts": "Допісы",

app/javascript/mastodon/locales/bg.json

@@ -23,13 +23,14 @@
   "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
   "account.disable_notifications": "Спиране на известяване при публикуване от @{name}",
-  "account.domain_blocked": "Блокиран домейн",
   "account.edit_profile": "Редактиране на профила",
   "account.enable_notifications": "Известяване при публикуване от @{name}",
   "account.endorse": "Представи в профила",
+  "account.featured": "Препоръчано",
+  "account.featured.hashtags": "Хаштагове",
+  "account.featured.posts": "Публикации",
   "account.featured_tags.last_status_at": "Последна публикация на {date}",
   "account.featured_tags.last_status_never": "Няма публикации",
-  "account.featured_tags.title": "Главни хаштагове на {name}",
   "account.follow": "Последване",
   "account.follow_back": "Последване взаимно",
   "account.followers": "Последователи",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Заглушаване на известията",
   "account.mute_short": "Заглушаване",
   "account.muted": "Заглушено",
-  "account.mutual": "Взаимни",
   "account.no_bio": "Няма представен опис.",
   "account.open_original_page": "Отваряне на първообразната страница",
   "account.posts": "Публикации",
@@ -378,6 +378,8 @@
   "generic.saved": "Запазено",
   "getting_started.heading": "Първи стъпки",
   "hashtag.admin_moderation": "Отваряне на модериращия интерфейс за #{name}",
+  "hashtag.browse": "Разглеждане на публикации в #{hashtag}",
+  "hashtag.browse_from_account": "Разглеждане на публикации от @{name} из #{hashtag}",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} публикация} other {{counter} публикации}} днес",
   "hashtag.follow": "Следване на хаштаг",
+  "hashtag.mute": "Заглушаване на #{hashtag}",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
   "hints.profiles.followers_may_be_missing": "Последователи за този профил може да липсват.",

app/javascript/mastodon/locales/bn.json

@@ -23,13 +23,11 @@
   "account.copy": "অবতারের সংযোগ অনুলিপি করো",
   "account.direct": "গোপনে মেনশন করুন @{name}",
   "account.disable_notifications": "আমাকে জানানো বন্ধ করো যখন @{name} পোস্ট করবে",
-  "account.domain_blocked": "ডোমেইন ব্লক করা",
   "account.edit_profile": "প্রোফাইল সম্পাদনা করুন",
   "account.enable_notifications": "আমাকে জানাবে যখন @{name} পোস্ট করবে",
   "account.endorse": "প্রোফাইলে ফিচার করুন",
   "account.featured_tags.last_status_at": "{date} এ সর্বশেষ পোস্ট",
   "account.featured_tags.last_status_never": "কোনো পোস্ট নেই",
-  "account.featured_tags.title": "{name} এর ফিচার করা Hashtag সমূহ",
   "account.follow": "অনুসরণ",
   "account.follow_back": "তাকে অনুসরণ করো",
   "account.followers": "অনুসরণকারী",

app/javascript/mastodon/locales/br.json

@@ -22,13 +22,11 @@
   "account.copy": "Eilañ al liamm war-zu ho profil",
   "account.direct": "Menegiñ @{name} ent-prevez",
   "account.disable_notifications": "Paouez d'am c'hemenn pa vez embannet traoù gant @{name}",
-  "account.domain_blocked": "Domani stanket",
   "account.edit_profile": "Kemmañ ar profil",
   "account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
   "account.featured_tags.last_status_never": "Embannadur ebet",
-  "account.featured_tags.title": "Hashtagoù pennañ {name}",
   "account.follow": "Heuliañ",
   "account.follow_back": "Heuliañ d'ho tro",
   "account.followers": "Tud koumanantet",

app/javascript/mastodon/locales/ca.json

@@ -23,13 +23,14 @@
   "account.copy": "Copia l'enllaç al perfil",
   "account.direct": "Menciona privadament @{name}",
   "account.disable_notifications": "Deixa de notificar-me els tuts de @{name}",
-  "account.domain_blocked": "Domini blocat",
   "account.edit_profile": "Edita el perfil",
   "account.enable_notifications": "Notifica'm els tuts de @{name}",
   "account.endorse": "Recomana en el perfil",
+  "account.featured": "Destacat",
+  "account.featured.hashtags": "Etiquetes",
+  "account.featured.posts": "Publicacions",
   "account.featured_tags.last_status_at": "Darrer tut el {date}",
   "account.featured_tags.last_status_never": "No hi ha tuts",
-  "account.featured_tags.title": "etiquetes destacades de {name}",
   "account.follow": "Segueix",
   "account.follow_back": "Segueix tu també",
   "account.followers": "Seguidors",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Silencia les notificacions",
   "account.mute_short": "Silencia",
   "account.muted": "Silenciat",
-  "account.mutual": "Mutu",
   "account.no_bio": "No s'ha proporcionat cap descripció.",
   "account.open_original_page": "Obre la pàgina original",
   "account.posts": "Tuts",
@@ -391,6 +391,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} tut} other {{counter} tuts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} tut} other {{counter} tuts}} avui",
   "hashtag.follow": "Segueix l'etiqueta",
+  "hashtag.mute": "Silencia #{hashtag}",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
   "hints.profiles.followers_may_be_missing": "Es poden haver perdut seguidors d'aquest perfil.",

app/javascript/mastodon/locales/ckb.json

@@ -22,13 +22,11 @@
   "account.copy": "ڕوونووسی بەستەر بۆ توت",
   "account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
-  "account.domain_blocked": "دۆمەین قەپاتکرا",
   "account.edit_profile": "دەستکاری پرۆفایل",
   "account.enable_notifications": "ئاگادارم بکەوە کاتێک @{name} بابەتەکان",
   "account.endorse": "ناساندن لە پرۆفایل",
   "account.featured_tags.last_status_at": "دوایین پۆست لە {date}",
   "account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
-  "account.featured_tags.title": "هاشتاگە تایبەتەکانی {name}",
   "account.follow": "بەدواداچوون",
   "account.follow_back": "فۆڵۆو بکەنەوە",
   "account.followers": "شوێنکەوتووان",
@@ -49,7 +47,6 @@
   "account.mute_notifications_short": "پاڵ بە ئاگادارکردنەوەکانەوە بنێ",
   "account.mute_short": "بێدەنگ",
   "account.muted": "بێ دەنگ",
-  "account.mutual": "دوولایەنە",
   "account.no_bio": "هیچ وەسفێک نەخراوەتەڕوو.",
   "account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە",
   "account.posts": "نووسراوەکان",

app/javascript/mastodon/locales/co.json

@@ -7,7 +7,6 @@
   "account.blocked": "Bluccatu",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Ùn mi nutificate più quandu @{name} pubblica qualcosa",
-  "account.domain_blocked": "Duminiu piattatu",
   "account.edit_profile": "Mudificà u prufile",
   "account.enable_notifications": "Nutificate mi quandu @{name} pubblica qualcosa",
   "account.endorse": "Fà figurà nant'à u prufilu",

app/javascript/mastodon/locales/cs.json

@@ -23,13 +23,14 @@
   "account.copy": "Kopírovat odkaz na profil",
   "account.direct": "Soukromě zmínit @{name}",
   "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
-  "account.domain_blocked": "Doména blokována",
   "account.edit_profile": "Upravit profil",
   "account.enable_notifications": "Oznamovat mi příspěvky @{name}",
   "account.endorse": "Zvýraznit na profilu",
+  "account.featured": "Doporučené",
+  "account.featured.hashtags": "Hashtagy",
+  "account.featured.posts": "Příspěvky",
   "account.featured_tags.last_status_at": "Poslední příspěvek {date}",
   "account.featured_tags.last_status_never": "Žádné příspěvky",
-  "account.featured_tags.title": "Hlavní hashtagy uživatele {name}",
   "account.follow": "Sledovat",
   "account.follow_back": "Také sledovat",
   "account.followers": "Sledující",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Ztlumit upozornění",
   "account.mute_short": "Ztlumit",
   "account.muted": "Skrytý",
-  "account.mutual": "Vzájemné",
   "account.no_bio": "Nebyl poskytnut žádný popis.",
   "account.open_original_page": "Otevřít původní stránku",
   "account.posts": "Příspěvky",
@@ -378,6 +378,8 @@
   "generic.saved": "Uloženo",
   "getting_started.heading": "Začínáme",
   "hashtag.admin_moderation": "Otevřít moderátorské rozhraní pro #{name}",
+  "hashtag.browse": "Procházet příspěvky na #{hashtag}",
+  "hashtag.browse_from_account": "Procházet příspěvky od @{name} v #{hashtag}",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "nebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.follow": "Sledovat hashtag",
+  "hashtag.mute": "Skrýt #{hashtag}",
   "hashtag.unfollow": "Přestat sledovat hashtag",
   "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
   "hints.profiles.followers_may_be_missing": "Sledující mohou pro tento profil chybět.",

app/javascript/mastodon/locales/cy.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Gweinyddion wedi'u cymedroli",
+  "about.blocks": "Gweinyddion a gyfyngir",
   "about.contact": "Cysylltwch â:",
   "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
@@ -23,13 +23,14 @@
   "account.copy": "Copïo dolen i'r proffil",
   "account.direct": "Crybwyll yn breifat @{name}",
   "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
-  "account.domain_blocked": "Parth wedi'i rwystro",
+  "account.edit_profile": "Golygu'r proffil",
-  "account.edit_profile": "Golygu proffil",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
+  "account.featured": "Dethol",
+  "account.featured.hashtags": "Hashnodau",
+  "account.featured.posts": "Postiadau",
   "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
   "account.featured_tags.last_status_never": "Dim postiadau",
-  "account.featured_tags.title": "Prif hashnodau {name}",
   "account.follow": "Dilyn",
   "account.follow_back": "Dilyn nôl",
   "account.followers": "Dilynwyr",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Diffodd hysbysiadau",
   "account.mute_short": "Anwybyddu",
   "account.muted": "Wedi anwybyddu",
-  "account.mutual": "Cydgydnabod",
   "account.no_bio": "Dim disgrifiad wedi'i gynnig.",
   "account.open_original_page": "Agor y dudalen wreiddiol",
   "account.posts": "Postiadau",
@@ -105,7 +105,7 @@
   "annual_report.summary.here_it_is": "Dyma eich {year} yn gryno:",
   "annual_report.summary.highlighted_post.by_favourites": "postiad wedi'i ffefrynu fwyaf",
   "annual_report.summary.highlighted_post.by_reblogs": "postiad wedi'i hybu fwyaf",
-  "annual_report.summary.highlighted_post.by_replies": "postiad gyda'r nifer fwyaf o atebion",
+  "annual_report.summary.highlighted_post.by_replies": "postiad gyda'r nifer fwyaf o ymatebion",
   "annual_report.summary.highlighted_post.possessive": "{name}",
   "annual_report.summary.most_used_app.most_used_app": "ap a ddefnyddiwyd fwyaf",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashnod a ddefnyddiwyd fwyaf",
@@ -226,7 +226,7 @@
   "confirmations.mute.confirm": "Tewi",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
-  "confirmations.redraft.title": "Dileu & ailddraftio postiad?",
+  "confirmations.redraft.title": "Dileu ac ailddraftio'r postiad?",
   "confirmations.reply.confirm": "Ymateb",
   "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
   "confirmations.reply.title": "Trosysgrifo'r postiad?",
@@ -256,7 +256,7 @@
   "dismissable_banner.explore_tags": "Mae'r hashnodau hyn ar gynnydd y ffedysawd heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o bobl amrywiol yn cael eu graddio'n uwch.",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y ffedysawd y mae pobl ar {domain} yn eu dilyn.",
   "domain_block_modal.block": "Blocio gweinydd",
-  "domain_block_modal.block_account_instead": "Blocio @{name} yn ei le",
+  "domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
   "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
   "domain_block_modal.they_cant_follow": "All neb o'r gweinydd hwn eich dilyn.",
   "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
@@ -378,6 +378,8 @@
   "generic.saved": "Wedi'i Gadw",
   "getting_started.heading": "Dechrau",
   "hashtag.admin_moderation": "Agor rhyngwyneb cymedroli #{name}",
+  "hashtag.browse": "Pori postiadau yn #{hashtag}",
+  "hashtag.browse_from_account": "Pori postiadau gan @{name} yn #{hashtag}",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "neu {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
   "hashtag.follow": "Dilyn hashnod",
+  "hashtag.mute": "Tewi #{hashtag}",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# arall}}",
   "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
@@ -526,7 +529,7 @@
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.administration": "Gweinyddiaeth",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
-  "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
+  "navigation_bar.blocks": "Defnyddwyr wedi'u rhwystro",
   "navigation_bar.bookmarks": "Nodau Tudalen",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi post newydd",
@@ -537,7 +540,7 @@
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
   "navigation_bar.follow_requests": "Ceisiadau dilyn",
-  "navigation_bar.followed_tags": "Hashnodau'n cael eu dilyn",
+  "navigation_bar.followed_tags": "Hashnodau a ddilynir",
   "navigation_bar.follows_and_followers": "Yn dilyn a dilynwyr",
   "navigation_bar.lists": "Rhestrau",
   "navigation_bar.logout": "Allgofnodi",
@@ -582,7 +585,7 @@
   "notification.moderation_warning.action_none": "Mae eich cyfrif wedi derbyn rhybudd cymedroli.",
   "notification.moderation_warning.action_sensitive": "Bydd eich postiadau'n cael eu marcio'n sensitif o hyn ymlaen.",
   "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
-  "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
+  "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i atal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
@@ -853,9 +856,9 @@
   "status.remove_bookmark": "Tynnu nod tudalen",
   "status.remove_favourite": "Tynnu o'r ffefrynnau",
   "status.replied_in_thread": "Atebodd mewn edefyn",
-  "status.replied_to": "Wedi ateb {name}",
+  "status.replied_to": "Wedi ymateb i {name}",
   "status.reply": "Ymateb",
-  "status.replyAll": "Ateb i edefyn",
+  "status.replyAll": "Ymateb i edefyn",
   "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",

app/javascript/mastodon/locales/da.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Blokér domænet {domain}",
   "account.block_short": "Bloker",
   "account.blocked": "Blokeret",
+  "account.blocking": "Blokering",
   "account.cancel_follow_request": "Annullér anmodning om at følge",
   "account.copy": "Kopiér link til profil",
   "account.direct": "Privat omtale @{name}",
   "account.disable_notifications": "Advisér mig ikke længere, når @{name} poster",
-  "account.domain_blocked": "Domæne blokeret",
+  "account.domain_blocking": "Blokerer domæne",
   "account.edit_profile": "Redigér profil",
   "account.enable_notifications": "Advisér mig, når @{name} poster",
   "account.endorse": "Fremhæv på profil",
+  "account.featured": "Fremhævet",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Indlæg",
   "account.featured_tags.last_status_at": "Seneste indlæg {date}",
   "account.featured_tags.last_status_never": "Ingen indlæg",
-  "account.featured_tags.title": "{name}s fremhævede etiketter",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbage",
   "account.followers": "Følgere",
@@ -38,6 +41,7 @@
   "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
+  "account.follows_you": "Følger dig",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul fremhævelser fra @{name}",
   "account.in_memoriam": "Til minde om.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Sluk for notifikationer",
   "account.mute_short": "Skjul",
   "account.muted": "Skjult",
-  "account.mutual": "Fælles",
+  "account.muting": "Tavsgørelse",
+  "account.mutual": "I følger hinanden",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.open_original_page": "Åbn oprindelig side",
   "account.posts": "Indlæg",
@@ -60,6 +65,7 @@
   "account.report": "Anmeld @{name}",
   "account.requested": "Afventer godkendelse. Tryk for at annullere følgeanmodning",
   "account.requested_follow": "{name} har anmodet om at følge dig",
+  "account.requests_to_follow_you": "Anmodninger om at følge dig",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Søgeresultater",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser og steder",
+  "empty_column.account_featured.me": "Du har ikke vist noget endnu. Vidste du, at man kan fremhæve sine indlæg, mest brugte hashtags og endda en vens konti på sin profil?",
+  "empty_column.account_featured.other": "{acct} har ikke vist noget endnu. Vidste du, at man kan fremhæve sine indlæg, mest brugte hashtags og endda en vens konti på sin profil?",
+  "empty_column.account_featured_other.unknown": "Denne konto har ikke fremhævet noget endnu.",
   "empty_column.account_hides_collections": "Brugeren har valgt ikke at gøre denne information tilgængelig",
   "empty_column.account_suspended": "Konto suspenderet",
   "empty_column.account_timeline": "Ingen indlæg her!",
@@ -378,6 +387,8 @@
   "generic.saved": "Gemt",
   "getting_started.heading": "Startmenu",
   "hashtag.admin_moderation": "Åbn modereringsbrugerflade for #{name}",
+  "hashtag.browse": "Gennemse indlæg i #{hashtag}",
+  "hashtag.browse_from_account": "Gennemse indlæg fra @{name} i #{hashtag}",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
   "hashtag.follow": "Følg etiket",
+  "hashtag.mute": "Tavsgør #{hashtag}",
   "hashtag.unfollow": "Stop med at følge etiket",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
   "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",

app/javascript/mastodon/locales/de.json

@@ -19,17 +19,20 @@
   "account.block_domain": "{domain} sperren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
+  "account.blocking": "Gesperrt",
   "account.cancel_follow_request": "Follower-Anfrage zurückziehen",
   "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
-  "account.domain_blocked": "Domain versteckt",
+  "account.domain_blocking": "Domain gesperrt",
   "account.edit_profile": "Profil bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
   "account.endorse": "Im Profil empfehlen",
+  "account.featured": "Vorgestellt",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Beiträge",
   "account.featured_tags.last_status_at": "Letzter Beitrag am {date}",
   "account.featured_tags.last_status_never": "Keine Beiträge",
-  "account.featured_tags.title": "Von {name} vorgestellte Hashtags",
   "account.follow": "Folgen",
   "account.follow_back": "Ebenfalls folgen",
   "account.followers": "Follower",
@@ -38,6 +41,7 @@
   "account.following": "Folge ich",
   "account.following_counter": "{count, plural, one {{counter} Folge ich} other {{counter} Folge ich}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
+  "account.follows_you": "Folgt dir",
   "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
   "account.in_memoriam": "Zum Andenken.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Benachrichtigungen stummschalten",
   "account.mute_short": "Stummschalten",
   "account.muted": "Stummgeschaltet",
-  "account.mutual": "Gegenseitig",
+  "account.muting": "Wird stummgeschaltet",
+  "account.mutual": "Ihr folgt euch",
   "account.no_bio": "Keine Beschreibung verfügbar.",
   "account.open_original_page": "Ursprüngliche Seite öffnen",
   "account.posts": "Beiträge",
@@ -60,6 +65,7 @@
   "account.report": "@{name} melden",
   "account.requested": "Die Genehmigung steht noch aus. Klicke hier, um die Follower-Anfrage zurückzuziehen",
   "account.requested_follow": "{name} möchte dir folgen",
+  "account.requests_to_follow_you": "Möchte dir folgen",
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Geteilte Beiträge von @{name} anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Suchergebnisse",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Reisen & Orte",
+  "empty_column.account_featured.me": "Du hast bisher noch nichts vorgestellt. Wusstest du, dass du deine Beiträge, häufig verwendete Hashtags und sogar andere Profile vorstellen kannst?",
+  "empty_column.account_featured.other": "{acct} hat bisher noch nichts vorgestellt. Wusstest du, dass du deine Beiträge, häufig verwendete Hashtags und sogar andere Profile vorstellen kannst?",
+  "empty_column.account_featured_other.unknown": "Dieses Profil hat bisher noch nichts vorgestellt.",
   "empty_column.account_hides_collections": "Das Konto hat sich dazu entschieden, diese Information nicht zu veröffentlichen",
   "empty_column.account_suspended": "Konto gesperrt",
   "empty_column.account_timeline": "Keine Beiträge vorhanden!",
@@ -378,6 +387,8 @@
   "generic.saved": "Gespeichert",
   "getting_started.heading": "Auf gehts!",
   "hashtag.admin_moderation": "#{name} moderieren",
+  "hashtag.browse": "Beiträge mit #{hashtag} suchen",
+  "hashtag.browse_from_account": "Beiträge von @{name} mit #{hashtag} suchen",
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}} heute",
   "hashtag.follow": "Hashtag folgen",
+  "hashtag.mute": "#{hashtag} stummschalten",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
   "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",

app/javascript/mastodon/locales/el.json

@@ -23,13 +23,14 @@
   "account.copy": "Αντιγραφή συνδέσμου προφίλ",
   "account.direct": "Ιδιωτική αναφορά @{name}",
   "account.disable_notifications": "Σταμάτα να με ειδοποιείς όταν δημοσιεύει ο @{name}",
-  "account.domain_blocked": "Ο τομέας αποκλείστηκε",
   "account.edit_profile": "Επεξεργασία προφίλ",
   "account.enable_notifications": "Ειδοποίησέ με όταν δημοσιεύει ο @{name}",
   "account.endorse": "Προβολή στο προφίλ",
+  "account.featured": "Προτεινόμενα",
+  "account.featured.hashtags": "Ετικέτες",
+  "account.featured.posts": "Αναρτήσεις",
   "account.featured_tags.last_status_at": "Τελευταία ανάρτηση στις {date}",
   "account.featured_tags.last_status_never": "Καμία ανάρτηση",
-  "account.featured_tags.title": "προβεβλημένες ετικέτες του/της {name}",
   "account.follow": "Ακολούθησε",
   "account.follow_back": "Ακολούθησε και εσύ",
   "account.followers": "Ακόλουθοι",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Σίγαση ειδοποιήσεων",
   "account.mute_short": "Σίγαση",
   "account.muted": "Αποσιωπημένος/η",
-  "account.mutual": "Αμοιβαίοι",
   "account.no_bio": "Δεν υπάρχει περιγραφή.",
   "account.open_original_page": "Ανοικτό",
   "account.posts": "Τουτ",
@@ -65,6 +65,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
   "account.unblock": "Άρση αποκλεισμού @{name}",
   "account.unblock_domain": "Άρση αποκλεισμού του τομέα {domain}",
+  "account.unblock_domain_short": "Άρση αποκλ.",
   "account.unblock_short": "Άρση αποκλεισμού",
   "account.unendorse": "Να μην παρέχεται στο προφίλ",
   "account.unfollow": "Άρση ακολούθησης",
@@ -377,6 +378,8 @@
   "generic.saved": "Αποθηκεύτηκε",
   "getting_started.heading": "Ας ξεκινήσουμε",
   "hashtag.admin_moderation": "Άνοιγμα διεπαφής συντονισμού για το #{name}",
+  "hashtag.browse": "Περιήγηση αναρτήσεων με #{hashtag}",
+  "hashtag.browse_from_account": "Περιήγηση αναρτήσεων από @{name} σε #{hashtag}",
   "hashtag.column_header.tag_mode.all": "και {additional}",
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
@@ -390,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}} σήμερα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
+  "hashtag.mute": "Σίγαση #{hashtag}",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
   "hashtags.and_other": "…και {count, plural, one {}other {# ακόμη}}",
   "hints.profiles.followers_may_be_missing": "Μπορεί να λείπουν ακόλουθοι για αυτό το προφίλ.",
@@ -872,7 +876,9 @@
   "subscribed_languages.target": "Αλλαγή εγγεγραμμένων γλωσσών για {target}",
   "tabs_bar.home": "Αρχική",
   "tabs_bar.notifications": "Ειδοποιήσεις",
+  "terms_of_service.effective_as_of": "Ενεργό από {date}",
   "terms_of_service.title": "Όροι Παροχής Υπηρεσιών",
+  "terms_of_service.upcoming_changes_on": "Επερχόμενες αλλαγές στις {date}",
   "time_remaining.days": "απομένουν {number, plural, one {# ημέρα} other {# ημέρες}}",
   "time_remaining.hours": "απομένουν {number, plural, one {# ώρα} other {# ώρες}}",
   "time_remaining.minutes": "απομένουν {number, plural, one {# λεπτό} other {# λεπτά}}",
@@ -903,6 +909,12 @@
   "video.expand": "Επέκταση βίντεο",
   "video.fullscreen": "Πλήρης οθόνη",
   "video.hide": "Απόκρυψη βίντεο",
+  "video.mute": "Σίγαση",
   "video.pause": "Παύση",
-  "video.play": "Αναπαραγωγή"
+  "video.play": "Αναπαραγωγή",
+  "video.skip_backward": "Παράλειψη πίσω",
+  "video.skip_forward": "Παράλειψη εμπρός",
+  "video.unmute": "Άρση σίγασης",
+  "video.volume_down": "Μείωση έντασης",
+  "video.volume_up": "Αύξηση έντασης"
 }

app/javascript/mastodon/locales/en-GB.json

@@ -23,13 +23,11 @@
   "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.featured_tags.last_status_at": "Last post on {date}",
   "account.featured_tags.last_status_never": "No posts",
-  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
-  "account.mutual": "Mutual",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",

app/javascript/mastodon/locales/en.json

@@ -19,11 +19,12 @@
   "account.block_domain": "Block domain {domain}",
   "account.block_short": "Block",
   "account.blocked": "Blocked",
+  "account.blocking": "Blocking",
   "account.cancel_follow_request": "Cancel follow",
   "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain blocked",
+  "account.domain_blocking": "Blocking domain",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
@@ -40,6 +41,7 @@
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
   "account.in_memoriam": "In Memoriam.",
@@ -54,14 +56,17 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
-  "account.mutual": "Mutual",
+  "account.muting": "Muting",
+  "account.mutual": "You follow each other",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts and replies",
+  "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.requested_follow": "{name} has requested to follow you",
+  "account.requests_to_follow_you": "Requests to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} posts}}",
@@ -229,6 +234,9 @@
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.redraft.title": "Delete & redraft post?",
+  "confirmations.remove_from_followers.confirm": "Remove follower",
+  "confirmations.remove_from_followers.message": "{name} will stop following you. Are you sure you want to proceed?",
+  "confirmations.remove_from_followers.title": "Remove follower?",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.reply.title": "Overwrite post?",
@@ -296,7 +304,9 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
-  "empty_column.account_featured": "This list is empty",
+  "empty_column.account_featured.me": "You have not featured anything yet. Did you know that you can feature your posts, hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured.other": "{acct} has not featured anything yet. Did you know that you can feature your posts, hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured_other.unknown": "This account has not featured anything yet.",
   "empty_column.account_hides_collections": "This user has chosen to not make this information available",
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No posts here!",
@@ -381,6 +391,8 @@
   "generic.saved": "Saved",
   "getting_started.heading": "Getting started",
   "hashtag.admin_moderation": "Open moderation interface for #{name}",
+  "hashtag.browse": "Browse posts in #{hashtag}",
+  "hashtag.browse_from_account": "Browse posts from @{name} in #{hashtag}",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -394,6 +406,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
   "hashtag.follow": "Follow hashtag",
+  "hashtag.mute": "Mute #{hashtag}",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
   "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",

app/javascript/mastodon/locales/eo.json

@@ -23,13 +23,13 @@
   "account.copy": "Kopii ligilon al profilo",
   "account.direct": "Private mencii @{name}",
   "account.disable_notifications": "Ĉesu sciigi min kiam @{name} afiŝas",
-  "account.domain_blocked": "Domajno blokita",
   "account.edit_profile": "Redakti la profilon",
   "account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
   "account.endorse": "Prezenti ĉe via profilo",
+  "account.featured.hashtags": "Kradvortoj",
+  "account.featured.posts": "Afiŝoj",
   "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
   "account.featured_tags.last_status_never": "Neniu afiŝo",
-  "account.featured_tags.title": "Rekomendataj kradvortoj de {name}",
   "account.follow": "Sekvi",
   "account.follow_back": "Sekvu reen",
   "account.followers": "Sekvantoj",
@@ -52,7 +52,6 @@
   "account.mute_notifications_short": "Silentigu sciigojn",
   "account.mute_short": "Silentigu",
   "account.muted": "Silentigita",
-  "account.mutual": "Reciproka",
   "account.no_bio": "Neniu priskribo estas provizita.",
   "account.open_original_page": "Malfermi la originalan paĝon",
   "account.posts": "Afiŝoj",

app/javascript/mastodon/locales/es-AR.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
+  "account.blocking": "Bloqueo",
   "account.cancel_follow_request": "Dejar de seguir",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
-  "account.domain_blocked": "Dominio bloqueado",
+  "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} envíe mensajes",
   "account.endorse": "Destacar en el perfil",
+  "account.featured": "Destacados",
+  "account.featured.hashtags": "Etiquetas",
+  "account.featured.posts": "Mensajes",
   "account.featured_tags.last_status_at": "Último mensaje: {date}",
   "account.featured_tags.last_status_never": "Sin mensajes",
-  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir",
   "account.followers": "Seguidores",
@@ -38,6 +41,7 @@
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, one {siguiendo a {counter}} other {siguiendo a {counter}}}",
   "account.follows.empty": "Todavía este usuario no sigue a nadie.",
+  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar adhesiones de @{name}",
   "account.in_memoriam": "Cuenta conmemorativa.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
-  "account.mutual": "Seguimiento mutuo",
+  "account.muting": "Silenciada",
+  "account.mutual": "Se siguen mutuamente",
   "account.no_bio": "Sin descripción provista.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Mensajes",
@@ -60,6 +65,7 @@
   "account.report": "Denunciar a @{name}",
   "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} solicitó seguirte",
+  "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar adhesiones de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
+  "empty_column.account_featured.me": "Todavía no destacaste nada. ¿Sabías que en tu perfil podés destacar tus publicaciones, las etiquetas que más usás e incluso las cuentas de tus contactos?",
+  "empty_column.account_featured.other": "{acct} todavía no destacó nada. ¿Sabías que en tu perfil podés destacar tus publicaciones, las etiquetas que más usás e incluso las cuentas de tus contactos?",
+  "empty_column.account_featured_other.unknown": "Esta cuenta todavía no destacó nada.",
   "empty_column.account_hides_collections": "Este usuario eligió no publicar esta información",
   "empty_column.account_suspended": "Cuenta suspendida",
   "empty_column.account_timeline": "¡No hay mensajes acá!",
@@ -378,6 +387,8 @@
   "generic.saved": "Guardado",
   "getting_started.heading": "Inicio de Mastodon",
   "hashtag.admin_moderation": "Abrir interface de moderación para #{name}",
+  "hashtag.browse": "Ver publicaciones con #{hashtag}",
+  "hashtag.browse_from_account": "Ver publicaciones de @{name} con #{hashtag}",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}} hoy",
   "hashtag.follow": "Seguir etiqueta",
+  "hashtag.mute": "Silenciar #{hashtag}",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Es posible que falten seguidores de este perfil.",

app/javascript/mastodon/locales/es-MX.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
+  "account.blocking": "Bloqueando",
   "account.cancel_follow_request": "Cancelar seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
-  "account.domain_blocked": "Dominio oculto",
+  "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
+  "account.featured": "Destacado",
+  "account.featured.hashtags": "Etiquetas",
+  "account.featured.posts": "Publicaciones",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
   "account.featured_tags.last_status_never": "Sin publicaciones",
-  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
@@ -38,6 +41,7 @@
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
   "account.follows.empty": "Este usuario no sigue a nadie todavía.",
+  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "En memoria.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
-  "account.mutual": "Mutuo",
+  "account.muting": "Silenciando",
+  "account.mutual": "Se siguen el uno al otro",
   "account.no_bio": "Sin biografía.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
@@ -60,6 +65,7 @@
   "account.report": "Denunciar a @{name}",
   "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
+  "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
+  "empty_column.account_featured.me": "No has destacado nada todavía. ¿Sabías que puedes destacar tus publicaciones, las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured.other": "{acct} no ha destacado nada todavía. ¿Sabías que puedes destacar tus publicaciones, las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured_other.unknown": "Esta cuenta no ha destacado nada todavía.",
   "empty_column.account_hides_collections": "Este usuario ha elegido no hacer disponible esta información",
   "empty_column.account_suspended": "Cuenta suspendida",
   "empty_column.account_timeline": "¡No hay publicaciones aquí!",
@@ -378,6 +387,8 @@
   "generic.saved": "Guardado",
   "getting_started.heading": "Primeros pasos",
   "hashtag.admin_moderation": "Abrir interfaz de moderación para #{name}",
+  "hashtag.browse": "Explorar publicaciones en #{hashtag}",
+  "hashtag.browse_from_account": "Explorar publicaciones de @{name} en #{hashtag}",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
   "hashtag.follow": "Seguir etiqueta",
+  "hashtag.mute": "Silenciar #{hashtag}",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",

app/javascript/mastodon/locales/es.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
+  "account.blocking": "Bloqueando",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
-  "account.domain_blocked": "Dominio bloqueado",
+  "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en el perfil",
+  "account.featured": "Destacado",
+  "account.featured.hashtags": "Etiquetas",
+  "account.featured.posts": "Publicaciones",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
   "account.featured_tags.last_status_never": "Sin publicaciones",
-  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
@@ -38,6 +41,7 @@
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
+  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "Cuenta conmemorativa.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
-  "account.mutual": "Mutuo",
+  "account.muting": "Silenciando",
+  "account.mutual": "Os seguís mutuamente",
   "account.no_bio": "Sin biografía.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
@@ -60,6 +65,7 @@
   "account.report": "Reportar a @{name}",
   "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
+  "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
+  "empty_column.account_featured.me": "Aún no has destacado nada. ¿Sabías que puedes destacar tus publicaciones, las etiquetas que más utilizas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured.other": "{acct} no ha destacado nada aún. ¿Sabías que puedes destacar tus publicaciones, las etiquetas que más utilizas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured_other.unknown": "Esta cuenta aún no ha destacado nada.",
   "empty_column.account_hides_collections": "Este usuario ha decidido no mostrar esta información",
   "empty_column.account_suspended": "Cuenta suspendida",
   "empty_column.account_timeline": "¡No hay publicaciones aquí!",
@@ -378,6 +387,8 @@
   "generic.saved": "Guardado",
   "getting_started.heading": "Primeros pasos",
   "hashtag.admin_moderation": "Abrir interfaz de moderación para #{name}",
+  "hashtag.browse": "Explorar publicaciones en #{hashtag}",
+  "hashtag.browse_from_account": "Explorar publicaciones de @{name} en #{hashtag}",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
   "hashtag.follow": "Seguir etiqueta",
+  "hashtag.mute": "Silenciar #{hashtag}",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",

app/javascript/mastodon/locales/et.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopeeri profiili link",
   "account.direct": "Maini privaatselt @{name}",
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
-  "account.domain_blocked": "Domeen peidetud",
   "account.edit_profile": "Muuda profiili",
   "account.enable_notifications": "Teavita mind @{name} postitustest",
   "account.endorse": "Too profiilil esile",
   "account.featured_tags.last_status_at": "Viimane postitus {date}",
   "account.featured_tags.last_status_never": "Postitusi pole",
-  "account.featured_tags.title": "{name} esiletõstetud sildid",
   "account.follow": "Jälgi",
   "account.follow_back": "Jälgi vastu",
   "account.followers": "Jälgijad",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Vaigista teavitused",
   "account.mute_short": "Vaigista",
   "account.muted": "Vaigistatud",
-  "account.mutual": "Jälgite",
   "account.no_bio": "Kirjeldust pole lisatud.",
   "account.open_original_page": "Ava algne leht",
   "account.posts": "Postitused",

app/javascript/mastodon/locales/eu.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopiatu profilerako esteka",
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
-  "account.domain_blocked": "Ezkutatutako domeinua",
   "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
   "account.featured_tags.last_status_never": "Bidalketarik ez",
-  "account.featured_tags.title": "{name} erabiltzailearen nabarmendutako traolak",
   "account.follow": "Jarraitu",
   "account.follow_back": "Jarraitu bueltan",
   "account.followers": "Jarraitzaileak",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Mututu jakinarazpenak",
   "account.mute_short": "Mututu",
   "account.muted": "Mutututa",
-  "account.mutual": "Elkarrekikoa",
   "account.no_bio": "Ez da deskribapenik eman.",
   "account.open_original_page": "Ireki jatorrizko orria",
   "account.posts": "Bidalketa",

app/javascript/mastodon/locales/fa.json

@@ -23,13 +23,11 @@
   "account.copy": "رونوشت از پیوند به نمایه",
   "account.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "account.disable_notifications": "آگاه کردن من هنگام فرسته‌های ‎@{name} را متوقّف کن",
-  "account.domain_blocked": "دامنه مسدود شد",
   "account.edit_profile": "ویرایش نمایه",
   "account.enable_notifications": "هنگام فرسته‌های ‎@{name} مرا آگاه کن",
   "account.endorse": "معرّفی در نمایه",
   "account.featured_tags.last_status_at": "آخرین فرسته در {date}",
   "account.featured_tags.last_status_never": "بدون فرسته",
-  "account.featured_tags.title": "برچسب‌های برگزیدهٔ {name}",
   "account.follow": "پی‌گرفتن",
   "account.follow_back": "دنبال کردن متقابل",
   "account.followers": "پی‌گیرندگان",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "خموشی آگاهی‌ها",
   "account.mute_short": "خموشی",
   "account.muted": "خموش",
-  "account.mutual": "دوطرفه",
   "account.no_bio": "شرحی فراهم نشده.",
   "account.open_original_page": "گشودن صفحهٔ اصلی",
   "account.posts": "فرسته",

app/javascript/mastodon/locales/fi.json

@@ -19,17 +19,19 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
+  "account.blocking": "Estetty",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
   "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} julkaisee",
-  "account.domain_blocked": "Verkkotunnus estetty",
+  "account.domain_blocking": "Estetty verkkotunnus",
   "account.edit_profile": "Muokkaa profiilia",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
   "account.endorse": "Suosittele profiilissasi",
+  "account.featured.hashtags": "Aihetunnisteet",
+  "account.featured.posts": "Julkaisut",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
-  "account.featured_tags.title": "Käyttäjän {name} suosittelemat aihetunnisteet",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
   "account.followers": "Seuraajat",
@@ -38,6 +40,7 @@
   "account.following": "Seurattavat",
   "account.following_counter": "{count, plural, one {{counter} seurattava} other {{counter} seurattavaa}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
+  "account.follows_you": "Seuraa sinua",
   "account.go_to_profile": "Siirry profiiliin",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
@@ -52,6 +55,7 @@
   "account.mute_notifications_short": "Mykistä ilmoitukset",
   "account.mute_short": "Mykistä",
   "account.muted": "Mykistetty",
+  "account.muting": "Hiljennetty",
   "account.mutual": "Seuraatte toisianne",
   "account.no_bio": "Kuvausta ei ole annettu.",
   "account.open_original_page": "Avaa alkuperäinen sivu",
@@ -60,6 +64,7 @@
   "account.report": "Raportoi @{name}",
   "account.requested": "Odottaa hyväksyntää. Peruuta seurantapyyntö napsauttamalla",
   "account.requested_follow": "{name} on pyytänyt lupaa seurata sinua",
+  "account.requests_to_follow_you": "Pyynnöt seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
   "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
@@ -378,6 +383,8 @@
   "generic.saved": "Tallennettu",
   "getting_started.heading": "Näin pääset alkuun",
   "hashtag.admin_moderation": "Avaa tunnisteen #{name} moderointinäkymä",
+  "hashtag.browse": "Selaa julkaisuja tunnisteella #{hashtag}",
+  "hashtag.browse_from_account": "Selaa julkaisuja käyttäjältä @{name} tunnisteella #{hashtag}",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "tai {additional}",
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
@@ -391,6 +398,7 @@
   "hashtag.counter_by_uses": "{count, plural, one{{counter} julkaisu} other {{counter} julkaisua}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}} tänään",
   "hashtag.follow": "Seuraa aihetunnistetta",
+  "hashtag.mute": "Mykistä #{hashtag}",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
   "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",

app/javascript/mastodon/locales/fil.json

@@ -23,13 +23,11 @@
   "account.copy": "I-sipi ang kawing sa profile",
   "account.direct": "Palihim banggitin si @{name}",
   "account.disable_notifications": "I-tigil ang pagpapaalam sa akin tuwing nagpopost si @{name}",
-  "account.domain_blocked": "Hinadlangan ang domain",
   "account.edit_profile": "Baguhin ang profile",
   "account.enable_notifications": "Ipaalam sa akin kapag nag-post si @{name}",
   "account.endorse": "I-tampok sa profile",
   "account.featured_tags.last_status_at": "Huling post noong {date}",
   "account.featured_tags.last_status_never": "Walang mga post",
-  "account.featured_tags.title": "Nakatampok na hashtag ni {name}",
   "account.follow": "Sundan",
   "account.follow_back": "Sundan pabalik",
   "account.followers": "Mga tagasunod",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "I-mute ang mga abiso",
   "account.mute_short": "I-mute",
   "account.muted": "Naka-mute",
-  "account.mutual": "Ka-mutual",
   "account.no_bio": "Walang nakalaan na paglalarawan.",
   "account.open_original_page": "Buksan ang pinagmulang pahina",
   "account.posts": "Mga post",

app/javascript/mastodon/locales/fo.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Banna økisnavnið {domain}",
   "account.block_short": "Blokera",
   "account.blocked": "Bannað/ur",
+  "account.blocking": "Banni",
   "account.cancel_follow_request": "Strika fylgjaraumbøn",
   "account.copy": "Avrita leinki til vangan",
   "account.direct": "Umrøð @{name} privat",
   "account.disable_notifications": "Ikki boða mær frá, tá @{name} skrivar",
-  "account.domain_blocked": "Økisnavn bannað",
+  "account.domain_blocking": "Banni økisnavn",
   "account.edit_profile": "Broyt vanga",
   "account.enable_notifications": "Boða mær frá, tá @{name} skrivar",
   "account.endorse": "Víst á vangamyndini",
+  "account.featured": "Tikin fram",
+  "account.featured.hashtags": "Frámerki",
+  "account.featured.posts": "Postar",
   "account.featured_tags.last_status_at": "Seinasta strongur skrivaður {date}",
   "account.featured_tags.last_status_never": "Einki uppslag",
-  "account.featured_tags.title": "Tvíkrossar hjá {name}",
   "account.follow": "Fylg",
   "account.follow_back": "Fylg aftur",
   "account.followers": "Fylgjarar",
@@ -38,6 +41,7 @@
   "account.following": "Fylgir",
   "account.following_counter": "{count, plural, one {{counter} fylgir} other {{counter} fylgja}}",
   "account.follows.empty": "Hesin brúkari fylgir ongum enn.",
+  "account.follows_you": "Fylgir tær",
   "account.go_to_profile": "Far til vanga",
   "account.hide_reblogs": "Fjal lyft frá @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Sløkk fráboðanir",
   "account.mute_short": "Doyv",
   "account.muted": "Sløkt/ur",
-  "account.mutual": "Sínamillum",
+  "account.muting": "Doyvir",
+  "account.mutual": "Tit fylgja hvønn annan",
   "account.no_bio": "Lýsing vantar.",
   "account.open_original_page": "Opna upprunasíðuna",
   "account.posts": "Uppsløg",
@@ -60,6 +65,7 @@
   "account.report": "Melda @{name}",
   "account.requested": "Bíðar eftir góðkenning. Trýst fyri at angra umbønina",
   "account.requested_follow": "{name} hevur biðið um at fylgja tær",
+  "account.requests_to_follow_you": "Umbønir um at fylgja tær",
   "account.share": "Deil vanga @{name}'s",
   "account.show_reblogs": "Vís lyft frá @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} postur} other {{counter} postar}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Leitiúrslit",
   "emoji_button.symbols": "Ímyndir",
   "emoji_button.travel": "Ferðing og støð",
+  "empty_column.account_featured.me": "Tú hevur ikki tikið nakað fram enn. Visti tú, at tú kanst taka fram egnar postar, frámerki, tú brúkar mest, og sjálvt kontur hjá vinum tínum á vangan hjá tær?",
+  "empty_column.account_featured.other": "{acct} hevur ikki tikið nakað fram enn. Visti tú, at tú kanst taka fram tínar postar, frámerki, tú brúkar mest, og sjálvt kontur hjá vinum tínum á vangan hjá tær?",
+  "empty_column.account_featured_other.unknown": "Hendan kontan hevur ikki tikið nakað fram enn.",
   "empty_column.account_hides_collections": "Hesin brúkarin hevur valt, at hesar upplýsingarnar ikki skulu vera tøkar",
   "empty_column.account_suspended": "Kontan gjørd óvirkin",
   "empty_column.account_timeline": "Einki uppslag her!",
@@ -378,6 +387,8 @@
   "generic.saved": "Goymt",
   "getting_started.heading": "At byrja",
   "hashtag.admin_moderation": "Lat umsjónarmarkamót upp fyri #{name}",
+  "hashtag.browse": "Blaða gjøgnum postar í #{hashtag}",
+  "hashtag.browse_from_account": "Blaða gjøgnum postar frá @{name} í #{hashtag}",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "ella {additional}",
   "hashtag.column_header.tag_mode.none": "uttan {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} postur} other {{counter} postar}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postur} other {{counter} postar}} í dag",
   "hashtag.follow": "Fylg frámerki",
+  "hashtag.mute": "Doyv @#{hashtag}",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
   "hints.profiles.followers_may_be_missing": "Fylgjarar hjá hesum vanganum kunnu mangla.",

app/javascript/mastodon/locales/fr-CA.json

@@ -23,13 +23,14 @@
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie",
-  "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
   "account.enable_notifications": "Me notifier quand @{name} publie",
   "account.endorse": "Inclure sur profil",
+  "account.featured": "En vedette",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Messages",
   "account.featured_tags.last_status_at": "Dernière publication {date}",
   "account.featured_tags.last_status_never": "Aucune publication",
-  "account.featured_tags.title": "Hashtags inclus de {name}",
   "account.follow": "Suivre",
   "account.follow_back": "Suivre en retour",
   "account.followers": "abonné·e·s",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Rendre les notifications muettes",
   "account.mute_short": "Rendre muet",
   "account.muted": "Masqué·e",
-  "account.mutual": "Mutuel",
   "account.no_bio": "Description manquante.",
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Publications",
@@ -65,6 +65,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
+  "account.unblock_domain_short": "Débloquer",
   "account.unblock_short": "Débloquer",
   "account.unendorse": "Ne pas inclure sur profil",
   "account.unfollow": "Ne plus suivre",
@@ -905,6 +906,10 @@
   "video.expand": "Agrandir la vidéo",
   "video.fullscreen": "Plein écran",
   "video.hide": "Masquer la vidéo",
+  "video.mute": "Couper le son",
   "video.pause": "Pause",
-  "video.play": "Lecture"
+  "video.play": "Lecture",
+  "video.unmute": "Rétablir le son",
+  "video.volume_down": "Baisser le volume",
+  "video.volume_up": "Augmenter le volume"
 }

app/javascript/mastodon/locales/fr.json

@@ -23,13 +23,14 @@
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
-  "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
   "account.enable_notifications": "Me notifier quand @{name} publie quelque chose",
   "account.endorse": "Recommander sur votre profil",
+  "account.featured": "En vedette",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Messages",
   "account.featured_tags.last_status_at": "Dernier message le {date}",
   "account.featured_tags.last_status_never": "Aucun message",
-  "account.featured_tags.title": "Les hashtags en vedette de {name}",
   "account.follow": "Suivre",
   "account.follow_back": "Suivre en retour",
   "account.followers": "Abonné·e·s",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Désactiver les notifications",
   "account.mute_short": "Mettre en sourdine",
   "account.muted": "Masqué·e",
-  "account.mutual": "Mutuel",
   "account.no_bio": "Aucune description fournie.",
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Messages",
@@ -65,6 +65,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
+  "account.unblock_domain_short": "Débloquer",
   "account.unblock_short": "Débloquer",
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unfollow": "Ne plus suivre",
@@ -905,6 +906,10 @@
   "video.expand": "Agrandir la vidéo",
   "video.fullscreen": "Plein écran",
   "video.hide": "Masquer la vidéo",
+  "video.mute": "Couper le son",
   "video.pause": "Pause",
-  "video.play": "Lecture"
+  "video.play": "Lecture",
+  "video.unmute": "Rétablir le son",
+  "video.volume_down": "Baisser le volume",
+  "video.volume_up": "Augmenter le volume"
 }

app/javascript/mastodon/locales/fy.json

@@ -23,13 +23,11 @@
   "account.copy": "Keppeling nei profyl kopiearje",
   "account.direct": "Privee fermelde @{name}",
   "account.disable_notifications": "Jou gjin melding mear wannear @{name} in berjocht pleatst",
-  "account.domain_blocked": "Domein blokkearre",
   "account.edit_profile": "Profyl bewurkje",
   "account.enable_notifications": "Jou in melding mear wannear @{name} in berjocht pleatst",
   "account.endorse": "Op profyl werjaan",
   "account.featured_tags.last_status_at": "Lêste berjocht op {date}",
   "account.featured_tags.last_status_never": "Gjin berjochten",
-  "account.featured_tags.title": "Utljochte hashtags fan {name}",
   "account.follow": "Folgje",
   "account.follow_back": "Weromfolgje",
   "account.followers": "Folgers",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Meldingen negearje",
   "account.mute_short": "Negearje",
   "account.muted": "Negearre",
-  "account.mutual": "Jimme folgje inoar",
   "account.no_bio": "Gjin omskriuwing opjûn.",
   "account.open_original_page": "Orizjinele side iepenje",
   "account.posts": "Berjochten",

app/javascript/mastodon/locales/ga.json

@@ -23,13 +23,11 @@
   "account.copy": "Cóipeáil nasc chuig an bpróifíl",
   "account.direct": "Luaigh @{name} go príobháideach",
   "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
-  "account.domain_blocked": "Ainm fearainn bactha",
   "account.edit_profile": "Cuir an phróifíl in eagar",
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
   "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
   "account.featured_tags.last_status_never": "Gan aon phoist",
-  "account.featured_tags.title": "Haischlib faoi thrácht {name}",
   "account.follow": "Lean",
   "account.follow_back": "Leanúint ar ais",
   "account.followers": "Leantóirí",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Balbhaigh fógraí",
   "account.mute_short": "Balbhaigh",
   "account.muted": "Balbhaithe",
-  "account.mutual": "Frithpháirteach",
   "account.no_bio": "Níor tugadh tuairisc.",
   "account.open_original_page": "Oscail an leathanach bunaidh",
   "account.posts": "Postálacha",

app/javascript/mastodon/locales/gd.json

@@ -23,13 +23,11 @@
   "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
-  "account.domain_blocked": "Chaidh an àrainn a bhacadh",
   "account.edit_profile": "Deasaich a’ phròifil",
   "account.enable_notifications": "Cuir brath thugam nuair a chuireas @{name} post ris",
   "account.endorse": "Brosnaich air a’ phròifil",
   "account.featured_tags.last_status_at": "Am post mu dheireadh {date}",
   "account.featured_tags.last_status_never": "Gun phost",
-  "account.featured_tags.title": "Na tagaichean hais brosnaichte aig {name}",
   "account.follow": "Lean",
   "account.follow_back": "Lean air ais",
   "account.followers": "Luchd-leantainn",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Mùch na brathan",
   "account.mute_short": "Mùch",
   "account.muted": "’Ga mhùchadh",
-  "account.mutual": "Co-dhàimh",
   "account.no_bio": "Cha deach tuairisgeul a sholar.",
   "account.open_original_page": "Fosgail an duilleag thùsail",
   "account.posts": "Postaichean",

app/javascript/mastodon/locales/gl.json

@@ -23,13 +23,14 @@
   "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
-  "account.domain_blocked": "Dominio agochado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
+  "account.featured": "Destacado",
+  "account.featured.hashtags": "Cancelos",
+  "account.featured.posts": "Publicacións",
   "account.featured_tags.last_status_at": "Última publicación o {date}",
   "account.featured_tags.last_status_never": "Sen publicacións",
-  "account.featured_tags.title": "Cancelos destacados de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir tamén",
   "account.followers": "Seguidoras",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Silenciar notificacións",
   "account.mute_short": "Acalar",
   "account.muted": "Acalada",
-  "account.mutual": "Mutuo",
   "account.no_bio": "Sen descrición.",
   "account.open_original_page": "Abrir páxina orixinal",
   "account.posts": "Publicacións",
@@ -378,6 +378,8 @@
   "generic.saved": "Gardado",
   "getting_started.heading": "Primeiros pasos",
   "hashtag.admin_moderation": "Abrir interface de moderación para ##{name}",
+  "hashtag.browse": "Ver publicacións con #{hashtag}",
+  "hashtag.browse_from_account": "Ver as publicacións de @{name} con #{hashtag}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicacións}} hoxe",
   "hashtag.follow": "Seguir cancelo",
+  "hashtag.mute": "Acalar a #{hashtag}",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
   "hints.profiles.followers_may_be_missing": "Poderían faltar seguidoras deste perfil.",

app/javascript/mastodon/locales/he.json

@@ -19,17 +19,20 @@
   "account.block_domain": "חסמו את קהילת {domain}",
   "account.block_short": "לחסום",
   "account.blocked": "לחסום",
+  "account.blocking": "רשימת החשבונות החסומים",
   "account.cancel_follow_request": "משיכת בקשת מעקב",
   "account.copy": "להעתיק קישור לפרופיל",
   "account.direct": "הודעה פרטית אל @{name}",
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
-  "account.domain_blocked": "הדומיין חסום",
+  "account.domain_blocking": "רשימת השרתים החסומים",
   "account.edit_profile": "עריכת פרופיל",
   "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
   "account.endorse": "קדם את החשבון בפרופיל",
+  "account.featured": "מומלץ",
+  "account.featured.hashtags": "תגיות",
+  "account.featured.posts": "הודעות",
   "account.featured_tags.last_status_at": "חצרוץ אחרון בתאריך {date}",
   "account.featured_tags.last_status_never": "אין חצרוצים",
-  "account.featured_tags.title": "התגיות המועדפות של {name}",
   "account.follow": "לעקוב",
   "account.follow_back": "לעקוב בחזרה",
   "account.followers": "עוקבים",
@@ -38,6 +41,7 @@
   "account.following": "נעקבים",
   "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {counter}}}",
   "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
+  "account.follows_you": "במעקב אחריך",
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
   "account.in_memoriam": "פרופיל זכרון.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "השתקת התראות",
   "account.mute_short": "השתקה",
   "account.muted": "מושתק",
-  "account.mutual": "הדדיים",
+  "account.muting": "רשימת החשבונות המושתקים",
+  "account.mutual": "אתם עוקביםות הדדית",
   "account.no_bio": "לא סופק תיאור.",
   "account.open_original_page": "לפתיחת העמוד המקורי",
   "account.posts": "פוסטים",
@@ -60,6 +65,7 @@
   "account.report": "דווח על @{name}",
   "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
+  "account.requests_to_follow_you": "ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
   "account.show_reblogs": "הצג הדהודים מאת @{name}",
   "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "תוצאות חיפוש",
   "emoji_button.symbols": "סמלים",
   "emoji_button.travel": "טיולים ואתרים",
+  "empty_column.account_featured.me": "עוד לא קידמת תכנים. הידעת שניתן לקדם תכני הודעות, תגיות שבשימושך התדיר או אפילו את החשבונות של חבריםות בפרופיל שלך?",
+  "empty_column.account_featured.other": "{acct} עוד לא קידם תכנים. הידעת שניתן לקדם תכני הודעות, תגיות שבשימושך התדיר או אפילו את החשבונות של חבריםות בפרופיל שלך?",
+  "empty_column.account_featured_other.unknown": "חשבון זה עוד לא קידם תכנים.",
   "empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה",
   "empty_column.account_suspended": "חשבון מושעה",
   "empty_column.account_timeline": "אין עדיין אף הודעה!",
@@ -378,6 +387,8 @@
   "generic.saved": "נשמר",
   "getting_started.heading": "בואו נתחיל",
   "hashtag.admin_moderation": "פתיחת ממשק פיקוח דיון עבור #{name}",
+  "hashtag.browse": "קריאת הודעות תחת #{hashtag}",
+  "hashtag.browse_from_account": "קריאת הודעות מאת @{name} תחת #{hashtag}",
   "hashtag.column_header.tag_mode.all": "ו- {additional}",
   "hashtag.column_header.tag_mode.any": "או {additional}",
   "hashtag.column_header.tag_mode.none": "ללא {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}} היום",
   "hashtag.follow": "לעקוב אחרי תגית",
+  "hashtag.mute": "להשתיק את #{hashtag}",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
   "hints.profiles.followers_may_be_missing": "יתכן כי עוקבים של פרופיל זה חסרים.",

app/javascript/mastodon/locales/hi.json

@@ -22,13 +22,11 @@
   "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
   "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
-  "account.domain_blocked": "छिपा हुआ डोमेन",
   "account.edit_profile": "प्रोफ़ाइल संपादित करें",
   "account.enable_notifications": "जब @{name} पोस्ट मौजूद हो सूचित करें",
   "account.endorse": "प्रोफ़ाइल पर दिखाए",
   "account.featured_tags.last_status_at": "{date} का अंतिम पोस्ट",
   "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
-  "account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
   "account.follow": "फॉलो करें",
   "account.follow_back": "फॉलो करें",
   "account.followers": "फॉलोवर",
@@ -49,7 +47,6 @@
   "account.mute_notifications_short": "सूचनाओ को शांत करे",
   "account.mute_short": "शांत करे",
   "account.muted": "म्यूट है",
-  "account.mutual": "आपसी",
   "account.no_bio": "कोई विवरण नहि दिया गया हे",
   "account.open_original_page": "ओरिजिनल पोस्ट खोलें",
   "account.posts": "टूट्स",

app/javascript/mastodon/locales/hr.json

@@ -22,13 +22,11 @@
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno spomeni @{name}",
   "account.disable_notifications": "Nemoj me obavjestiti kada @{name} napravi objavu",
-  "account.domain_blocked": "Domena je blokirana",
   "account.edit_profile": "Uredi profil",
   "account.enable_notifications": "Obavjesti me kada @{name} napravi objavu",
   "account.endorse": "Istakni na profilu",
   "account.featured_tags.last_status_at": "Zadnji post {date}",
   "account.featured_tags.last_status_never": "Nema postova",
-  "account.featured_tags.title": "Istaknuti hashtagovi {name}",
   "account.follow": "Prati",
   "account.follow_back": "Slijedi natrag",
   "account.followers": "Pratitelji",
@@ -48,7 +46,6 @@
   "account.mute_notifications_short": "Utišaj obavijesti",
   "account.mute_short": "Utišaj",
   "account.muted": "Utišano",
-  "account.mutual": "Uzajamno",
   "account.no_bio": "Nije dan opis.",
   "account.open_original_page": "Otvori originalnu stranicu",
   "account.posts": "Objave",

app/javascript/mastodon/locales/hu.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
+  "account.blocking": "Tiltás",
   "account.cancel_follow_request": "Követési kérés visszavonása",
   "account.copy": "Hivatkozás másolása a profilba",
   "account.direct": "@{name} személyes említése",
   "account.disable_notifications": "Ne figyelmeztessen, ha @{name} bejegyzést tesz közzé",
-  "account.domain_blocked": "Letiltott domain",
+  "account.domain_blocking": "Domain tiltás",
   "account.edit_profile": "Profil szerkesztése",
   "account.enable_notifications": "Figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.endorse": "Kiemelés a profilodon",
+  "account.featured": "Kiemelt",
+  "account.featured.hashtags": "Hashtagek",
+  "account.featured.posts": "Bejegyzések",
   "account.featured_tags.last_status_at": "Legutolsó bejegyzés ideje: {date}",
   "account.featured_tags.last_status_never": "Nincs bejegyzés",
-  "account.featured_tags.title": "{name} kiemelt hashtagjei",
   "account.follow": "Követés",
   "account.follow_back": "Viszontkövetés",
   "account.followers": "Követő",
@@ -38,6 +41,7 @@
   "account.following": "Követve",
   "account.following_counter": "{count, plural, one {{counter} követett} other {{counter} követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
+  "account.follows_you": "Követ téged",
   "account.go_to_profile": "Ugrás a profilhoz",
   "account.hide_reblogs": "@{name} megtolásainak elrejtése",
   "account.in_memoriam": "Emlékünkben.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Értesítések némítása",
   "account.mute_short": "Némítás",
   "account.muted": "Némítva",
-  "account.mutual": "Kölcsönös",
+  "account.muting": "Némítás",
+  "account.mutual": "Követitek egymást",
   "account.no_bio": "Leírás nincs megadva.",
   "account.open_original_page": "Eredeti oldal megnyitása",
   "account.posts": "Bejegyzések",
@@ -60,6 +65,7 @@
   "account.report": "@{name} jelentése",
   "account.requested": "Jóváhagyásra vár. Kattints a követési kérés visszavonásához",
   "account.requested_follow": "{name} kérte, hogy követhessen",
+  "account.requests_to_follow_you": "Kéri, hogy követhessen",
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
   "account.statuses_counter": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Keresési találatok",
   "emoji_button.symbols": "Szimbólumok",
   "emoji_button.travel": "Utazás és helyek",
+  "empty_column.account_featured.me": "Még semmit sem emeltél ki. Tudtad, hogy kiemelheted a profilodon a bejegyzéseidet, a legtöbbet használt hashtageidet, és még a barátaid fiókját is?",
+  "empty_column.account_featured.other": "{acct} még semmit sem emelt ki. Tudtad, hogy kiemelheted a profilodon a bejegyzéseidet, a legtöbbet használt hashtageidet, és még a barátaid fiókját is?",
+  "empty_column.account_featured_other.unknown": "Ez a fiók még semmit sem emelt ki.",
   "empty_column.account_hides_collections": "Ez a felhasználó úgy döntött, hogy nem teszi elérhetővé ezt az információt.",
   "empty_column.account_suspended": "Fiók felfüggesztve",
   "empty_column.account_timeline": "Itt nincs bejegyzés!",
@@ -378,6 +387,8 @@
   "generic.saved": "Elmentve",
   "getting_started.heading": "Első lépések",
   "hashtag.admin_moderation": "Moderációs felület megnyitása a következőhöz: #{name}",
+  "hashtag.browse": "Bejegyzések ebben: #{hashtag}",
+  "hashtag.browse_from_account": "@{name} bejegyzéseinek tallózása ebben: #{hashtag}",
   "hashtag.column_header.tag_mode.all": "és {additional}",
   "hashtag.column_header.tag_mode.any": "vagy {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} nélkül",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bejegyzés} other {{counter} bejegyzés}} ma",
   "hashtag.follow": "Hashtag követése",
+  "hashtag.mute": "#{hashtag} némítása",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
   "hints.profiles.followers_may_be_missing": "A profil követői lehet, hogy hiányoznak.",

app/javascript/mastodon/locales/hy.json

@@ -17,7 +17,6 @@
   "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Մասնաւոր յիշատակում @{name}",
   "account.disable_notifications": "Ծանուցումները անջատել @{name} գրառումների համար",
-  "account.domain_blocked": "Տիրոյթը արգելափակուած է",
   "account.edit_profile": "Խմբագրել հաշիւը",
   "account.enable_notifications": "Ծանուցել ինձ @{name} գրառումների մասին",
   "account.endorse": "Ցուցադրել անձնական էջում",

app/javascript/mastodon/locales/ia.json

@@ -23,13 +23,11 @@
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
   "account.disable_notifications": "Non plus notificar me quando @{name} publica",
-  "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
   "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
   "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
   "account.featured_tags.last_status_never": "Necun message",
-  "account.featured_tags.title": "Hashtags eminente de {name}",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer in retorno",
   "account.followers": "Sequitores",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Silentiar le notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiate",
-  "account.mutual": "Mutue",
   "account.no_bio": "Nulle description fornite.",
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",

app/javascript/mastodon/locales/id.json

@@ -23,13 +23,11 @@
   "account.copy": "Salin tautan ke profil",
   "account.direct": "Sebut secara pribadi @{name}",
   "account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
-  "account.domain_blocked": "Domain diblokir",
   "account.edit_profile": "Ubah profil",
   "account.enable_notifications": "Beritahu saya saat @{name} memposting",
   "account.endorse": "Tampilkan di profil",
   "account.featured_tags.last_status_at": "Kiriman terakhir pada {date}",
   "account.featured_tags.last_status_never": "Tidak ada kiriman",
-  "account.featured_tags.title": "Tagar {name} yang difiturkan",
   "account.follow": "Ikuti",
   "account.follow_back": "Ikuti balik",
   "account.followers": "Pengikut",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Senyapkan Notifikasi",
   "account.mute_short": "Senyapkan",
   "account.muted": "Dibisukan",
-  "account.mutual": "Saling ikuti",
   "account.no_bio": "Tidak ada deskripsi yang diberikan.",
   "account.open_original_page": "Buka halaman asli",
   "account.posts": "Kiriman",

app/javascript/mastodon/locales/ie.json

@@ -22,13 +22,11 @@
   "account.copy": "Copiar ligament al profil",
   "account.direct": "Privatmen mentionar @{name}",
   "account.disable_notifications": "Cessa notificar me quande @{name} posta",
-  "account.domain_blocked": "Dominia bloccat",
   "account.edit_profile": "Redacter profil",
   "account.enable_notifications": "Notificar me quande @{name} posta",
   "account.endorse": "Recomandar sur profil",
   "account.featured_tags.last_status_at": "Ultim posta ye {date}",
   "account.featured_tags.last_status_never": "Null postas",
-  "account.featured_tags.title": "Recomandat hashtags de {name}",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer reciprocmen",
   "account.followers": "Sequitores",
@@ -49,7 +47,6 @@
   "account.mute_notifications_short": "Silentiar notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiat",
-  "account.mutual": "Reciproc",
   "account.no_bio": "Null descrition providet.",
   "account.open_original_page": "Aperter li págine original",
   "account.posts": "Postas",

app/javascript/mastodon/locales/io.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopiez ligilo al profilo",
   "account.direct": "Private mencionez @{name}",
   "account.disable_notifications": "Cesez avizar me kande @{name} postas",
-  "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Redaktar profilo",
   "account.enable_notifications": "Avizez me kande @{name} postas",
   "account.endorse": "Traito di profilo",
   "account.featured_tags.last_status_at": "Antea posto ye {date}",
   "account.featured_tags.last_status_never": "Nula posti",
-  "account.featured_tags.title": "Ekstaca gretvorti di {name}",
   "account.follow": "Sequar",
   "account.follow_back": "Anke sequez",
   "account.followers": "Sequanti",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Silencigez avizi",
   "account.mute_short": "Silencigez",
   "account.muted": "Silencigata",
-  "account.mutual": "Mutuala",
   "account.no_bio": "Deskriptajo ne provizesis.",
   "account.open_original_page": "Apertez originala pagino",
   "account.posts": "Mesaji",

app/javascript/mastodon/locales/is.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Útiloka lénið {domain}",
   "account.block_short": "Útiloka",
   "account.blocked": "Útilokaður",
+  "account.blocking": "Útilokun",
   "account.cancel_follow_request": "Taka fylgjendabeiðni til baka",
   "account.copy": "Afrita tengil í notandasnið",
   "account.direct": "Einkaspjall við @{name}",
   "account.disable_notifications": "Hætta að láta mig vita þegar @{name} sendir inn",
-  "account.domain_blocked": "Lén útilokað",
+  "account.domain_blocking": "Útiloka lén",
   "account.edit_profile": "Breyta notandasniði",
   "account.enable_notifications": "Láta mig vita þegar @{name} sendir inn",
   "account.endorse": "Birta á notandasniði",
+  "account.featured": "Með aukið vægi",
+  "account.featured.hashtags": "Myllumerki",
+  "account.featured.posts": "Færslur",
   "account.featured_tags.last_status_at": "Síðasta færsla þann {date}",
   "account.featured_tags.last_status_never": "Engar færslur",
-  "account.featured_tags.title": "Myllumerki hjá {name} með aukið vægi",
   "account.follow": "Fylgjast með",
   "account.follow_back": "Fylgjast með til baka",
   "account.followers": "Fylgjendur",
@@ -38,6 +41,7 @@
   "account.following": "Fylgist með",
   "account.following_counter": "{count, plural, one {Fylgist með: {counter}} other {Fylgist með: {counter}}}",
   "account.follows.empty": "Þessi notandi fylgist ennþá ekki með neinum.",
+  "account.follows_you": "Fylgir þér",
   "account.go_to_profile": "Fara í notandasnið",
   "account.hide_reblogs": "Fela endurbirtingar fyrir @{name}",
   "account.in_memoriam": "Minning.",
@@ -52,7 +56,8 @@
   "account.mute_notifications_short": "Þagga í tilkynningum",
   "account.mute_short": "Þagga niður",
   "account.muted": "Þaggaður",
-  "account.mutual": "Sameiginlegir",
+  "account.muting": "Þöggun",
+  "account.mutual": "Þið fylgist með hvor öðrum",
   "account.no_bio": "Engri lýsingu útvegað.",
   "account.open_original_page": "Opna upprunalega síðu",
   "account.posts": "Færslur",
@@ -60,6 +65,7 @@
   "account.report": "Kæra @{name}",
   "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
   "account.requested_follow": "{name} hefur beðið um að fylgjast með þér",
+  "account.requests_to_follow_you": "Bað um að fylgjast með þér",
   "account.share": "Deila notandasniði fyrir @{name}",
   "account.show_reblogs": "Sýna endurbirtingar frá @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
@@ -378,6 +384,8 @@
   "generic.saved": "Vistað",
   "getting_started.heading": "Komast í gang",
   "hashtag.admin_moderation": "Opna umsjónarviðmót fyrir #{name}",
+  "hashtag.browse": "Skoða færslur með #{hashtag}",
+  "hashtag.browse_from_account": "Skoða færslur frá @{name} í #{hashtag}",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eða {additional}",
   "hashtag.column_header.tag_mode.none": "án {additional}",
@@ -391,6 +399,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} færsla} other {{counter} færslur}} í dag",
   "hashtag.follow": "Fylgjast með myllumerki",
+  "hashtag.mute": "Þagga #{hashtag}",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
   "hints.profiles.followers_may_be_missing": "Fylgjendur frá þessum notanda gæti vantað.",

app/javascript/mastodon/locales/it.json

@@ -23,13 +23,14 @@
   "account.copy": "Copia link del profilo",
   "account.direct": "Menziona privatamente @{name}",
   "account.disable_notifications": "Smetti di avvisarmi quando @{name} pubblica un post",
-  "account.domain_blocked": "Dominio bloccato",
   "account.edit_profile": "Modifica profilo",
   "account.enable_notifications": "Avvisami quando @{name} pubblica un post",
   "account.endorse": "In evidenza sul profilo",
+  "account.featured": "In primo piano",
+  "account.featured.hashtags": "Hashtag",
+  "account.featured.posts": "Post",
   "account.featured_tags.last_status_at": "Ultimo post il {date}",
   "account.featured_tags.last_status_never": "Nessun post",
-  "account.featured_tags.title": "Hashtag in evidenza di {name}",
   "account.follow": "Segui",
   "account.follow_back": "Segui a tua volta",
   "account.followers": "Follower",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Silenzia notifiche",
   "account.mute_short": "Silenzia",
   "account.muted": "Mutato",
-  "account.mutual": "Reciproco",
   "account.no_bio": "Nessuna descrizione fornita.",
   "account.open_original_page": "Apri la pagina originale",
   "account.posts": "Post",
@@ -378,6 +378,8 @@
   "generic.saved": "Salvato",
   "getting_started.heading": "Per iniziare",
   "hashtag.admin_moderation": "Apri l'interfaccia di moderazione per #{name}",
+  "hashtag.browse": "Sfoglia i post con #{hashtag}",
+  "hashtag.browse_from_account": "Sfoglia i post da @{name} con #{hashtag}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} post}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} post}} oggi",
   "hashtag.follow": "Segui l'hashtag",
+  "hashtag.mute": "Silenzia #{hashtag}",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
   "hints.profiles.followers_may_be_missing": "I seguaci per questo profilo potrebbero essere mancanti.",

app/javascript/mastodon/locales/ja.json

@@ -23,13 +23,11 @@
   "account.copy": "プロフィールへのリンクをコピー",
   "account.direct": "@{name}さんに非公開でメンション",
   "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
-  "account.domain_blocked": "ドメインブロック中",
   "account.edit_profile": "プロフィール編集",
   "account.enable_notifications": "@{name}さんの投稿時に通知",
   "account.endorse": "プロフィールで紹介する",
   "account.featured_tags.last_status_at": "最終投稿 {date}",
   "account.featured_tags.last_status_never": "投稿がありません",
-  "account.featured_tags.title": "{name}の注目ハッシュタグ",
   "account.follow": "フォロー",
   "account.follow_back": "フォローバック",
   "account.followers": "フォロワー",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "通知をオフにする",
   "account.mute_short": "ミュート",
   "account.muted": "ミュート済み",
-  "account.mutual": "相互フォロー中",
   "account.no_bio": "説明が提供されていません。",
   "account.open_original_page": "元のページを開く",
   "account.posts": "投稿",

app/javascript/mastodon/locales/ka.json

@@ -8,7 +8,6 @@
   "account.block_domain": "დაიმალოს ყველაფერი დომენიდან {domain}",
   "account.blocked": "დაბლოკილია",
   "account.cancel_follow_request": "Withdraw follow request",
-  "account.domain_blocked": "დომენი დამალულია",
   "account.edit_profile": "პროფილის ცვლილება",
   "account.endorse": "გამორჩევა პროფილზე",
   "account.featured_tags.last_status_never": "პოსტების გარეშე",

app/javascript/mastodon/locales/kab.json

@@ -21,10 +21,11 @@
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.direct": "Bder-d @{name} weḥd-s",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
-  "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.featured.hashtags": "Ihacṭagen",
+  "account.featured.posts": "Tisuffaɣ",
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
@@ -48,7 +49,6 @@
   "account.mute_notifications_short": "Susem ilɣa",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
-  "account.mutual": "Temṭafarem",
   "account.no_bio": "Ulac aglam i d-yettunefken.",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
@@ -74,7 +74,7 @@
   "alert.rate_limited.title": "Aktum s talast",
   "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
   "alert.unexpected.title": "Ayhuh!",
-  "alt_text_badge.title": "Aḍris asegzan",
+  "alt_text_badge.title": "Aḍris amlellay",
   "alt_text_modal.add_alt_text": "Rnu aḍris amlellay",
   "alt_text_modal.add_text_from_image": "Rnu aḍris amlellay seg tugna",
   "alt_text_modal.cancel": "Semmet",
@@ -172,6 +172,7 @@
   "confirmations.logout.title": "Tebɣiḍ ad teffɣeḍ ssya?",
   "confirmations.missing_alt_text.confirm": "Rnu aḍris amlellay",
   "confirmations.missing_alt_text.secondary": "Suffeɣ akken yebɣu yili",
+  "confirmations.missing_alt_text.title": "Rnu aḍris amlellay?",
   "confirmations.mute.confirm": "Sgugem",
   "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
   "confirmations.reply.confirm": "Err",
@@ -259,8 +260,11 @@
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
   "follow_suggestions.featured_longer": "Yettwafraned s ufus sɣur agraw n {domain}",
+  "follow_suggestions.friends_of_friends_longer": "D aɣeṛfan ar wid i teṭṭafareḍ",
   "follow_suggestions.hints.featured": "Amaɣnu-a ifren-it-id wegraw n {domain} s ufus.",
-  "follow_suggestions.popular_suggestion_longer": "Yettwassen deg {domain}",
+  "follow_suggestions.hints.friends_of_friends": "Amaɣnu-a d aɣeṛfan ɣer wid i teṭṭafaṛeḍ.",
+  "follow_suggestions.popular_suggestion": "Asumer aɣeṛfan",
+  "follow_suggestions.popular_suggestion_longer": "D aɣeṛfan deg {domain}",
   "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
@@ -635,6 +639,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Suqel",
   "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
+  "status.uncached_media_warning": "Ulac taskant",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
   "status.unpin": "Kkes asenteḍ seg umaɣnu",
   "subscribed_languages.save": "Sekles ibeddilen",

app/javascript/mastodon/locales/kk.json

@@ -20,12 +20,10 @@
   "account.blocked": "Бұғатталған",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} постары туралы ескертпеу",
-  "account.domain_blocked": "Домен бұғатталған",
   "account.edit_profile": "Профильді өңдеу",
   "account.enable_notifications": "@{name} постары туралы ескерту",
   "account.endorse": "Профильде ұсыну",
   "account.featured_tags.last_status_never": "Пост жоқ",
-  "account.featured_tags.title": "{name} таңдаулы хэштегтері",
   "account.follow": "Жазылу",
   "account.followers": "Жазылушы",
   "account.followers.empty": "Бұл қолданушыға әлі ешкім жазылмаған.",

app/javascript/mastodon/locales/kn.json

@@ -9,7 +9,6 @@
   "account.badges.group": "ಗುಂಪು",
   "account.block_domain": "Hide everything from {domain}",
   "account.cancel_follow_request": "Withdraw follow request",
-  "account.domain_blocked": "Domain hidden",
   "account.follow": "ಹಿಂಬಾಲಿಸಿ",
   "account.followers": "ಹಿಂಬಾಲಕರು",
   "account.posts": "ಟೂಟ್‌ಗಳು",

app/javascript/mastodon/locales/ko.json

@@ -23,13 +23,14 @@
   "account.copy": "프로필 링크 복사",
   "account.direct": "@{name} 님에게 개인적으로 멘션",
   "account.disable_notifications": "@{name} 의 게시물 알림 끄기",
-  "account.domain_blocked": "도메인 차단함",
   "account.edit_profile": "프로필 편집",
   "account.enable_notifications": "@{name} 의 게시물 알림 켜기",
   "account.endorse": "프로필에 추천하기",
+  "account.featured": "추천",
+  "account.featured.hashtags": "해시태그",
+  "account.featured.posts": "게시물",
   "account.featured_tags.last_status_at": "{date}에 마지막으로 게시",
   "account.featured_tags.last_status_never": "게시물 없음",
-  "account.featured_tags.title": "{name} 님의 추천 해시태그",
   "account.follow": "팔로우",
   "account.follow_back": "맞팔로우",
   "account.followers": "팔로워",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "알림 뮤트",
   "account.mute_short": "뮤트",
   "account.muted": "뮤트됨",
-  "account.mutual": "맞팔로우 중",
   "account.no_bio": "제공된 설명이 없습니다.",
   "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",
@@ -65,6 +65,7 @@
   "account.statuses_counter": "{count, plural, other {게시물 {counter}개}}",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
+  "account.unblock_domain_short": "차단 해제",
   "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
   "account.unfollow": "언팔로우",
@@ -377,6 +378,8 @@
   "generic.saved": "저장됨",
   "getting_started.heading": "시작하기",
   "hashtag.admin_moderation": "#{name}에 대한 중재화면 열기",
+  "hashtag.browse": "#{hashtag}의 게시물 둘러보기",
+  "hashtag.browse_from_account": "@{name}의 #{hashtag} 게시물 둘러보기",
   "hashtag.column_header.tag_mode.all": "및 {additional}",
   "hashtag.column_header.tag_mode.any": "또는 {additional}",
   "hashtag.column_header.tag_mode.none": "{additional}를 제외하고",
@@ -390,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, other {게시물 {counter}개}}",
   "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
   "hashtag.follow": "해시태그 팔로우",
+  "hashtag.mute": "#{hashtag} 뮤트",
   "hashtag.unfollow": "해시태그 팔로우 해제",
   "hashtags.and_other": "…및 {count, plural,other {#개}}",
   "hints.profiles.followers_may_be_missing": "이 프로필의 팔로워 목록은 일부 누락되었을 수 있습니다.",

app/javascript/mastodon/locales/ku.json

@@ -23,13 +23,11 @@
   "account.copy": "Girêdanê bo profîlê jê bigire",
   "account.direct": "Bi taybetî qale @{name} bike",
   "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
-  "account.domain_blocked": "Navper hate astengkirin",
   "account.edit_profile": "Profîlê serrast bike",
   "account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
   "account.endorse": "Taybetiyên li ser profîl",
   "account.featured_tags.last_status_at": "Şandiya dawî di {date} de",
   "account.featured_tags.last_status_never": "Şandî tune ne",
-  "account.featured_tags.title": "{name}'s hashtagên taybet",
   "account.follow": "Bişopîne",
   "account.follow_back": "Bişopîne",
   "account.followers": "Şopîner",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Agahdariyan bêdeng bike",
   "account.mute_short": "Bêdeng bike",
   "account.muted": "Bêdengkirî",
-  "account.mutual": "Hevpar",
   "account.no_bio": "Ti danasîn nehatiye tevlîkirin.",
   "account.open_original_page": "Rûpela resen veke",
   "account.posts": "Şandî",

app/javascript/mastodon/locales/kw.json

@@ -8,7 +8,6 @@
   "account.blocked": "Lettys",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Hedhi ow gwarnya pan wra @{name} postya",
-  "account.domain_blocked": "Gorfarth lettys",
   "account.edit_profile": "Golegi profil",
   "account.enable_notifications": "Gwra ow gwarnya pan wra @{name} postya",
   "account.endorse": "Diskwedhes yn profil",

app/javascript/mastodon/locales/la.json

@@ -20,10 +20,8 @@
   "account.block_short": "Imperire",
   "account.blocked": "Impeditum est",
   "account.cancel_follow_request": "Petitio sequī retrāhere",
-  "account.domain_blocked": "Dominium impeditum",
   "account.edit_profile": "Recolere notionem",
   "account.featured_tags.last_status_never": "Nulla contributa",
-  "account.featured_tags.title": "Hashtag notātī {name}",
   "account.followers_counter": "{count, plural, one {{counter} sectator} other {{counter} sectatores}}",
   "account.following_counter": "{count, plural, one {{counter} sectans} other {{counter} sectans}}",
   "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",

app/javascript/mastodon/locales/lad.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopia atadijo de profil",
   "account.direct": "Enmenta a @{name} en privado",
   "account.disable_notifications": "Desha de avizarme sovre publikasyones de @{name}",
-  "account.domain_blocked": "Domeno blokado",
   "account.edit_profile": "Edita profil",
   "account.enable_notifications": "Avizame kuando @{name} publike",
   "account.endorse": "Avalia en profil",
   "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
   "account.featured_tags.last_status_never": "No ay publikasyones",
-  "account.featured_tags.title": "Etiketas avaliadas de {name}",
   "account.follow": "Sige",
   "account.follow_back": "Sige tamyen",
   "account.followers": "Suivantes",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Silensia avizos",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
-  "account.mutual": "Mutual",
   "account.no_bio": "No ay deskripsion.",
   "account.open_original_page": "Avre pajina orijnala",
   "account.posts": "Publikasyones",

app/javascript/mastodon/locales/lt.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopijuoti nuorodą į profilį",
   "account.direct": "Privačiai paminėti @{name}",
   "account.disable_notifications": "Nustoti man pranešti, kai @{name} paskelbia",
-  "account.domain_blocked": "Užblokuotas serveris",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
   "account.endorse": "Rodyti profilyje",
   "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
-  "account.featured_tags.title": "{name} rodomi saitažodžiai",
   "account.follow": "Sekti",
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Nutildyti pranešimus",
   "account.mute_short": "Nutildyti",
   "account.muted": "Nutildytas",
-  "account.mutual": "Bendri",
   "account.no_bio": "Nėra pateikto aprašymo.",
   "account.open_original_page": "Atidaryti originalų puslapį",
   "account.posts": "Įrašai",
@@ -890,6 +887,8 @@
   "video.expand": "Išplėsti vaizdo įrašą",
   "video.fullscreen": "Visas ekranas",
   "video.hide": "Slėpti vaizdo įrašą",
+  "video.mute": "Išjungti garsą",
   "video.pause": "Pristabdyti",
-  "video.play": "Leisti"
+  "video.play": "Leisti",
+  "video.skip_backward": "Praleisti atgal"
 }

app/javascript/mastodon/locales/lv.json

@@ -23,13 +23,11 @@
   "account.copy": "Ievietot saiti uz profilu starpliktuvē",
   "account.direct": "Pieminēt @{name} privāti",
   "account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
-  "account.domain_blocked": "Domēns ir bloķēts",
   "account.edit_profile": "Labot profilu",
   "account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
   "account.endorse": "Izcelts profilā",
   "account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
   "account.featured_tags.last_status_never": "Ierakstu nav",
-  "account.featured_tags.title": "{name} izceltie tēmturi",
   "account.follow": "Sekot",
   "account.follow_back": "Sekot atpakaļ",
   "account.followers": "Sekotāji",
@@ -52,9 +50,8 @@
   "account.mute_notifications_short": "Izslēgt paziņojumu skaņu",
   "account.mute_short": "Apklusināt",
   "account.muted": "Apklusināts",
-  "account.mutual": "Abpusēji",
   "account.no_bio": "Apraksts nav sniegts.",
-  "account.open_original_page": "Atvērt oriģinālo lapu",
+  "account.open_original_page": "Atvērt pirmavota lapu",
   "account.posts": "Ieraksti",
   "account.posts_with_replies": "Ieraksti un atbildes",
   "account.report": "Sūdzēties par @{name}",
@@ -214,7 +211,7 @@
   "confirmations.missing_alt_text.secondary": "Vienalga iesūtīt",
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
-  "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
+  "confirmations.redraft.message": "Vai tiešām vēlies izdzēst šo ierakstu un veidot jaunu tā uzmetumu? Pievienošana izlasēs un pastiprinājumi tiks zaudēti, un sākotnējā ieraksta atbildes paliks bez saiknes ar to.",
   "confirmations.redraft.title": "Dzēst un rakstīt vēlreiz?",
   "confirmations.reply.confirm": "Atbildēt",
   "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
@@ -597,7 +594,7 @@
   "report.close": "Darīts",
   "report.comment.title": "Vai, tavuprāt, mums vēl būtu kas jāzina?",
   "report.forward": "Pārsūtīt {target}",
-  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
+  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu ziņojuma kopiju arī tur?",
   "report.mute": "Apklusināt",
   "report.mute_explanation": "Tu neredzēsi viņu ierakstus. Viņi joprojām var Tev sekot un redzēt Tavus ierakstus un nezinās, ka viņi ir apklusināti.",
   "report.next": "Tālāk",
@@ -692,7 +689,7 @@
   "status.pinned": "Piesprausts ieraksts",
   "status.read_more": "Lasīt vairāk",
   "status.reblog": "Pastiprināt",
-  "status.reblog_private": "Pastiprināt, nemainot redzamību",
+  "status.reblog_private": "Pastiprināt ar sākotnējo redzamību",
   "status.reblogged_by": "{name} pastiprināja",
   "status.reblogs": "{count, plural, zero {pastiprinājumu} one {pastiprinājums} other {pastiprinājumi}}",
   "status.reblogs.empty": "Neviens šo ierakstu vēl nav pastiprinājis. Kad būs, tie parādīsies šeit.",
@@ -706,7 +703,7 @@
   "status.share": "Kopīgot",
   "status.show_less_all": "Rādīt mazāk visiem",
   "status.show_more_all": "Rādīt vairāk visiem",
-  "status.show_original": "Rādīt oriģinālu",
+  "status.show_original": "Rādīt pirmavotu",
   "status.title.with_attachments": "{user} publicējis {attachmentCount, plural, one {pielikumu} other {{attachmentCount} pielikumus}}",
   "status.translate": "Tulkot",
   "status.translated_from_with": "Tulkots no {lang} izmantojot {provider}",

app/javascript/mastodon/locales/mk.json

@@ -17,7 +17,6 @@
   "account.block_domain": "Сокријај се од {domain}",
   "account.blocked": "Блокиран",
   "account.cancel_follow_request": "Withdraw follow request",
-  "account.domain_blocked": "Скриен домен",
   "account.edit_profile": "Измени профил",
   "account.endorse": "Карактеристики на профилот",
   "account.follow": "Следи",

app/javascript/mastodon/locales/ml.json

@@ -17,7 +17,6 @@
   "account.copy": "രൂപരേഖയിന്റെ വിലാസം പകർത്തുക",
   "account.direct": "സ്വകാരൃമായിട്ടു് @{name}-ന് സൂചനപിക്കുക",
   "account.disable_notifications": "@{name} പോസ്റ്റുചെയ്യുന്നത് എന്നെ അറിയിക്കുന്നത് നിർത്തുക",
-  "account.domain_blocked": "മേഖല തടഞ്ഞു",
   "account.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "account.enable_notifications": "@{name} പോസ്റ്റ് ചെയ്യുമ്പോൾ എന്നെ അറിയിക്കുക",
   "account.endorse": "പ്രൊഫൈലിൽ പ്രകടമാക്കുക",

app/javascript/mastodon/locales/mr.json

@@ -22,13 +22,11 @@
   "account.copy": "दुवा कॉपी करा",
   "account.direct": "खाजगीरित्या उल्लेखीत @{name}",
   "account.disable_notifications": "जेव्हा @{name} पोस्ट करतात तेव्हा मला सूचित करणे थांबवा",
-  "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "प्रोफाइल एडिट करा",
   "account.enable_notifications": "जेव्हा @{name} पोस्ट करते तेव्हा मला सूचित करा",
   "account.endorse": "प्रोफाइलवरील वैशिष्ट्य",
   "account.featured_tags.last_status_at": "शेवटचे पोस्ट {date} रोजी",
   "account.featured_tags.last_status_never": "पोस्ट नाहीत",
-  "account.featured_tags.title": "{name} चे वैशिष्ट्यीकृत हॅशटॅग",
   "account.follow": "अनुयायी व्हा",
   "account.follow_back": "आपणही अनुसरण करा",
   "account.followers": "अनुयायी",

app/javascript/mastodon/locales/ms.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Pelayan yang disederhanakan",
+  "about.blocks": "Pelayan yang diselaraskan",
   "about.contact": "Hubungi:",
   "about.disclaimer": "Mastodon ialah perisian sumber terbuka percuma, dan merupakan tanda dagangan Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Sebab tidak tersedia",
@@ -11,48 +11,45 @@
   "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
   "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
   "about.rules": "Peraturan pelayan",
-  "account.account_note_header": "Personal note",
+  "account.account_note_header": "Catatan peribadi",
   "account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatik",
   "account.badges.group": "Kumpulan",
   "account.block": "Sekat @{name}",
   "account.block_domain": "Sekat domain {domain}",
-  "account.block_short": "Malay",
+  "account.block_short": "Sekat",
   "account.blocked": "Disekat",
   "account.cancel_follow_request": "Batalkan permintaan ikut",
   "account.copy": "Salin pautan ke profil",
   "account.direct": "Sebut secara persendirian @{name}",
   "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
-  "account.domain_blocked": "Domain disekat",
   "account.edit_profile": "Sunting profil",
   "account.enable_notifications": "Maklumi saya apabila @{name} mengirim hantaran",
   "account.endorse": "Tampilkan di profil",
   "account.featured_tags.last_status_at": "Hantaran terakhir pada {date}",
   "account.featured_tags.last_status_never": "Tiada hantaran",
-  "account.featured_tags.title": "Tanda pagar pilihan {name}",
   "account.follow": "Ikuti",
   "account.follow_back": "Ikut balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
-  "account.followers_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
+  "account.followers_counter": "{count, plural, one {{counter} pengikut} other {{counter} pengikut}}",
-  "account.following": "Mengikuti",
+  "account.following": "Ikutan",
-  "account.following_counter": "{count, plural, other {{counter} following}}",
+  "account.following_counter": "{count, plural, other {{counter} ikutan}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
-  "account.in_memoriam": "Dalam Memoriam.",
+  "account.in_memoriam": "Dalam kenangan.",
-  "account.joined_short": "Menyertai",
+  "account.joined_short": "Tarikh penyertaan",
-  "account.languages": "Tukar bahasa yang dilanggan",
+  "account.languages": "Tukar bahasa langganan",
   "account.link_verified_on": "Pemilikan pautan ini telah disemak pada {date}",
-  "account.locked_info": "Status privasi akaun ini dikunci. Pemiliknya menyaring sendiri siapa yang boleh mengikutinya.",
+  "account.locked_info": "Taraf privasi akaun ini dikunci. Pemiliknya menyaring sendiri siapa yang boleh mengikutinya.",
   "account.media": "Media",
   "account.mention": "Sebut @{name}",
   "account.moved_to": "{name} telah menandakan bahawa akaun baru mereka sekarang ialah:",
-  "account.mute": "Bisukan @{name}",
+  "account.mute": "Redamkan @{name}",
-  "account.mute_notifications_short": "Redam pemberitahuan",
+  "account.mute_notifications_short": "Redamkan pemberitahuan",
   "account.mute_short": "Redam",
-  "account.muted": "Dibisukan",
+  "account.muted": "Diredamkan",
-  "account.mutual": "Rakan kongsi",
   "account.no_bio": "Tiada penerangan diberikan.",
   "account.open_original_page": "Buka halaman asal",
   "account.posts": "Hantaran",
@@ -65,12 +62,13 @@
   "account.statuses_counter": "{count, plural, other {{counter} siaran}}",
   "account.unblock": "Nyahsekat @{name}",
   "account.unblock_domain": "Nyahsekat domain {domain}",
+  "account.unblock_domain_short": "Nyahsekat",
   "account.unblock_short": "Nyahsekat",
   "account.unendorse": "Jangan tampilkan di profil",
   "account.unfollow": "Nyahikut",
   "account.unmute": "Nyahbisukan @{name}",
-  "account.unmute_notifications_short": "Nyahredam notifikasi",
+  "account.unmute_notifications_short": "Nyahredamkan pemberitahuan",
-  "account.unmute_short": "Nyahbisu",
+  "account.unmute_short": "Nyahredam",
   "account_note.placeholder": "Klik untuk menambah catatan",
   "admin.dashboard.daily_retention": "Kadar pengekalan pengguna mengikut hari selepas mendaftar",
   "admin.dashboard.monthly_retention": "Kadar pengekalan pengguna mengikut bulan selepas mendaftar",
@@ -116,6 +114,8 @@
   "attachments_list.unprocessed": "(belum diproses)",
   "audio.hide": "Sembunyikan audio",
   "block_modal.remote_users_caveat": "Kami akan meminta pelayan {domain} untuk menghormati keputusan anda. Bagaimanapun, pematuhan tidak dijamin kerana ada pelayan yang mungkin menangani sekatan dengan cara berbeza. Hantaran awam mungkin masih tampak kepada pengguna yang tidak log masuk.",
+  "block_modal.show_less": "Tunjuk kurang",
+  "block_modal.show_more": "Tunjuk lebih",
   "block_modal.they_cant_mention": "Dia tidak boleh menyebut tentang anda atau mengikut anda.",
   "block_modal.they_cant_see_posts": "Dia tidak boleh melihat hantaran anda dan sebaliknya.",
   "block_modal.they_will_know": "Dia boleh lihat bahawa dia disekat.",
@@ -142,13 +142,13 @@
   "closed_registrations_modal.preamble": "Mastodon adalah terpencar, oleh itu di mana-mana anda mencipta akaun anda, anda boleh mengikut dan berinteraksi dengan sesiapa pada pelayan ini. Anda juga boleh hos sendiri!",
   "closed_registrations_modal.title": "Mendaftar pada Mastodon",
   "column.about": "Perihal",
-  "column.blocks": "Pengguna yang disekat",
+  "column.blocks": "Pengguna tersekat",
   "column.bookmarks": "Tanda buku",
   "column.community": "Garis masa tempatan",
   "column.create_list": "Cipta senarai",
   "column.direct": "Sebutan peribadi",
   "column.directory": "Layari profil",
-  "column.domain_blocks": "Domain disekat",
+  "column.domain_blocks": "Domain tersekat",
   "column.edit_list": "Sunting senarai",
   "column.favourites": "Sukaan",
   "column.firehose": "Suapan langsung",
@@ -156,7 +156,7 @@
   "column.home": "Laman Utama",
   "column.list_members": "Urus ahli senarai",
   "column.lists": "Senarai",
-  "column.mutes": "Pengguna yang dibisukan",
+  "column.mutes": "Pengguna teredam",
   "column.notifications": "Pemberitahuan",
   "column.pins": "Hantaran disemat",
   "column.public": "Garis masa bersekutu",
@@ -218,13 +218,21 @@
   "confirmations.logout.title": "Log keluar?",
   "confirmations.missing_alt_text.confirm": "Tambah teks alternatif",
   "confirmations.missing_alt_text.message": "Hantaran anda mempunyai media tanpa teks alternatif. Kandungan anda akan lebih mudah tercapai jika anda menambah keterangan.",
-  "confirmations.mute.confirm": "Bisukan",
+  "confirmations.missing_alt_text.secondary": "Hantar saja",
+  "confirmations.missing_alt_text.title": "Tambah teks alternatif?",
+  "confirmations.mute.confirm": "Redamkan",
   "confirmations.redraft.confirm": "Padam & rangka semula",
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam hantaran ini dan gubal semula? Sukaan dan galakan akan hilang, dan balasan ke hantaran asal akan menjadi yatim.",
+  "confirmations.redraft.title": "Padam & gubah semula hantaran?",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menulis ganti mesej yang anda sedang karang. Adakah anda pasti anda ingin teruskan?",
+  "confirmations.reply.title": "Tulis ganti hantaran?",
   "confirmations.unfollow.confirm": "Nyahikut",
   "confirmations.unfollow.message": "Adakah anda pasti anda ingin nyahikuti {name}?",
+  "confirmations.unfollow.title": "Berhenti mengikut pengguna?",
+  "content_warning.hide": "Sorok hantaran",
+  "content_warning.show": "Tunjuk saja",
+  "content_warning.show_more": "Tunjuk lebih",
   "conversation.delete": "Padam perbualan",
   "conversation.mark_as_read": "Tanda sudah dibaca",
   "conversation.open": "Lihat perbualan",
@@ -241,6 +249,22 @@
   "dismissable_banner.community_timeline": "Inilah hantaran awam terkini daripada orang yang akaun dihos oleh {domain}.",
   "dismissable_banner.dismiss": "Ketepikan",
   "dismissable_banner.explore_statuses": "Hantaran-hantaran dari seluruh alam bersekutu ini sedang sohor. Hantaran terbaharu dengan lebih banyak galakan dan sukaan diberi kedudukan lebih tinggi.",
+  "dismissable_banner.public_timeline": "Hantaran-hantaran awam terkini ini dari pengguna alam bersekutu yang diikuti oleh pengguna dari {domain}.",
+  "domain_block_modal.block": "Sekat pelayan",
+  "domain_block_modal.block_account_instead": "Sekat @{name} sahaja",
+  "domain_block_modal.they_can_interact_with_old_posts": "Pengguna dari pelayan ini boleh berinteraksi dengan hantaran lama anda.",
+  "domain_block_modal.they_cant_follow": "Pengguna dari pelayan ini tidak boleh mengikuti anda.",
+  "domain_block_modal.they_wont_know": "Dia tidak akan tahu bahawa dia telah disekat.",
+  "domain_block_modal.title": "Sekat domain?",
+  "domain_block_modal.you_will_lose_num_followers": "Anda akan kehilangan {followersCount, plural, other {{followersCountDisplay} pengikut}} dan {followingCount, plural, other {{followingCountDisplay} ikutan}}.",
+  "domain_block_modal.you_will_lose_relationships": "Anda akan kehilangan semua pengikut dan ikutan anda dari pelayan ini.",
+  "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat hantaran atau pemberitahuan dari pengguna pada pelayan ini.",
+  "domain_pill.activitypub_lets_connect": "Hal ini membolehkan anda berhubung dan berinteraksi bukan sahaja dengan pengguna Mastodon tetapi melintasi pelbagai aplikasi sosial juga.",
+  "domain_pill.activitypub_like_language": "ActivityPub adalah seperti bahasa yang digunakan oleh Mastodon untuk berhubung dengan jaringan sosial lain.",
+  "domain_pill.server": "Pelayan",
+  "domain_pill.your_handle": "Pemegang anda:",
+  "domain_pill.your_server": "Rumah maya anda, tempatnya hantaran anda disimpan. Tidak berkenan dengan yang ini? Pindah antara pelayan pada bila-bila masa dan bawa pengikut anda sekali.",
+  "domain_pill.your_username": "Pengenal unik anda pada pelayan ini. Anda mungkin akan berkongsi nama pengguna dengan pengguna daripada pelayan lain.",
   "embed.instructions": "Benam hantaran ini di laman sesawang anda dengan menyalin kod berikut.",
   "embed.preview": "Begini rupanya nanti:",
   "emoji_button.activity": "Aktiviti",
@@ -275,7 +299,7 @@
   "empty_column.hashtag": "Belum ada apa-apa dengan tanda pagar ini.",
   "empty_column.home": "Garis masa laman utama anda kosong! Ikuti lebih ramai orang untuk mengisinya. {suggestions}",
   "empty_column.list": "Tiada apa-apa di senarai ini lagi. Apabila ahli senarai ini menerbitkan hantaran baharu, ia akan dipaparkan di sini.",
-  "empty_column.mutes": "Anda belum membisukan sesiapa.",
+  "empty_column.mutes": "Anda belum meredamkan sesiapa.",
   "empty_column.notifications": "Anda belum ada sebarang pemberitahuan. Apabila orang lain berinteraksi dengan anda, ia akan muncul di sini.",
   "empty_column.public": "Tiada apa-apa di sini! Tulis sesuatu secara awam, atau ikuti pengguna daripada pelayan lain secara manual untuk mengisinya",
   "error.unexpected_crash.explanation": "Disebabkan pepijat dalam kod kami atau masalah keserasian pelayar, halaman ini tidak dapat dipaparkan dengan betulnya.",
@@ -342,6 +366,7 @@
   "hashtag.counter_by_uses": "{count, plural, other {{counter} siaran}}",
   "hashtag.counter_by_uses_today": "{count, plural, other {{counter} siaran}} hari ini",
   "hashtag.follow": "Ikuti hashtag",
+  "hashtag.mute": "Redamkan #{hashtag}",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
@@ -362,7 +387,7 @@
   "intervals.full.hours": "{number, plural, other {# jam}}",
   "intervals.full.minutes": "{number, plural, other {# minit}}",
   "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.blocked": "Buka senarai pengguna tersekat",
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "Tumpu pada lajur",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
@@ -379,7 +404,7 @@
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.muted": "Buka senarai pengguna teredam",
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
@@ -409,24 +434,27 @@
   "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
   "loading_indicator.label": "Memuatkan…",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
+  "mute_modal.indefinite": "Sehingga dinyahredamkan",
+  "mute_modal.they_wont_know": "Dia tidak akan tahu bahawa dia telah diredam.",
+  "mute_modal.title": "Redamkan pengguna?",
   "navigation_bar.about": "Perihal",
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
-  "navigation_bar.blocks": "Pengguna yang disekat",
+  "navigation_bar.blocks": "Pengguna tersekat",
   "navigation_bar.bookmarks": "Tanda buku",
   "navigation_bar.community_timeline": "Garis masa tempatan",
   "navigation_bar.compose": "Karang hantaran baharu",
   "navigation_bar.direct": "Sebutan peribadi",
   "navigation_bar.discover": "Teroka",
-  "navigation_bar.domain_blocks": "Domain disekat",
+  "navigation_bar.domain_blocks": "Domain tersekat",
   "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Sukaan",
-  "navigation_bar.filters": "Perkataan yang dibisukan",
+  "navigation_bar.filters": "Perkataan teredam",
   "navigation_bar.follow_requests": "Permintaan ikutan",
   "navigation_bar.followed_tags": "Ikuti hashtag",
   "navigation_bar.follows_and_followers": "Ikutan dan pengikut",
   "navigation_bar.lists": "Senarai",
   "navigation_bar.logout": "Log keluar",
-  "navigation_bar.mutes": "Pengguna yang dibisukan",
+  "navigation_bar.mutes": "Pengguna teredam",
   "navigation_bar.opened_in_classic_interface": "Kiriman, akaun dan halaman tertentu yang lain dibuka secara lalai di antara muka web klasik.",
   "navigation_bar.personal": "Peribadi",
   "navigation_bar.pins": "Hantaran disemat",
@@ -446,6 +474,8 @@
   "notification.own_poll": "Undian anda telah tamat",
   "notification.reblog": "{name} menggalak hantaran anda",
   "notification.reblog.name_and_others_with_link": "{name} dan <a>{count, plural, other {# orang lain}}</a> telah galakkan hantaran anda",
+  "notification.relationships_severance_event.domain_block": "Pentadbir dari {from} telah menyekat {target} termasuk {followersCount} pengikut anda dan {followingCount, plural, other {# akaun}} ikutan anda.",
+  "notification.relationships_severance_event.user_domain_block": "Anda telah menyekat {target} termasuk {followersCount} pengikut anda dan {followingCount, plural, other {# akaun}} ikutan anda.",
   "notification.status": "{name} baru sahaja mengirim hantaran",
   "notification.update": "{name} menyunting hantaran",
   "notifications.clear": "Buang pemberitahuan",
@@ -525,7 +555,7 @@
   "reply_indicator.cancel": "Batal",
   "reply_indicator.poll": "Undian",
   "report.block": "Sekat",
-  "report.block_explanation": "Anda tidak akan melihat hantaran mereka. Mereka tidak dapat melihat hantaran anda atau mengikuti anda. Mereka akan sedar bahawa mereka disekat.",
+  "report.block_explanation": "Anda tidak akan melihat hantarannya. Dia tidak akan dapat melihat hantaran anda atau mengikuti anda. Dia akan sedar bahawa dia disekat.",
   "report.categories.legal": "Sah",
   "report.categories.other": "Lain-lain",
   "report.categories.spam": "Spam",
@@ -538,7 +568,7 @@
   "report.comment.title": "Adakah ada hal-hal lain yang perlu kita ketahui?",
   "report.forward": "Panjangkan ke {target}",
   "report.forward_hint": "Akaun ini daripada pelayan lain. Hantar salinan laporan yang ditanpanamakan ke sana juga?",
-  "report.mute": "Bisukan",
+  "report.mute": "Redam",
   "report.mute_explanation": "Anda tidak akan melihat siaran mereka. Mereka masih boleh mengikuti dan melihat siaran anda dan tidak akan mengetahui bahawa mereka telah dibisukan.",
   "report.next": "Seterusnya",
   "report.placeholder": "Ulasan tambahan",
@@ -622,8 +652,8 @@
   "status.media_hidden": "Media disembunyikan",
   "status.mention": "Sebut @{name}",
   "status.more": "Lagi",
-  "status.mute": "Bisukan @{name}",
+  "status.mute": "Redamkan @{name}",
-  "status.mute_conversation": "Bisukan perbualan",
+  "status.mute_conversation": "Redamkan perbualan",
   "status.open": "Kembangkan hantaran ini",
   "status.pin": "Semat di profil",
   "status.pinned": "Hantaran disemat",
@@ -649,7 +679,7 @@
   "status.translate": "Menterjemah",
   "status.translated_from_with": "Diterjemah daripada {lang} dengan {provider}",
   "status.uncached_media_warning": "Pratonton tidak tersedia",
-  "status.unmute_conversation": "Nyahbisukan perbualan",
+  "status.unmute_conversation": "Nyahredamkan perbualan",
   "status.unpin": "Nyahsemat daripada profil",
   "subscribed_languages.lead": "Hanya hantaran dalam bahasa-bahasa terpilih akan dipaparkan pada garis masa rumah dan senarai selepas perubahan. Pilih tiada untuk menerima hantaran dalam semua bahasa.",
   "subscribed_languages.save": "Simpan perubahan",
@@ -683,6 +713,8 @@
   "video.expand": "Besarkan video",
   "video.fullscreen": "Skrin penuh",
   "video.hide": "Sembunyikan video",
+  "video.mute": "Redam",
   "video.pause": "Jeda",
-  "video.play": "Main"
+  "video.play": "Main",
+  "video.unmute": "Nyahredam"
 }

app/javascript/mastodon/locales/my.json

@@ -22,13 +22,11 @@
   "account.copy": "လင့်ခ်ကို ပရိုဖိုင်သို့ ကူးယူပါ",
   "account.direct": "@{name} သီးသန့် သိရှိနိုင်အောင် မန်းရှင်းခေါ်မည်",
   "account.disable_notifications": "@{name} ပို့စ်တင်သည့်အခါ ကျွန်ုပ်ထံ အသိပေးခြင်း မပြုလုပ်ရန်။",
-  "account.domain_blocked": "ဒိုမိန်း ပိတ်ပင်ထားခဲ့သည်",
   "account.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
   "account.enable_notifications": "@{name} ပို့စ်တင်သည့်အခါ ကျွန်ုပ်ကို အကြောင်းကြားပါ။",
   "account.endorse": "အကောင့်ပရိုဖိုင်တွင်ဖော်ပြပါ",
   "account.featured_tags.last_status_at": "နောက်ဆုံးပို့စ်ကို {date} တွင် တင်ခဲ့သည်။",
   "account.featured_tags.last_status_never": "ပို့စ်တင်ထားခြင်းမရှိပါ",
-  "account.featured_tags.title": "ဖော်ပြထားသောဟက်ရှ်တက်ခ်များ",
   "account.follow": "စောင့်ကြည့်",
   "account.followers": "စောင့်ကြည့်သူများ",
   "account.followers.empty": "ဤသူကို စောင့်ကြည့်သူ မရှိသေးပါ။",

app/javascript/mastodon/locales/nan.json

@@ -23,13 +23,14 @@
   "account.copy": "Khóo-pih kàu個人資料ê連結",
   "account.direct": "私人提起 @{name}",
   "account.disable_notifications": "停止佇 {name} PO文ê時通知我",
-  "account.domain_blocked": "封鎖ê網域",
   "account.edit_profile": "編輯個人資料",
   "account.enable_notifications": "佇 {name} PO文ê時通知我",
   "account.endorse": "用個人資料推薦對方",
+  "account.featured": "精選ê",
+  "account.featured.hashtags": "Hashtag",
+  "account.featured.posts": "PO文",
   "account.featured_tags.last_status_at": "頂kái tī {date} Po文",
   "account.featured_tags.last_status_never": "無PO文",
-  "account.featured_tags.title": "{name} ê推薦hashtag",
   "account.follow": "跟tuè",
   "account.follow_back": "Tuè tńg去",
   "account.followers": "跟tuè lí ê",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Kā通知消音",
   "account.mute_short": "消音",
   "account.muted": "消音ah",
-  "account.mutual": "相跟tuè",
   "account.no_bio": "Bô提供敘述。",
   "account.open_original_page": "開原來ê頁",
   "account.posts": "PO文",
@@ -378,6 +378,8 @@
   "generic.saved": "儲存ah",
   "getting_started.heading": "開始用",
   "hashtag.admin_moderation": "Phah開 #{name} ê管理界面",
+  "hashtag.browse": "瀏覽佇 #{hashtag} ê PO文",
+  "hashtag.browse_from_account": "瀏覽 @{name} 佇 #{hashtag} 所寫ê PO文",
   "hashtag.column_header.tag_mode.all": "kap {additional}",
   "hashtag.column_header.tag_mode.any": "á是 {additional}",
   "hashtag.column_header.tag_mode.none": "無需要 {additional}",
@@ -391,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} 篇} other {{counter} 篇}} PO文",
   "hashtag.counter_by_uses_today": "Kin-á日有 {count, plural, one {{counter} 篇} other {{counter} 篇}} PO文",
   "hashtag.follow": "跟tuè hashtag",
+  "hashtag.mute": "消音 #{hashtag}",
   "hashtag.unfollow": "取消跟tuè hashtag",
   "hashtags.and_other": "……kap 其他 {count, plural, other {# ê}}",
   "hints.profiles.followers_may_be_missing": "Tsit ê個人資料ê跟tuè者資訊可能有落勾ê。",
@@ -518,8 +521,70 @@
   "mute_modal.hide_options": "Khàm掉選項",
   "mute_modal.indefinite": "直到我取消消音",
   "mute_modal.show_options": "顯示選項",
+  "mute_modal.they_can_mention_and_follow": "In iáu ē當提起á是跟tuè lí，毋過lí看buē著in。",
+  "mute_modal.they_wont_know": "In buē知影in受消音。",
+  "mute_modal.title": "Kā用者消音？",
+  "mute_modal.you_wont_see_mentions": "Lí buē看見提起in ê PO文。",
+  "mute_modal.you_wont_see_posts": "In iáu ē當看著lí ê PO文，毋過lí看bē tio̍h in ê。",
+  "navigation_bar.about": "概要",
+  "navigation_bar.administration": "管理",
+  "navigation_bar.advanced_interface": "用進階ê網頁界面開",
+  "navigation_bar.blocks": "封鎖ê用者",
+  "navigation_bar.bookmarks": "冊籤",
+  "navigation_bar.community_timeline": "本地ê時間線",
+  "navigation_bar.compose": "寫新ê PO文",
+  "navigation_bar.direct": "私人ê提起",
+  "navigation_bar.discover": "發現",
+  "navigation_bar.domain_blocks": "封鎖ê域名",
+  "navigation_bar.explore": "探查",
+  "navigation_bar.favourites": "Siōng kah意",
+  "navigation_bar.filters": "消音ê詞",
+  "navigation_bar.follow_requests": "跟tuè請求",
+  "navigation_bar.followed_tags": "跟tuè ê hashtag",
+  "navigation_bar.follows_and_followers": "Leh跟tuè ê kap跟tuè lí ê",
+  "navigation_bar.lists": "列單",
+  "navigation_bar.logout": "登出",
+  "navigation_bar.moderation": "審核",
+  "navigation_bar.mutes": "消音ê用者",
+  "navigation_bar.opened_in_classic_interface": "PO文、口座kap其他指定ê頁面，預設ē佇經典ê網頁界面內phah開。",
+  "navigation_bar.personal": "個人",
+  "navigation_bar.pins": "釘起來ê PO文",
+  "navigation_bar.preferences": "偏愛ê設定",
+  "navigation_bar.public_timeline": "聯邦ê時間線",
+  "navigation_bar.search": "Tshiau-tshuē",
+  "navigation_bar.security": "安全",
+  "not_signed_in_indicator.not_signed_in": "Lí著登入來接近使用tsit ê資源。",
+  "notification.admin.report": "{name} kā {target} 檢舉ah",
+  "notification.admin.report_account": "{name} kā {target} 所寫ê {count, plural, other {# 篇PO文}}檢舉ah，原因是：{category}",
+  "notification.admin.report_account_other": "{name} kā {target} 所寫ê {count, plural, other {# 篇PO文}}檢舉ah",
+  "notification.admin.report_statuses": "{name} kā {target} 檢舉ah，原因是：{category}",
+  "notification.admin.report_statuses_other": "{name} kā {target} 檢舉ah",
+  "notification.admin.sign_up": "口座 {name} 有開ah。",
+  "notification.admin.sign_up.name_and_others": "{name} kap {count, plural, other {其他 # ê lâng}} ê口座有開ah",
+  "notification.annual_report.message": "Lí ê {year} #Wrapstodon teh等lí！緊來看tsit年lí佇Mastodon頂ê上精彩ê內容，kap難忘ê時刻！",
+  "notification.annual_report.view": "Kā #Wrapstodon 看māi。",
+  "notification.favourite": "{name} kah意lí ê PO文",
+  "notification.favourite.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>kah意lí ê PO文",
   "notification.favourite_pm": "{name} kah意lí ê私人提起",
   "notification.favourite_pm.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>kah意lí ê私人提起",
+  "notification.follow": "{name}跟tuè lí",
+  "notification.follow.name_and_others": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>跟tuè lí",
+  "notification.follow_request": "{name} 請求跟tuè lí",
+  "notification.follow_request.name_and_others": "{name} kap{count, plural, other {另外 # ê lâng}}請求跟tuè lí",
+  "notification.label.mention": "提起",
+  "notification.label.private_mention": "私人ê提起",
+  "notification.label.private_reply": "私人ê回應",
+  "notification.label.reply": "回應",
+  "notification.mention": "提起",
+  "notification.mentioned_you": "{name}kā lí提起",
+  "notification.moderation-warning.learn_more": "看詳細",
+  "notification.moderation_warning": "Lí有收著審核ê警告",
+  "notification.moderation_warning.action_delete_statuses": "Lí ê一寡PO文hōo lâng thâi掉ah。",
+  "notification.moderation_warning.action_disable": "Lí ê口座hōo lâng停止使用ah。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Lí ê一寡PO文，hōo lâng標做敏感ê內容。",
+  "notification.moderation_warning.action_none": "Lí ê口座有收著審核ê警告。",
+  "notification_requests.edit_selection": "編輯",
+  "notification_requests.exit_selection": "做好ah",
   "search_popout.language_code": "ISO語言代碼",
   "status.translated_from_with": "用 {provider} 翻譯 {lang}"
 }

app/javascript/mastodon/locales/ne.json

@@ -20,12 +20,10 @@
   "account.copy": "प्रोफाइलको लिङ्क प्रतिलिपि गर्नुहोस्",
   "account.direct": "@{name} लाई निजी रूपमा उल्लेख गर्नुहोस्",
   "account.disable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित नगर्नुहोस्",
-  "account.domain_blocked": "डोमेन ब्लक गरिएको छ",
   "account.edit_profile": "प्रोफाइल सम्पादन गर्नुहोस्",
   "account.enable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित गर्नुहोस्",
   "account.endorse": "प्रोफाइलमा फिचर गर्नुहोस्",
   "account.featured_tags.last_status_never": "कुनै पोस्ट छैन",
-  "account.featured_tags.title": "{name}का विशेष ह्यासट्यागहरू",
   "account.follow": "फलो गर्नुहोस",
   "account.follow_back": "फलो ब्याक गर्नुहोस्",
   "account.followers": "फलोअरहरु",
@@ -44,7 +42,6 @@
   "account.mute_notifications_short": "सूचनाहरू म्यूट गर्नुहोस्",
   "account.mute_short": "म्युट",
   "account.muted": "म्युट गरिएको",
-  "account.mutual": "आपसी",
   "account.no_bio": "कुनै विवरण प्रदान गरिएको छैन।",
   "account.posts": "पोस्टहरू",
   "account.posts_with_replies": "पोस्ट र जवाफहरू",

app/javascript/mastodon/locales/nl.json

@@ -19,17 +19,20 @@
   "account.block_domain": "Alles van {domain} blokkeren",
   "account.block_short": "Blokkeren",
   "account.blocked": "Geblokkeerd",
+  "account.blocking": "Blokkeren",
   "account.cancel_follow_request": "Ontvolgen",
   "account.copy": "Link naar profiel kopiëren",
   "account.direct": "@{name} een privébericht sturen",
   "account.disable_notifications": "Geen melding meer geven wanneer @{name} een bericht plaatst",
-  "account.domain_blocked": "Domein geblokkeerd",
+  "account.domain_blocking": "Domein blokkeren",
   "account.edit_profile": "Profiel bewerken",
   "account.enable_notifications": "Geef een melding wanneer @{name} een bericht plaatst",
   "account.endorse": "Op profiel weergeven",
+  "account.featured": "Uitgelicht",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Berichten",
   "account.featured_tags.last_status_at": "Laatste bericht op {date}",
   "account.featured_tags.last_status_never": "Geen berichten",
-  "account.featured_tags.title": "Uitgelichte hashtags van {name}",
   "account.follow": "Volgen",
   "account.follow_back": "Terugvolgen",
   "account.followers": "Volgers",
@@ -38,6 +41,7 @@
   "account.following": "Volgend",
   "account.following_counter": "{count, plural, one {{counter} volgend} other {{counter} volgend}}",
   "account.follows.empty": "Deze gebruiker volgt nog niemand of heeft deze verborgen.",
+  "account.follows_you": "Volgt jou",
   "account.go_to_profile": "Ga naar profiel",
   "account.hide_reblogs": "Boosts van @{name} verbergen",
   "account.in_memoriam": "In memoriam.",
@@ -52,14 +56,16 @@
   "account.mute_notifications_short": "Meldingen negeren",
   "account.mute_short": "Negeren",
   "account.muted": "Genegeerd",
-  "account.mutual": "Jullie volgen elkaar",
+  "account.muting": "Dempen",
+  "account.mutual": "Je volgt elkaar",
   "account.no_bio": "Geen beschrijving opgegeven.",
   "account.open_original_page": "Originele pagina openen",
   "account.posts": "Berichten",
-  "account.posts_with_replies": "Berichten en reacties",
+  "account.posts_with_replies": "Reacties",
   "account.report": "@{name} rapporteren",
   "account.requested": "Wachten op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.requested_follow": "{name} wil je graag volgen",
+  "account.requests_to_follow_you": "Verzoeken om je te volgen",
   "account.share": "Account van @{name} delen",
   "account.show_reblogs": "Boosts van @{name} tonen",
   "account.statuses_counter": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
@@ -294,6 +300,9 @@
   "emoji_button.search_results": "Zoekresultaten",
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en locaties",
+  "empty_column.account_featured.me": "Je hebt nog niets uitgelicht. Wist je dat je je berichten, hashtags die je het meest gebruikt en zelfs de accounts van je vrienden kunt vermelden op je profiel?",
+  "empty_column.account_featured.other": "{acct} heeft nog niets uitgelicht. Wist je dat je je berichten, hashtags die je het meest gebruikt en zelfs de accounts van je vrienden kunt vermelden op je profiel?",
+  "empty_column.account_featured_other.unknown": "Dit account heeft nog niets uitgelicht.",
   "empty_column.account_hides_collections": "Deze gebruiker heeft ervoor gekozen deze informatie niet beschikbaar te maken",
   "empty_column.account_suspended": "Account opgeschort",
   "empty_column.account_timeline": "Hier zijn geen berichten!",
@@ -378,6 +387,8 @@
   "generic.saved": "Opgeslagen",
   "getting_started.heading": "Aan de slag",
   "hashtag.admin_moderation": "Moderatie-omgeving van #{name} openen",
+  "hashtag.browse": "Berichten met #{hashtag} bekijken",
+  "hashtag.browse_from_account": "Berichten van @{name} met #{hashtag} bekijken",
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "of {additional}",
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
@@ -391,6 +402,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bericht} other {{counter} berichten}} vandaag",
   "hashtag.follow": "Hashtag volgen",
+  "hashtag.mute": "#{hashtag} negeren",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
   "hints.profiles.followers_may_be_missing": "Volgers voor dit profiel kunnen ontbreken.",

app/javascript/mastodon/locales/nn.json

@@ -23,20 +23,21 @@
   "account.copy": "Kopier lenka til profilen",
   "account.direct": "Nevn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} skriv innlegg",
-  "account.domain_blocked": "Domenet er sperra",
   "account.edit_profile": "Rediger profil",
   "account.enable_notifications": "Varsle meg når @{name} skriv innlegg",
   "account.endorse": "Vis på profilen",
+  "account.featured": "Utvald",
+  "account.featured.hashtags": "Emneknaggar",
+  "account.featured.posts": "Innlegg",
   "account.featured_tags.last_status_at": "Sist nytta {date}",
   "account.featured_tags.last_status_never": "Ingen innlegg",
-  "account.featured_tags.title": "{name} sine framheva emneknaggar",
   "account.follow": "Fylg",
   "account.follow_back": "Fylg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
-  "account.followers_counter": "{count, plural, one {{counter} følgjar} other {{counter} følgjarar}}",
+  "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
   "account.following": "Fylgjer",
-  "account.following_counter": "{count, plural, one {{counter} følgjer} other {{counter} følgjer}}",
+  "account.following_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Gøym framhevingar frå @{name}",
@@ -52,7 +53,6 @@
   "account.mute_notifications_short": "Demp varslingar",
   "account.mute_short": "Demp",
   "account.muted": "Målbunden",
-  "account.mutual": "Felles",
   "account.no_bio": "Inga skildring er gjeven.",
   "account.open_original_page": "Opne originalsida",
   "account.posts": "Tut",
@@ -65,6 +65,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
   "account.unblock": "Stopp blokkering av @{name}",
   "account.unblock_domain": "Stopp blokkering av domenet {domain}",
+  "account.unblock_domain_short": "Fjern blokkering",
   "account.unblock_short": "Stopp blokkering",
   "account.unendorse": "Ikkje vis på profil",
   "account.unfollow": "Slutt å fylgja",
@@ -115,7 +116,7 @@
   "annual_report.summary.thanks": "Takk for at du er med i Mastodon!",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektere di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.",
+  "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektera di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis meir",
   "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
@@ -274,7 +275,7 @@
   "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
   "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
   "domain_pill.your_handle": "Handtaket ditt:",
-  "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur i. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
+  "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
   "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
   "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
   "embed.preview": "Slik kjem det til å sjå ut:",
@@ -377,6 +378,8 @@
   "generic.saved": "Lagra",
   "getting_started.heading": "Kom i gang",
   "hashtag.admin_moderation": "Opne moderasjonsgrensesnitt for #{name}",
+  "hashtag.browse": "Bla gjennom innlegg i #{hashtag}",
+  "hashtag.browse_from_account": "Bla gjennom innlegg frå @{name} i #{hashtag}",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
@@ -390,6 +393,7 @@
   "hashtag.counter_by_uses": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}}",
   "hashtag.counter_by_uses_today": "{count, plural,one {{counter} innlegg} other {{counter} innlegg}} i dag",
   "hashtag.follow": "Fylg emneknagg",
+  "hashtag.mute": "Demp @#{hashtag}",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
   "hints.profiles.followers_may_be_missing": "Kven som fylgjer denne profilen manglar kanskje.",
@@ -802,11 +806,11 @@
   "server_banner.about_active_users": "Personar som har brukt denne tenaren dei siste 30 dagane (Månadlege Aktive Brukarar)",
   "server_banner.active_users": "aktive brukarar",
   "server_banner.administered_by": "Administrert av:",
-  "server_banner.is_one_of_many": "{domain} er ein av dei mange uavhengige Mastodon-serverane du kan bruke til å delta i Fødiverset.",
+  "server_banner.is_one_of_many": "{domain} er ein av dei mange uavhengige Mastodon-tenarane du kan bruka til å delta i Allheimen.",
   "server_banner.server_stats": "Tenarstatistikk:",
   "sign_in_banner.create_account": "Opprett konto",
-  "sign_in_banner.follow_anyone": "Følg kven som helst på tvers av Fødiverset og sjå alt i kronologisk rekkjefølgje. Ingen algoritmar, reklamar eller clickbait i sikte.",
+  "sign_in_banner.follow_anyone": "Fylg kven som helst på tvers av Allheimen og sjå alt i kronologisk rekkjefylgje. Ingen algoritmar, reklame eller klikkfeller.",
-  "sign_in_banner.mastodon_is": "Mastodon er den beste måten å følgje med på det som skjer.",
+  "sign_in_banner.mastodon_is": "Mastodon er den beste måten å fylgja med på det som skjer.",
   "sign_in_banner.sign_in": "Logg inn",
   "sign_in_banner.sso_redirect": "Logg inn eller registrer deg",
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
@@ -872,7 +876,9 @@
   "subscribed_languages.target": "Endre abonnerte språk for {target}",
   "tabs_bar.home": "Heim",
   "tabs_bar.notifications": "Varsel",
+  "terms_of_service.effective_as_of": "I kraft frå {date}",
   "terms_of_service.title": "Bruksvilkår",
+  "terms_of_service.upcoming_changes_on": "Komande endringar {date}",
   "time_remaining.days": "{number, plural, one {# dag} other {# dagar}} igjen",
   "time_remaining.hours": "{number, plural, one {# time} other {# timar}} igjen",
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutt}} igjen",
@@ -903,6 +909,12 @@
   "video.expand": "Utvid video",
   "video.fullscreen": "Fullskjerm",
   "video.hide": "Gøym video",
+  "video.mute": "Demp",
   "video.pause": "Pause",
-  "video.play": "Spel av"
+  "video.play": "Spel av",
+  "video.skip_backward": "Hopp bakover",
+  "video.skip_forward": "Hopp framover",
+  "video.unmute": "Opphev demping",
+  "video.volume_down": "Volum ned",
+  "video.volume_up": "Volum opp"
 }

app/javascript/mastodon/locales/no.json

@@ -23,13 +23,11 @@
   "account.copy": "Kopier lenke til profil",
   "account.direct": "Nevn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} legger ut innlegg",
-  "account.domain_blocked": "Domene blokkert",
   "account.edit_profile": "Rediger profil",
   "account.enable_notifications": "Varsle meg når @{name} legger ut innlegg",
   "account.endorse": "Vis frem på profilen",
   "account.featured_tags.last_status_at": "Siste innlegg {date}",
   "account.featured_tags.last_status_never": "Ingen Innlegg",
-  "account.featured_tags.title": "{name} sine fremhevede emneknagger",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbake",
   "account.followers": "Følgere",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Demp varsler",
   "account.mute_short": "Demp",
   "account.muted": "Dempet",
-  "account.mutual": "Gjensidig",
   "account.no_bio": "Ingen beskrivelse oppgitt.",
   "account.open_original_page": "Gå til originalsiden",
   "account.posts": "Innlegg",

app/javascript/mastodon/locales/oc.json

@@ -20,13 +20,11 @@
   "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
   "account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
-  "account.domain_blocked": "Domeni amagat",
   "account.edit_profile": "Modificar lo perfil",
   "account.enable_notifications": "M’avisar quand @{name} publica quicòm",
   "account.endorse": "Mostrar pel perfil",
   "account.featured_tags.last_status_at": "Darrièra publicacion lo {date}",
   "account.featured_tags.last_status_never": "Cap de publicacion",
-  "account.featured_tags.title": "Etiquetas en avant de {name}",
   "account.follow": "Sègre",
   "account.follow_back": "Sègre en retorn",
   "account.followers": "Seguidors",
@@ -47,7 +45,6 @@
   "account.mute_notifications_short": "Amudir las notificacions",
   "account.mute_short": "Amudir",
   "account.muted": "Mes en silenci",
-  "account.mutual": "Mutual",
   "account.no_bio": "Cap de descripcion pas fornida.",
   "account.open_original_page": "Dobrir la pagina d’origina",
   "account.posts": "Tuts",

app/javascript/mastodon/locales/pa.json

@@ -15,7 +15,6 @@
   "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
   "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
-  "account.domain_blocked": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ",
   "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "account.enable_notifications": "ਜਦੋਂ {name} ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਦਿਓ",
   "account.endorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ",
@@ -35,7 +34,6 @@
   "account.mute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮੌਨ ਕਰੋ",
   "account.mute_short": "ਮੌਨ ਕਰੋ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
-  "account.mutual": "ਸਾਂਝੇ",
   "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
   "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ",
   "account.posts": "ਪੋਸਟਾਂ",

app/javascript/mastodon/locales/pl.json

@@ -23,13 +23,11 @@
   "account.copy": "Skopiuj link do profilu",
   "account.direct": "Napisz bezpośrednio do @{name}",
   "account.disable_notifications": "Przestań powiadamiać mnie o wpisach @{name}",
-  "account.domain_blocked": "Ukryto domenę",
   "account.edit_profile": "Edytuj profil",
   "account.enable_notifications": "Powiadamiaj mnie o wpisach @{name}",
   "account.endorse": "Wyróżnij na profilu",
   "account.featured_tags.last_status_at": "Ostatni post {date}",
   "account.featured_tags.last_status_never": "Brak postów",
-  "account.featured_tags.title": "Polecane hasztagi {name}",
   "account.follow": "Obserwuj",
   "account.follow_back": "Również obserwuj",
   "account.followers": "Obserwujący",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Wycisz powiadomienia",
   "account.mute_short": "Wycisz",
   "account.muted": "Wyciszony",
-  "account.mutual": "Znajomi",
   "account.no_bio": "Brak opisu.",
   "account.open_original_page": "Otwórz stronę oryginalną",
   "account.posts": "Wpisy",

app/javascript/mastodon/locales/pt-BR.json

@@ -23,13 +23,11 @@
   "account.copy": "Copiar link do perfil",
   "account.direct": "Mencione em privado @{name}",
   "account.disable_notifications": "Cancelar notificações de @{name}",
-  "account.domain_blocked": "Domínio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificar novos toots de @{name}",
   "account.endorse": "Recomendar",
   "account.featured_tags.last_status_at": "Última publicação em {date}",
   "account.featured_tags.last_status_never": "Sem publicações",
-  "account.featured_tags.title": "Hashtags em destaque de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Silenciar notificações",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
-  "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
   "account.posts": "Toots",

app/javascript/mastodon/locales/pt-PT.json

@@ -23,13 +23,11 @@
   "account.copy": "Copiar hiperligação do perfil",
   "account.direct": "Mencionar @{name} em privado",
   "account.disable_notifications": "Parar de me notificar das publicações de @{name}",
-  "account.domain_blocked": "Domínio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificar-me das publicações de @{name}",
   "account.endorse": "Destacar no perfil",
   "account.featured_tags.last_status_at": "Última publicação em {date}",
   "account.featured_tags.last_status_never": "Sem publicações",
-  "account.featured_tags.title": "Etiquetas destacadas por {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir também",
   "account.followers": "Seguidores",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Ocultar notificações",
   "account.mute_short": "Ocultar",
   "account.muted": "Ocultada",
-  "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
   "account.posts": "Publicações",

app/javascript/mastodon/locales/ro.json

@@ -23,13 +23,11 @@
   "account.copy": "Copiază link-ul profilului",
   "account.direct": "Menționează pe @{name} în privat",
   "account.disable_notifications": "Nu îmi mai trimite notificări când postează @{name}",
-  "account.domain_blocked": "Domeniu blocat",
   "account.edit_profile": "Modifică profilul",
   "account.enable_notifications": "Trimite-mi o notificare când postează @{name}",
   "account.endorse": "Promovează pe profil",
   "account.featured_tags.last_status_at": "Ultima postare pe {date}",
   "account.featured_tags.last_status_never": "Fără postări",
-  "account.featured_tags.title": "Haștagurile recomandate de {name}",
   "account.follow": "Urmărește",
   "account.follow_back": "Urmăreşte înapoi",
   "account.followers": "Urmăritori",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Amuțește notificările",
   "account.mute_short": "Ignoră",
   "account.muted": "Pus pe silențios",
-  "account.mutual": "Mutual",
   "account.no_bio": "Nicio descriere furnizată.",
   "account.open_original_page": "Deschide pagina originală",
   "account.posts": "Postări",

app/javascript/mastodon/locales/ru.json

@@ -23,13 +23,14 @@
   "account.copy": "Копировать ссылку на профиль",
   "account.direct": "Упомянуть @{name} лично",
   "account.disable_notifications": "Не уведомлять о постах от @{name}",
-  "account.domain_blocked": "Домен заблокирован",
   "account.edit_profile": "Редактировать",
   "account.enable_notifications": "Уведомлять о постах от @{name}",
   "account.endorse": "Рекомендовать в профиле",
+  "account.featured": "Избранное",
+  "account.featured.hashtags": "Хэштеги",
+  "account.featured.posts": "Посты",
   "account.featured_tags.last_status_at": "Последний пост {date}",
   "account.featured_tags.last_status_never": "Нет постов",
-  "account.featured_tags.title": "Избранные хэштеги {name}",
   "account.follow": "Подписаться",
   "account.follow_back": "Подписаться в ответ",
   "account.followers": "Подписчики",
@@ -38,6 +39,7 @@
   "account.following": "Подписки",
   "account.following_counter": "{count, plural, one {# подписка} many {# подписок} other {# подписки}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
+  "account.follows_you": "Подписан(а) на вас",
   "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
   "account.in_memoriam": "In Memoriam.",
@@ -52,7 +54,7 @@
   "account.mute_notifications_short": "Отключить уведомления",
   "account.mute_short": "Игнорировать",
   "account.muted": "Игнорируется",
-  "account.mutual": "Взаимные подписки",
+  "account.mutual": "Вы подписаны друг на друга",
   "account.no_bio": "Описание профиля отсутствует.",
   "account.open_original_page": "Открыть исходную страницу",
   "account.posts": "Посты",
@@ -378,6 +380,7 @@
   "generic.saved": "Сохранено",
   "getting_started.heading": "Добро пожаловать",
   "hashtag.admin_moderation": "Открыть интерфейс модератора для #{name}",
+  "hashtag.browse": "Посмотреть посты в #{hashtag}",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -768,6 +771,7 @@
   "report.unfollow_explanation": "Вы подписаны на этого пользователя. Чтобы не видеть его/её посты в своей домашней ленте, отпишитесь от него/неё.",
   "report_notification.attached_statuses": "{count, plural, one {{count} сообщение} few {{count} сообщения} many {{count} сообщений} other {{count} сообщений}} вложено",
   "report_notification.categories.legal": "Нарушение закона",
+  "report_notification.categories.legal_sentence": "запрещённый контент",
   "report_notification.categories.other": "Другое",
   "report_notification.categories.other_sentence": "другое",
   "report_notification.categories.spam": "Спам",

app/javascript/mastodon/locales/ry.json

@@ -22,13 +22,11 @@
   "account.copy": "Зкопіровати удкликованя на профіл",
   "account.direct": "Пошептати @{name}",
   "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
-  "account.domain_blocked": "Домен заблокованый",
   "account.edit_profile": "Управити профіл",
   "account.enable_notifications": "Уповістити ня, кой {name} пише",
   "account.endorse": "Указовати на профілови",
   "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
   "account.featured_tags.last_status_never": "Ниє публикацій",
-  "account.featured_tags.title": "Ублюблені гештеґы {name}",
   "account.follow": "Пудписати ся",
   "account.follow_back": "Пудписати ся тоже",
   "account.followers": "Пудписникы",
@@ -48,7 +46,6 @@
   "account.mute_notifications_short": "Стишити голошіня",
   "account.mute_short": "Стишити",
   "account.muted": "Стишено",
-  "account.mutual": "Взайомно",
   "account.no_bio": "Описа ниє.",
   "account.open_original_page": "Удоперти ориґіналну сторунку",
   "account.posts": "Публикації",

app/javascript/mastodon/locales/sa.json

@@ -20,13 +20,11 @@
   "account.cancel_follow_request": "अनुसरणयाचनामपनय",
   "account.direct": "गोपनीयरूपेण उल्लेखित-@{name}",
   "account.disable_notifications": "यदा @{name} स्थापयति तदा माम्मा ज्ञापय",
-  "account.domain_blocked": "प्रदेशो निषिद्धः",
   "account.edit_profile": "सम्पाद्यताम्",
   "account.enable_notifications": "यदा @{name} स्थापयति तदा मां ज्ञापय",
   "account.endorse": "व्यक्तिगतविवरणे वैशिष्ट्यम्",
   "account.featured_tags.last_status_at": "{date} दिने गतस्थापनम्",
   "account.featured_tags.last_status_never": "न पत्रम्",
-  "account.featured_tags.title": "{name} इत्यस्य विशेषहैस्टैगः",
   "account.follow": "अनुस्रियताम्",
   "account.followers": "अनुसर्तारः",
   "account.followers.empty": "नाऽनुसर्तारो वर्तन्ते",

app/javascript/mastodon/locales/sc.json

@@ -23,13 +23,11 @@
   "account.copy": "Còpia su ligòngiu a su profilu",
   "account.direct": "Mèntova a @{name} in privadu",
   "account.disable_notifications": "Non mi notìfiches prus cando @{name} pùblichet messàgios",
-  "account.domain_blocked": "Domìniu blocadu",
   "account.edit_profile": "Modìfica profilu",
   "account.enable_notifications": "Notìfica·mi cando @{name} pùblicat messàgios",
   "account.endorse": "Cussìgia in su profilu tuo",
   "account.featured_tags.last_status_at": "Ùrtima publicatzione in su {date}",
   "account.featured_tags.last_status_never": "Peruna publicatzione",
-  "account.featured_tags.title": "Etichetas de {name} in evidèntzia",
   "account.follow": "Sighi",
   "account.follow_back": "Sighi tue puru",
   "account.followers": "Sighiduras",
@@ -52,7 +50,6 @@
   "account.mute_notifications_short": "Pone is notìficas a sa muda",
   "account.mute_short": "A sa muda",
   "account.muted": "A sa muda",
-  "account.mutual": "Pari-pari",
   "account.no_bio": "Peruna descritzione frunida.",
   "account.open_original_page": "Aberi sa pàgina originale",
   "account.posts": "Publicatziones",

app/javascript/mastodon/locales/sco.json

@@ -19,13 +19,11 @@
   "account.blocked": "Dingied",
   "account.cancel_follow_request": "Resile follae requeest",
   "account.disable_notifications": "Stap notifyin me whan @{name} posts",
-  "account.domain_blocked": "Domain dingied",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me whan @{name} posts",
   "account.endorse": "Shaw oan profile",
   "account.featured_tags.last_status_at": "Last post oan {date}",
   "account.featured_tags.last_status_never": "Nae posts",
-  "account.featured_tags.title": "{name}'s hielichtit hashtags",
   "account.follow": "Follae",
   "account.followers": "Follaers",
   "account.followers.empty": "Naebody follaes this uiser yit.",