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

app/javascript/mastodon/actions/blocks.js

@@ -12,8 +12,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
   return (dispatch, getState) => {
     dispatch(fetchBlocksRequest());
@@ -90,11 +88,12 @@ export function expandBlocksFail(error) {
 
 export function initBlockModal(account) {
   return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
+    dispatch(openModal({
+      modalType: 'BLOCK',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }

app/javascript/mastodon/actions/domain_blocks.js

@@ -1,6 +1,8 @@
 import api, { getLinks } from '../api';
 
 import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+import { openModal } from './modal';
+
 
 export * from "./domain_blocks_typed";
 
@@ -150,3 +152,12 @@ export function expandDomainBlocksFail(error) {
     error,
   };
 }
+
+export const initDomainBlockModal = account => dispatch => dispatch(openModal({
+  modalType: 'DOMAIN_BLOCK',
+  modalProps: {
+    domain: account.get('acct').split('@')[1],
+    acct: account.get('acct'),
+    accountId: account.get('id'),
+  },
+}));

app/javascript/mastodon/actions/mutes.js

@@ -12,10 +12,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
-
 export function fetchMutes() {
   return (dispatch, getState) => {
     dispatch(fetchMutesRequest());
@@ -92,26 +88,12 @@ export function expandMutesFail(error) {
 
 export function initMuteModal(account) {
   return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'MUTE' }));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
-
-export function changeMuteDuration(duration) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_CHANGE_DURATION,
-      duration,
-    });
+    dispatch(openModal({
+      modalType: 'MUTE',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }

app/javascript/mastodon/actions/notifications.js

@@ -570,7 +570,10 @@ export const fetchNotificationsForRequest = accountId => (dispatch, getState) =>
 
   api(getState).get('/api/v1/notifications', { params }).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(fetchNotificationsForRequestFail(err));
@@ -603,7 +606,10 @@ export const expandNotificationsForRequest = () => (dispatch, getState) => {
 
   api(getState).get(url).then(response => {
     const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
     dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
     dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
   }).catch(err => {
     dispatch(expandNotificationsForRequestFail(err));

app/javascript/mastodon/components/check_box.tsx

@@ -0,0 +1,39 @@
+import classNames from 'classnames';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+
+import { Icon } from './icon';
+
+interface Props {
+  value: string;
+  checked: boolean;
+  name: string;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  label: React.ReactNode;
+}
+
+export const CheckBox: React.FC<Props> = ({
+  name,
+  value,
+  checked,
+  onChange,
+  label,
+}) => {
+  return (
+    <label className='check-box'>
+      <input
+        name={name}
+        type='checkbox'
+        value={value}
+        checked={checked}
+        onChange={onChange}
+      />
+
+      <span className={classNames('check-box__input', { checked })}>
+        {checked && <Icon id='check' icon={DoneIcon} />}
+      </span>
+
+      <span>{label}</span>
+    </label>
+  );
+};

app/javascript/mastodon/components/column_header.jsx

@@ -199,7 +199,7 @@ class ColumnHeader extends PureComponent {
         <h1 className={buttonClassName}>
           {hasTitle && (
             <>
-              {backButton}
+              {showBackButton && backButton}
 
               <button onClick={this.handleTitleClick} className='column-header__title'>
                 {!showBackButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
@@ -208,7 +208,7 @@ class ColumnHeader extends PureComponent {
             </>
           )}
 
-          {!hasTitle && backButton}
+          {!hasTitle && showBackButton && backButton}
 
           <div className='column-header__buttons'>
             {extraButton}

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

@@ -5,9 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'mastodon/actions/modal';
-import { Icon }  from 'mastodon/components/icon';
 import InlineAccount from 'mastodon/components/inline_account';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 
@@ -67,7 +65,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <span className='animated-number'>{intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}</span> }} />
         </button>
       </DropdownMenu>
     );

app/javascript/mastodon/components/relative_timestamp.tsx

@@ -102,7 +102,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: IntlShape,
+  intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>,
   date: Date,
   now: number,
   year: number,

app/javascript/mastodon/components/status.jsx

@@ -28,6 +28,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia, enableEmojiReaction, isShowItem, isHideItem } from '../initial_state';
 
 import { Avatar } from './avatar';
@@ -82,6 +83,8 @@ const messages = defineMessages({
 
 class Status extends ImmutablePureComponent {
 
+  static contextType = SensitiveMediaContext;
+
   static propTypes = {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.record,
@@ -142,19 +145,21 @@ class Status extends ImmutablePureComponent {
   ];
 
   state = {
-    showMedia: defaultMediaVisibility(this.props.status),
-    statusId: undefined,
+    showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
     forceFilter: undefined,
   };
 
-  static getDerivedStateFromProps(nextProps, prevState) {
-    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
-      return {
-        showMedia: defaultMediaVisibility(nextProps.status),
-        statusId: nextProps.status.get('id'),
-      };
-    } else {
-      return null;
+  componentDidUpdate (prevProps) {
+    // This will potentially cause a wasteful redraw, but in most cases `Status` components are used
+    // with a `key` directly depending on their `id`, preventing re-use of the component across
+    // different IDs.
+    // But just in case this does change, reset the state on status change.
+
+    if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
+      this.setState({
+        showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
+        forceFilter: undefined,
+      });
     }
   }
 

app/javascript/mastodon/components/status_action_bar.jsx

@@ -252,7 +252,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {

app/javascript/mastodon/containers/status_container.jsx

@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -16,7 +16,7 @@ import {
   insertReferenceCompose,
 } from '../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../actions/domain_blocks';
 import {
@@ -287,15 +287,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {

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

@@ -262,18 +262,20 @@ class About extends PureComponent {
               <>
                 <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p>
 
-                <div className='about__domain-blocks'>
-                  {domainBlocks.get('items').map(block => (
-                    <div className='about__domain-blocks__domain' key={block.get('domain')}>
-                      <div className='about__domain-blocks__domain__header'>
-                        <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}</span>
-                      </div>
+                {domainBlocks.get('items').size > 0 && (
+                  <div className='about__domain-blocks'>
+                    {domainBlocks.get('items').map(block => (
+                      <div className='about__domain-blocks__domain' key={block.get('domain')}>
+                        <div className='about__domain-blocks__domain__header'>
+                          <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
+                          <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}</span>
+                        </div>
 
-                      <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
-                    </div>
-                  ))}
-                </div>
+                        <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
+                      </div>
+                    ))}
+                  </div>
+                )}
               </>
             ) : (
               <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>

app/javascript/mastodon/features/account/components/domain_pill.jsx

@@ -0,0 +1,86 @@
+import PropTypes from 'prop-types';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BadgeIcon from '@/material-icons/400-24px/badge.svg?react';
+import GlobeIcon from '@/material-icons/400-24px/globe.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainPill = ({ domain, username, isSelf }) => {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleExpandClick = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <>
+      <button className={classNames('account__domain-pill', { active: open })} ref={triggerRef} onClick={handleClick}>{domain}</button>
+
+      <Overlay show={open} rootClose onHide={handleClick} offset={[5, 5]} target={triggerRef}>
+        {({ props }) => (
+          <div {...props} className='account__domain-pill__popout dropdown-animation'>
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'><Icon icon={BadgeIcon} /></div>
+              <h3><FormattedMessage id='domain_pill.whats_in_a_handle' defaultMessage="What's in a handle?" /></h3>
+            </div>
+
+            <div className='account__domain-pill__popout__handle'>
+              <div className='account__domain-pill__popout__handle__label'>{isSelf ? <FormattedMessage id='domain_pill.your_handle' defaultMessage='Your handle:' /> : <FormattedMessage id='domain_pill.their_handle' defaultMessage='Their handle:' />}</div>
+              <div className='account__domain-pill__popout__handle__handle'>@{username}@{domain}</div>
+            </div>
+
+            <div className='account__domain-pill__popout__parts'>
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={AlternateEmailIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.username' defaultMessage='Username' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_username' defaultMessage='Your unique identifier on this server. It’s possible to find users with the same username on different servers.' /> : <FormattedMessage id='domain_pill.their_username' defaultMessage='Their unique identifier on their server. It’s possible to find users with the same username on different servers.' />}</p>
+                </div>
+              </div>
+
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={GlobeIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.server' defaultMessage='Server' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_server' defaultMessage='Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.' /> : <FormattedMessage id='domain_pill.their_server' defaultMessage='Their digital home, where all of their posts live.' />}</p>
+                </div>
+              </div>
+            </div>
+
+            <p>{isSelf ? <FormattedMessage id='domain_pill.who_you_are' defaultMessage='Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} /> : <FormattedMessage id='domain_pill.who_they_are' defaultMessage='Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} />}</p>
+
+            {expanded && (
+              <>
+                <p><FormattedMessage id='domain_pill.activitypub_like_language' defaultMessage='ActivityPub is like the language Mastodon speaks with other social networks.' /></p>
+                <p><FormattedMessage id='domain_pill.activitypub_lets_connect' defaultMessage='It lets you connect and interact with people not just on Mastodon, but across different social apps too.' /></p>
+              </>
+            )}
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
+
+DomainPill.propTypes = {
+  username: PropTypes.string.isRequired,
+  domain: PropTypes.string.isRequired,
+  isSelf: PropTypes.bool,
+};

app/javascript/mastodon/features/account/components/header.jsx

@@ -25,13 +25,15 @@ import { IconButton } from 'mastodon/components/icon_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
-import { autoPlayGif, me, domain, isShowItem } from 'mastodon/initial_state';
+import { autoPlayGif, me, domain as localDomain, isShowItem } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import AccountNoteContainer from '../containers/account_note_container';
 import FollowRequestNoteContainer from '../containers/follow_request_note_container';
 
+import { DomainPill } from './domain_pill';
+
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -81,7 +83,7 @@ const messages = defineMessages({
 
 const titleFromAccount = account => {
   const displayName = account.get('display_name');
-  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${localDomain}` : account.get('acct');
   const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;
 
   return `${prefix} (@${acct})`;
@@ -258,7 +260,7 @@ class Header extends ImmutablePureComponent {
   }
 
   render () {
-    const { account, hidden, intl, domain } = this.props;
+    const { account, hidden, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
     if (!account) {
@@ -404,7 +406,8 @@ class Header extends ImmutablePureComponent {
     const displayNameHtml = { __html: account.get('display_name_html') };
     const fields          = account.get('fields');
     const isLocal         = account.get('acct').indexOf('@') === -1;
-    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const username        = account.get('acct').split('@')[0];
+    const domain          = isLocal ? localDomain : account.get('acct').split('@')[1];
     const isIndexable     = !account.get('noindex');
 
     const badges = [];
@@ -449,7 +452,9 @@ class Header extends ImmutablePureComponent {
             <h1>
               <span dangerouslySetInnerHTML={displayNameHtml} />
               <small>
-                <span>@{acct}</span> {lockedIcon}
+                <span>@{username}<span className='invisible'>@{domain}</span></span>
+                <DomainPill username={username} domain={domain} isSelf={me === account.get('id')} />
+                {lockedIcon}
               </small>
             </h1>
           </div>

app/javascript/mastodon/features/account_timeline/components/header.jsx

@@ -75,11 +75,7 @@ class Header extends ImmutablePureComponent {
   };
 
   handleBlockDomain = () => {
-    const domain = this.props.account.get('acct').split('@')[1];
-
-    if (!domain) return;
-
-    this.props.onBlockDomain(domain);
+    this.props.onBlockDomain(this.props.account);
   };
 
   handleUnblockDomain = () => {

app/javascript/mastodon/features/account_timeline/containers/header_container.jsx

@@ -17,7 +17,7 @@ import {
   mentionCompose,
   directCompose,
 } from '../../../actions/compose';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
+import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
@@ -140,15 +140,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {

app/javascript/mastodon/features/compose/components/search_results.jsx

@@ -7,7 +7,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
-import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
@@ -76,11 +75,6 @@ class SearchResults extends ImmutablePureComponent {
 
     return (
       <div className='search-results'>
-        <div className='search-results__header'>
-          <Icon id='search' icon={SearchIcon} />
-          <FormattedMessage id='explore.search_results' defaultMessage='Search results' />
-        </div>
-
         {accounts}
         {hashtags}
         {statuses}

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

@@ -12,6 +12,7 @@ import { connect } from 'react-redux';
 import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
 import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
@@ -20,7 +21,6 @@ import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
@@ -117,7 +117,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     if (showTrends) {
       navItems.push(
-        <ColumnLink key='explore' icon='explore' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
     }
 

app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx

@@ -38,7 +38,7 @@ export const FilteredNotificationsBanner = () => {
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
-        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>

app/javascript/mastodon/features/notifications/request.jsx

@@ -15,6 +15,7 @@ import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import { IconButton } from 'mastodon/components/icon_button';
 import ScrollableList from 'mastodon/components/scrollable_list';
+import { SensitiveMediaContextProvider } from 'mastodon/features/ui/util/sensitive_media_context';
 
 import NotificationContainer from './containers/notification_container';
 
@@ -87,7 +88,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     }
   }, [dispatch, accountId]);
 
-  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') });
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
 
   return (
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
@@ -106,25 +107,27 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
         )}
       />
 
-      <ScrollableList
-        scrollKey={`notification_requests/${id}`}
-        trackScroll={!multiColumn}
-        bindToDocument={!multiColumn}
-        isLoading={isLoading}
-        showLoading={isLoading && notifications.size === 0}
-        hasMore={hasMore}
-        onLoadMore={handleLoadMore}
-      >
-        {notifications.map(item => (
-          item && <NotificationContainer
-            key={item.get('id')}
-            notification={item}
-            accountId={item.get('account')}
-            onMoveUp={handleMoveUp}
-            onMoveDown={handleMoveDown}
-          />
-        ))}
-      </ScrollableList>
+      <SensitiveMediaContextProvider hideMediaByDefault>
+        <ScrollableList
+          scrollKey={`notification_requests/${id}`}
+          trackScroll={!multiColumn}
+          bindToDocument={!multiColumn}
+          isLoading={isLoading}
+          showLoading={isLoading && notifications.size === 0}
+          hasMore={hasMore}
+          onLoadMore={handleLoadMore}
+        >
+          {notifications.map(item => (
+            item && <NotificationContainer
+              key={item.get('id')}
+              notification={item}
+              accountId={item.get('account')}
+              onMoveUp={handleMoveUp}
+              onMoveDown={handleMoveDown}
+            />
+          ))}
+        </ScrollableList>
+      </SensitiveMediaContextProvider>
 
       <Helmet>
         <title>{columnTitle}</title>

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -189,7 +189,7 @@ class ActionBar extends PureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {

app/javascript/mastodon/features/status/components/detailed_status.jsx

@@ -9,10 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
-import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
@@ -151,12 +147,9 @@ class DetailedStatus extends ImmutablePureComponent {
     let isCardMediaWithSensitive = false;
     let applicationLink = '';
     let reblogLink = '';
-    const reblogIcon = 'retweet';
-    const reblogIconComponent = RepeatIcon;
     let favouriteLink = '';
     let emojiReactionsLink = '';
     let statusReferencesLink = '';
-    let edited = '';
 
     if (this.props.measureHeight) {
       outerStyle.height = `${this.state.height}px`;
@@ -238,56 +231,50 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     if (status.get('application')) {
-      applicationLink = <> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
+      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
     }
 
-    const visibilityLink = <> · <VisibilityIcon visibility={status.get('limited_scope') || status.get('visibility_ex')} /></>;
-    const searchabilityLink = <> · <SearchabilityIcon searchability={status.get('searchability')} /></>;
+    const visibilityLink = <>·<VisibilityIcon visibility={status.get('limited_scope') || status.get('visibility_ex')} /></>;
+    const searchabilityLink = <>·<SearchabilityIcon searchability={status.get('searchability')} /></>;
 
     if (['private', 'direct'].includes(status.get('visibility_ex'))) {
       reblogLink = '';
     } else if (this.props.history) {
       reblogLink = (
-        <>
-          {' · '}
-          <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </Link>
-        </>
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </Link>
       );
     } else {
       reblogLink = (
-        <>
-          {' · '}
-          <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </a>
-        </>
+        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </a>
       );
     }
 
     if (this.props.history) {
       favouriteLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </Link>
       );
     } else {
       favouriteLink = (
         <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </a>
       );
     }
@@ -295,19 +282,19 @@ class DetailedStatus extends ImmutablePureComponent {
     if (this.props.history) {
       emojiReactionsLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'>
-          <Icon id='smile-o' icon={EmojiReactionIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('emoji_reactions_count')} />
           </span>
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {reaction} other {reactions}}' values={{ count: status.get('emoji_reactions_count') }} />
         </Link>
       );
     } else {
       emojiReactionsLink = (
         <a href={`/interact/${status.get('id')}?type=emoji_reactions`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='smile-o' icon={EmojiReactionIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('emoji_reactions_count')} />
           </span>
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {reaction} other {reactions}}' values={{ count: status.get('emoji_reactions_count') }} />
         </a>
       );
     }
@@ -315,32 +302,23 @@ class DetailedStatus extends ImmutablePureComponent {
     if (this.props.history) {
       statusReferencesLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/references`} className='detailed-status__link'>
-          <Icon id='link' icon={ReferenceIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('status_referred_by_count')} />
           </span>
+          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {ref} other {refs}}' values={{ count: status.get('status_referred_by_count') }} />
         </Link>
       );
     } else {
       statusReferencesLink = (
         <a href={`/interact/${status.get('id')}?type=references`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='link' icon={ReferenceIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('status_referred_by_count')} />
           </span>
+          <FormattedMessage id='status.status_references' defaultMessage='{count, plural, one {ref} other {refs}}' values={{ count: status.get('status_referred_by_count') }} />
         </a>
       );
     }
 
-    if (status.get('edited_at')) {
-      edited = (
-        <>
-          {' · '}
-          <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
-        </>
-      );
-    }
-
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
@@ -373,9 +351,28 @@ class DetailedStatus extends ImmutablePureComponent {
           {emojiReactionsBar}
 
           <div className='detailed-status__meta'>
-            <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-            </a>{edited}{visibilityLink}{searchabilityLink}{applicationLink}{reblogLink} · {favouriteLink} · {emojiReactionsLink} · {statusReferencesLink}
+            <div className='detailed-status__meta__line'>
+              <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
+                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              </a>
+
+              {visibilityLink}
+              {searchabilityLink}
+
+              {applicationLink}
+            </div>
+
+            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
+
+            <div className='detailed-status__meta__line'>
+              {reblogLink}
+              {reblogLink && <>·</>}
+              {favouriteLink}
+              ·
+              {emojiReactionsLink}
+              ·
+              {statusReferencesLink}
+            </div>
           </div>
         </div>
       </div>

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

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@@ -35,7 +35,7 @@ import {
   insertReferenceCompose,
 } from '../../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../../actions/domain_blocks';
 import {
@@ -525,15 +525,8 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(unblockAccount(account.get('id')));
   };
 
-  handleBlockDomainClick = domain => {
-    this.props.dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => this.props.dispatch(blockDomain(domain)),
-      },
-    }));
+  handleBlockDomainClick = account => {
+    this.props.dispatch(initDomainBlockModal(account));
   };
 
   handleUnblockDomainClick = domain => {

app/javascript/mastodon/features/ui/components/block_modal.jsx

@@ -1,100 +1,116 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import { blockAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { initReport } from '../../../actions/reports';
-import { Button } from '../../../components/button';
-import { makeGetAccount } from '../../../selectors';
+import { useDispatch } from 'react-redux';
 
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
 
-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
+export const BlockModal = ({ accountId, acct }) => {
+  const dispatch = useDispatch();
+  const [expanded, setExpanded] = useState(false);
 
-  return mapStateToProps;
-};
+  const domain = acct.split('@')[1];
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
 
-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
 
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-  };
-};
+  const handleToggleLearnMore = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
 
-class BlockModal extends PureComponent {
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={BlockIcon} />
+          </div>
 
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
+          <div>
+            <h1><FormattedMessage id='block_modal.title' defaultMessage='Block user?' /></h1>
+            <div>@{acct}</div>
+          </div>
         </div>
 
-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_will_know' defaultMessage="They can see that they're blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_see_posts' defaultMessage="They can't see your posts and you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='block_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mentions them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="They can't mention or follow you." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        {domain && (
+          <div className='safety-action-modal__bottom__collapsible'>
+            <div className='safety-action-modal__caveats'>
+              <FormattedMessage
+                id='block_modal.remote_users_caveat'
+                defaultMessage='We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.'
+                values={{ domain: <strong>{domain}</strong> }}
+              />
+            </div>
+          </div>
+        )}
+
+        <div className='safety-action-modal__actions'>
+          {domain && (
+            <button onClick={handleToggleLearnMore} className='link-button'>
+              {expanded ? <FormattedMessage id='block_modal.show_less' defaultMessage='Show less' /> : <FormattedMessage id='block_modal.show_more' defaultMessage='Show more' />}
+            </button>
+          )}
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+BlockModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;

app/javascript/mastodon/features/ui/components/domain_block_modal.jsx

@@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { blockDomain } from 'mastodon/actions/domain_blocks';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockDomain(domain));
+  }, [dispatch, domain]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={DomainDisabledIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='domain_block_modal.title' defaultMessage='Block domain?' /></h1>
+            <div>{domain}</div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_wont_know' defaultMessage="They won't know they've been blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_wont_see_posts' defaultMessage="You won't see posts or notifications from users on this server." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonRemoveIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_will_lose_followers' defaultMessage='All your followers from this server will be removed.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_cant_follow' defaultMessage='Nobody from this server can follow you.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={HistoryIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_can_interact_with_old_posts' defaultMessage='People from this server can interact with your old posts.' /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='domain_block_modal.block_account_instead' defaultMessage='Block @{name} instead' values={{ name: acct.split('@')[0] }} />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <Button onClick={handleClick}>
+            <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+DomainBlockModal.propTypes = {
+  domain: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;

app/javascript/mastodon/features/ui/components/modal_root.jsx

@@ -7,6 +7,7 @@ import Base from 'mastodon/components/modal_root';
 import {
   MuteModal,
   BlockModal,
+  DomainBlockModal,
   ReportModal,
   EmbedModal,
   ListEditor,
@@ -46,6 +47,7 @@ export const MODAL_COMPONENTS = {
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
+  'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,

app/javascript/mastodon/features/ui/components/mute_modal.jsx

@@ -1,138 +1,154 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';
 
-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { CheckBox } from 'mastodon/components/check_box';
+import { Icon } from 'mastodon/components/icon';
+import { RadioButton } from 'mastodon/components/radio_button';
 
 const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+  hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
 });
 
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['mutes', 'new', 'account']),
-    notifications: state.getIn(['mutes', 'new', 'notifications']),
-    muteDuration: state.getIn(['mutes', 'new', 'duration']),
-  };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+  <RadioButton
+    name={name}
+    value={value}
+    checked={value === currentValue}
+    onChange={onChange}
+    label={label}
+  />
+);
+
+RadioButtonLabel.propTypes = {
+  name: PropTypes.string,
+  value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node,
 };
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications, muteDuration) {
-      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
-    },
+export const MuteModal = ({ accountId, acct }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [notifications, setNotifications] = useState(true);
+  const [muteDuration, setMuteDuration] = useState('0');
+  const [expanded, setExpanded] = useState(false);
 
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(muteAccount(accountId, notifications, muteDuration));
+  }, [dispatch, accountId, notifications, muteDuration]);
 
-    onToggleNotifications() {
-      dispatch(toggleHideNotifications());
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
 
-    onChangeMuteDuration(e) {
-      dispatch(changeMuteDuration(e.target.value));
-    },
-  };
-};
+  const handleToggleNotifications = useCallback(({ target }) => {
+    setNotifications(target.checked);
+  }, [setNotifications]);
 
-class MuteModal extends PureComponent {
+  const handleChangeMuteDuration = useCallback(({ target }) => {
+    setMuteDuration(target.value);
+  }, [setMuteDuration]);
 
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    notifications: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onToggleNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    muteDuration: PropTypes.number.isRequired,
-    onChangeMuteDuration: PropTypes.func.isRequired,
-  };
+  const handleToggleSettings = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
 
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  toggleNotifications = () => {
-    this.props.onToggleNotifications();
-  };
-
-  changeMuteDuration = (e) => {
-    this.props.onChangeMuteDuration(e);
-  };
-
-  render () {
-    const { account, notifications, muteDuration, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal mute-modal'>
-        <div className='mute-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.mute.message'
-              defaultMessage='Are you sure you want to mute {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
-              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            </label>
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={VolumeOffIcon} />
           </div>
-          <div>
-            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
 
-            <select value={muteDuration} onChange={this.changeMuteDuration}>
-              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
-              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-            </select>
+          <div>
+            <h1><FormattedMessage id='mute_modal.title' defaultMessage='Mute user?' /></h1>
+            <div>@{acct}</div>
           </div>
         </div>
 
-        <div className='mute-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_wont_know' defaultMessage="They won't know they've been muted." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_posts' defaultMessage="They can still see your posts, but you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mention them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_can_mention_and_follow' defaultMessage="They can mention and follow you, but you won't see them." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        <div className='safety-action-modal__bottom__collapsible'>
+          <div className='safety-action-modal__field-group'>
+            <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+          </div>
+
+          <div className='safety-action-modal__field-group'>
+            <CheckBox label={intl.formatMessage(messages.hideFromNotifications)} checked={notifications} onChange={handleToggleNotifications} />
+          </div>
+        </div>
+
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleToggleSettings} className='link-button'>
+            {expanded ? <FormattedMessage id='mute_modal.hide_options' defaultMessage='Hide options' /> : <FormattedMessage id='mute_modal.show_options' defaultMessage='Show options' />}
+          </button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+MuteModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;

app/javascript/mastodon/features/ui/components/navigation_panel.jsx

@@ -70,8 +70,8 @@ const NotificationsLink = () => {
     <ColumnLink
       transparent
       to='/notifications'
-      icon={<IconWithBadge icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
@@ -94,8 +94,8 @@ const FollowRequestsLink = () => {
     <ColumnLink
       transparent
       to='/follow_requests'
-      icon={<IconWithBadge icon={PersonAddIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      icon={<IconWithBadge id='user-plus' icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='user-plus' icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.followRequests)}
     />
   );

app/javascript/mastodon/features/ui/util/async-components.js

@@ -162,6 +162,10 @@ export function BlockModal () {
   return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
 }
 
+export function DomainBlockModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
 export function ReportModal () {
   return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }

app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx

@@ -0,0 +1,28 @@
+import { createContext, useContext, useMemo } from 'react';
+
+export const SensitiveMediaContext = createContext<{
+  hideMediaByDefault: boolean;
+}>({
+  hideMediaByDefault: false,
+});
+
+export function useSensitiveMediaContext() {
+  return useContext(SensitiveMediaContext);
+}
+
+type ContextValue = React.ContextType<typeof SensitiveMediaContext>;
+
+export const SensitiveMediaContextProvider: React.FC<
+  React.PropsWithChildren<{ hideMediaByDefault: boolean }>
+> = ({ hideMediaByDefault, children }) => {
+  const contextValue = useMemo<ContextValue>(
+    () => ({ hideMediaByDefault }),
+    [hideMediaByDefault],
+  );
+
+  return (
+    <SensitiveMediaContext.Provider value={contextValue}>
+      {children}
+    </SensitiveMediaContext.Provider>
+  );
+};

app/javascript/mastodon/locales/af.json

@@ -119,9 +119,7 @@
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
   "confirmation_modal.cancel": "Kanselleer",
-  "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
-  "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
   "confirmations.cancel_follow_request.confirm": "Herroep versoek",
   "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
   "confirmations.delete.confirm": "Wis uit",
@@ -129,7 +127,6 @@
   "confirmations.delete_list.confirm": "Wis uit",
   "confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
   "confirmations.discard_edit_media.confirm": "Gooi weg",
-  "confirmations.domain_block.confirm": "Blokkeer die hele domein",
   "confirmations.logout.confirm": "Teken Uit",
   "confirmations.logout.message": "Is jy seker jy wil uitteken?",
   "confirmations.reply.confirm": "Antwoord",

app/javascript/mastodon/locales/an.json

@@ -132,9 +132,7 @@
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
   "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -143,13 +141,10 @@
   "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
-  "confirmations.domain_block.confirm": "Amagar dominio entero",
   "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
   "confirmations.logout.confirm": "Zarrar sesión",
   "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
-  "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
@@ -253,7 +248,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Deixar de seguir etiqueta",
-  "home.column_settings.basic": "Basico",
   "home.column_settings.show_reblogs": "Amostrar retutz",
   "home.column_settings.show_replies": "Amostrar respuestas",
   "home.hide_announcements": "Amagar anuncios",
@@ -324,9 +318,6 @@
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
   "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuarios blocaus",
   "navigation_bar.bookmarks": "Marcadors",
@@ -363,9 +354,6 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
   "notifications.column_settings.alert": "Notificacions d'escritorio",
-  "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
   "notifications.column_settings.mention": "Mencions:",
@@ -504,7 +492,6 @@
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.edit": "Editar",
-  "status.edited": "Editau {date}",
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",

app/javascript/mastodon/locales/ar.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
   "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
   "confirmation_modal.cancel": "إلغاء",
-  "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
-  "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
   "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
   "confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
   "confirmations.delete.confirm": "حذف",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
-  "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
   "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
   "confirmations.logout.confirm": "خروج",
   "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
   "confirmations.mute.confirm": "أكتم",
-  "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
-  "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.reply.confirm": "رد",
@@ -314,7 +309,6 @@
   "hashtag.follow": "اتبع الوسم",
   "hashtag.unfollow": "ألغِ متابعة الوسم",
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
-  "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
   "home.hide_announcements": "إخفاء الإعلانات",
@@ -400,9 +394,6 @@
   "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
-  "mute_modal.duration": "المدة",
-  "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
-  "mute_modal.indefinite": "إلى أجل غير مسمى",
   "navigation_bar.about": "عن",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
@@ -446,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المفضلة:",
-  "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
-  "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
-  "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
   "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
@@ -650,7 +638,6 @@
   "status.direct": "إشارة خاصة لـ @{name}",
   "status.direct_indicator": "إشارة خاصة",
   "status.edit": "تعديل",
-  "status.edited": "عُدّل في {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "فضّل",

app/javascript/mastodon/locales/ast.json

@@ -112,16 +112,13 @@
   "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
   "confirmation_modal.cancel": "Encaboxar",
-  "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
-  "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirala",
   "confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
   "confirmations.delete.confirm": "Desaniciar",
   "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
   "confirmations.delete_list.confirm": "Desaniciar",
   "confirmations.discard_edit_media.confirm": "Escartar",
-  "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
   "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
   "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
@@ -221,7 +218,6 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
-  "home.column_settings.basic": "Configuración básica",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -278,8 +274,6 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -311,9 +305,6 @@
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
-  "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
@@ -433,7 +424,6 @@
   "status.delete": "Desaniciar",
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
-  "status.edited": "Editóse'l {date}",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",

app/javascript/mastodon/locales/be.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
+  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
+  "block_modal.show_less": "Паказаць меньш",
+  "block_modal.show_more": "Паказаць больш",
+  "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
+  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць вашых допісаў, а вы — карыстальніка.",
+  "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
+  "block_modal.title": "Заблакіраваць карыстальніка?",
+  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
   "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
   "confirmation_modal.cancel": "Скасаваць",
-  "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
-  "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
   "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
   "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
   "confirmations.delete.confirm": "Выдаліць",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+  "confirmations.domain_block.confirm": "Заблакіраваць сервер",
   "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
   "confirmations.edit.confirm": "Рэдагаваць",
   "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
   "confirmations.mute.confirm": "Ігнараваць",
-  "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
-  "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
   "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
   "confirmations.reply.confirm": "Адказаць",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
   "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
   "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
+  "domain_block_modal.block": "Заблакіраваць сервер",
+  "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
+  "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
+  "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
+  "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
+  "domain_block_modal.title": "Заблакіраваць дамен?",
+  "domain_block_modal.you_will_lose_followers": "Усе падпісчыкі з гэтага сервера будуць выдаленыя.",
+  "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
+  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
+  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
+  "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
+  "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
+  "domain_pill.username": "Імя карыстальніка",
+  "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
+  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
+  "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
+  "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
   "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
   "embed.preview": "Вось як гэта будзе выглядаць:",
   "emoji_button.activity": "Актыўнасць",
@@ -241,6 +266,7 @@
   "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
   "empty_column.lists": "Як толькі вы створыце новы спіс ён будзе захоўвацца тут, але пакуль што тут пуста.",
   "empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
+  "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі вы будзеце атрымліваць новыя апавяшчэння, яны будуць з'яўляцца тут у адпаведнасці з вашымі наладамі.",
   "empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
   "empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
   "error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+  "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
   "firehose.remote": "Іншыя серверы",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.column_settings.basic": "Асноўныя",
   "home.column_settings.show_reblogs": "Паказаць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
-  "mute_modal.duration": "Працягласць",
-  "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
-  "mute_modal.indefinite": "Бестэрмінова",
+  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
+  "mute_modal.hide_options": "Схаваць опцыі",
+  "mute_modal.indefinite": "Пакуль я не прыбяру ігнараванне",
+  "mute_modal.show_options": "Паказаць опцыі",
+  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць вас і падпісацца на вас, але вы гэтага не ўбачыце.",
+  "mute_modal.they_wont_know": "Карыстальнік не будзе ведаць пра ігнараванне.",
+  "mute_modal.title": "Ігнараваць карыстальніка?",
+  "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
+  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
+  "notification_requests.accept": "Прыняць",
+  "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
+  "notification_requests.title": "Адфільтраваныя апавяшчэнні",
   "notifications.clear": "Ачысціць апавяшчэнні",
   "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
   "notifications.column_settings.favourite": "Упадабанае:",
-  "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
-  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
-  "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
   "notifications.column_settings.mention": "Згадванні:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
   "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
   "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+  "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
+  "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
+  "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
+  "notifications.policy.filter_not_followers_title": "Людзі, якія не падпісаны на вас",
+  "notifications.policy.filter_not_following_hint": "Пакуль вы не пацвердзіце іх уручную",
+  "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
+  "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
+  "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+  "notifications.policy.title": "Адфільтроўваць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
@@ -650,10 +693,11 @@
   "status.direct": "Згадаць асабіста @{name}",
   "status.direct_indicator": "Асабістае згадванне",
   "status.edit": "Рэдагаваць",
-  "status.edited": "Адрэдагавана {date}",
+  "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
   "status.embed": "Убудаваць",
   "status.favourite": "Упадабанае",
+  "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
   "status.filtered": "Адфільтравана",
   "status.hide": "Схаваць допіс",
@@ -674,6 +718,7 @@
   "status.reblog": "Пашырыць",
   "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
   "status.reblogged_by": "{name} пашырыў(-ла)",
+  "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
   "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
   "status.redraft": "Выдаліць і паправіць",
   "status.remove_bookmark": "Выдаліць закладку",

app/javascript/mastodon/locales/bg.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
+  "block_modal.remote_users_caveat": "Ще поискаме сървърът {domain} да почита решението ви. Съгласието обаче не се гарантира откак някои сървъри могат да боравят с блоковете по различен начин. Обществените публикации още може да се виждат от невлезли в системата потребители.",
+  "block_modal.show_less": "Повече на показ",
+  "block_modal.show_more": "По-малко на показ",
+  "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
+  "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.",
+  "block_modal.they_will_know": "Те могат да видят, че са блокирани.",
+  "block_modal.title": "Блокирате ли потребителя?",
+  "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
   "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
-  "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
-  "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
   "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
   "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
   "confirmations.delete.confirm": "Изтриване",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
-  "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+  "confirmations.domain_block.confirm": "Блокиране на сървър",
   "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.mute.confirm": "Заглушаване",
-  "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
-  "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
   "confirmations.reply.confirm": "Отговор",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
+  "domain_block_modal.block": "Блокиране на сървър",
+  "domain_block_modal.block_account_instead": "Вместо това блокиране на @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Хората от този сървър могат да взаимодействат с ваши стари публикации.",
+  "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
+  "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
+  "domain_block_modal.title": "Блокирате ли домейн?",
+  "domain_block_modal.you_will_lose_followers": "Всичките ви последователи от този сървър ще се премахнат.",
+  "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
+  "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
+  "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
+  "domain_pill.server": "Сървър",
+  "domain_pill.their_handle": "Тяхната ръчка:",
+  "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
+  "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+  "domain_pill.username": "Потребителско име",
+  "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+  "domain_pill.who_they_are": "Откак ръчките казват кой кой е и къде е, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.who_you_are": "Тъй като вашата ръчка казва кои сте и къде сте, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.your_handle": "Вашата ръчка:",
+  "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
+  "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
   "emoji_button.activity": "Дейност",
@@ -241,6 +266,7 @@
   "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
   "empty_column.mutes": "Още не сте заглушавали потребители.",
+  "empty_column.notification_requests": "Всичко е чисто! Тук няма нищо. Получавайки нови известия, те ще се появят тук според настройките ви.",
   "empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
   "empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
   "error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
+  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
   "firehose.remote": "Други сървъри",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Следване на хаштаг",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
   "home.hide_announcements": "Скриване на оповестяванията",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Зареждане…",
   "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
-  "mute_modal.duration": "Времетраене",
-  "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
-  "mute_modal.indefinite": "Неопределено",
+  "mute_modal.hide_from_notifications": "Скриване от известията",
+  "mute_modal.hide_options": "Скриване на възможностите",
+  "mute_modal.indefinite": "Докато премахна заглушаването им",
+  "mute_modal.show_options": "Показване на възможностите",
+  "mute_modal.they_can_mention_and_follow": "Могат да ви споменават и последват, но няма да ги виждате.",
+  "mute_modal.they_wont_know": "Няма да узнаят, че са били заглушени.",
+  "mute_modal.title": "Заглушавате ли потребител?",
+  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващи ги публикации.",
+  "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
+  "notification_requests.accept": "Приемам",
+  "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.notifications_from": "Известия от {name}",
+  "notification_requests.title": "Филтрирани известия",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
   "notifications.column_settings.favourite": "Любими:",
-  "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
-  "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
-  "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.follow_request": "Нови заявки за последване:",
   "notifications.column_settings.mention": "Споменавания:",
@@ -474,6 +508,14 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
+  "notifications.policy.filter_new_accounts_title": "Нови акаунти",
+  "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
+  "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
+  "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
+  "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+  "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+  "notifications.policy.title": "Да се филтрират известия от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
@@ -611,7 +653,7 @@
   "search.quick_action.go_to_hashtag": "Към хаштаг {x}",
   "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
-  "search.search_or_paste": "Търсене или поставяне на URL адрес",
+  "search.search_or_paste": "Търсене/поставяне на URL",
   "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
   "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
@@ -650,10 +692,11 @@
   "status.direct": "Частно споменаване на @{name}",
   "status.direct_indicator": "Частно споменаване",
   "status.edit": "Редактиране",
-  "status.edited": "Редактирано на {date}",
+  "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
   "status.embed": "Вграждане",
   "status.favourite": "Любимо",
+  "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
   "status.filtered": "Филтрирано",
   "status.hide": "Скриване на публ.",
@@ -674,6 +717,7 @@
   "status.reblog": "Подсилване",
   "status.reblog_private": "Подсилване с оригиналната видимост",
   "status.reblogged_by": "{name} подсили",
+  "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
   "status.redraft": "Изтриване и преначертаване",
   "status.remove_bookmark": "Премахване на отметката",

app/javascript/mastodon/locales/bn.json

@@ -148,9 +148,7 @@
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
   "confirmation_modal.cancel": "বাতিল করুন",
-  "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
-  "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
   "confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
   "confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
   "confirmations.delete.confirm": "মুছে ফেলুন",
@@ -159,15 +157,12 @@
   "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
   "confirmations.discard_edit_media.confirm": "বাতিল করো",
   "confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
-  "confirmations.domain_block.confirm": "এই ডোমেন থেকে সব লুকান",
   "confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
   "confirmations.edit.confirm": "সম্পাদন",
   "confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
   "confirmations.logout.confirm": "প্রস্থান",
   "confirmations.logout.message": "আপনি লগ আউট করতে চান?",
   "confirmations.mute.confirm": "সরিয়ে ফেলুন",
-  "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.",
-  "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
   "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
   "confirmations.reply.confirm": "মতামত",
   "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
@@ -248,7 +243,6 @@
   "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
   "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
   "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
-  "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
   "home.hide_announcements": "ঘোষণা লুকান",
@@ -303,9 +297,6 @@
   "lists.subheading": "আপনার তালিকা",
   "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
-  "mute_modal.duration": "সময়কাল",
-  "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
-  "mute_modal.indefinite": "অনির্দিষ্ট",
   "navigation_bar.about": "পরিচিতি",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
@@ -338,8 +329,6 @@
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
   "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি",
   "notifications.column_settings.favourite": "পছন্দসমূহ:",
-  "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো",
-  "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ",
   "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
   "notifications.column_settings.follow_request": "অনুসরণের অনুরোধগুলি:",
   "notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",

app/javascript/mastodon/locales/br.json

@@ -87,6 +87,8 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
+  "block_modal.show_less": "Diskouez nebeutoc'h",
+  "block_modal.show_more": "Diskouez muioc'h",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -157,9 +159,7 @@
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
   "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
-  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
   "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
   "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
@@ -168,14 +168,11 @@
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
-  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
   "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.edit.confirm": "Kemmañ",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
-  "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
   "confirmations.reply.confirm": "Respont",
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
@@ -198,6 +195,8 @@
   "dismissable_banner.dismiss": "Diverkañ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.server": "Dafariad",
+  "domain_pill.username": "Anv-implijer",
   "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
   "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
@@ -289,7 +288,6 @@
   "hashtag.follow": "Heuliañ ar ger-klik",
   "hashtag.unfollow": "Paouez heuliañ an hashtag",
   "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
-  "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
@@ -367,9 +365,6 @@
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ…",
   "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
-  "mute_modal.duration": "Padelezh",
-  "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
-  "mute_modal.indefinite": "Amstrizh",
   "navigation_bar.about": "Diwar-benn",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
@@ -410,9 +405,6 @@
   "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
   "notifications.column_settings.favourite": "Muiañ-karet:",
-  "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
-  "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
-  "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
   "notifications.column_settings.follow": "Heulierien nevez:",
   "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
   "notifications.column_settings.mention": "Menegoù:",
@@ -438,6 +430,7 @@
   "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
   "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
   "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+  "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
@@ -587,7 +580,7 @@
   "status.direct": "Menegiñ @{name} ent-prevez",
   "status.direct_indicator": "Meneg prevez",
   "status.edit": "Kemmañ",
-  "status.edited": "Aozet {date}",
+  "status.edited": "Kemmet da ziwezhañ d'an {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",

app/javascript/mastodon/locales/bs.json

@@ -11,7 +11,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",

app/javascript/mastodon/locales/ca.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
+  "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
+  "block_modal.show_less": "Mostra'n menys",
+  "block_modal.show_more": "Mostra'n més",
+  "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
+  "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
+  "block_modal.they_will_know": "Poden veure que els heu blocat.",
+  "block_modal.title": "Bloquem l'usuari?",
+  "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
   "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
-  "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Segur que vols blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
   "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
   "confirmations.delete.confirm": "Elimina",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
-  "confirmations.domain_block.confirm": "Bloca el domini sencer",
+  "confirmations.domain_block.confirm": "Bloca el servidor",
   "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.",
-  "confirmations.mute.message": "Segur que vols silenciar {name}?",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
   "confirmations.reply.confirm": "Respon",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.",
   "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
   "dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.",
+  "domain_block_modal.block": "Bloca el servidor",
+  "domain_block_modal.block_account_instead": "En lloc d'això, bloca @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Els usuaris d'aquest servidor poden interactuar amb les vostres publicacions antigues.",
+  "domain_block_modal.they_cant_follow": "Ningú d'aquest servidor us pot seguir.",
+  "domain_block_modal.they_wont_know": "No sabran que són blocats.",
+  "domain_block_modal.title": "Bloquem el domini?",
+  "domain_block_modal.you_will_lose_followers": "S'eliminaran tots els vostres seguidors d'aquest servidor.",
+  "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
+  "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
+  "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "El seu identificador:",
+  "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
+  "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
+  "domain_pill.username": "Nom d'usuari",
+  "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
+  "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button>.",
+  "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button> poden interactuar amb vosaltres.",
+  "domain_pill.your_handle": "El vostre identificador:",
+  "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
+  "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
   "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
   "embed.preview": "Aquest aspecte tindrà:",
   "emoji_button.activity": "Activitat",
@@ -241,6 +266,7 @@
   "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
   "empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
   "empty_column.mutes": "Encara no has silenciat cap usuari.",
+  "empty_column.notification_requests": "Tot net, ja no hi ha res aquí! Quan rebeu notificacions noves, segons la vostra configuració, apareixeran aquí.",
   "empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
   "empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
   "error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
   "firehose.remote": "Altres servidors",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
-  "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Es carrega…",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
   "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
-  "mute_modal.indefinite": "Indefinit",
+  "mute_modal.hide_from_notifications": "Amaga de les notificacions",
+  "mute_modal.hide_options": "Amaga les opcions",
+  "mute_modal.indefinite": "Fins que els deixi de silenciar",
+  "mute_modal.show_options": "Mostra les opcions",
+  "mute_modal.they_can_mention_and_follow": "Us poden esmentar i seguir, però no els veureu.",
+  "mute_modal.they_wont_know": "No sabran que són silenciats.",
+  "mute_modal.title": "Silenciem l'usuari?",
+  "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
+  "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} t'ha impulsat",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
+  "notification_requests.accept": "Accepta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notificacions de {name}",
+  "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
   "notifications.column_settings.favourite": "Favorits:",
-  "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
-  "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
   "notifications.column_settings.mention": "Mencions:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+  "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
+  "notifications.policy.filter_new_accounts_title": "Comptes nous",
+  "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys {days, plural, one {d'un dia} other {de # dies}}",
+  "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
+  "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
+  "notifications.policy.filter_not_following_title": "Persones que no seguiu",
+  "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
+  "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+  "notifications.policy.title": "Filtra les notificacions de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
@@ -650,10 +693,11 @@
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
   "status.edit": "Edita",
-  "status.edited": "Editat {date}",
+  "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
   "status.embed": "Incrusta",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favorits}}",
   "status.filter": "Filtra aquest tut",
   "status.filtered": "Filtrada",
   "status.hide": "Amaga el tut",
@@ -674,6 +718,7 @@
   "status.reblog": "Impulsa",
   "status.reblog_private": "Impulsa amb la visibilitat original",
   "status.reblogged_by": "impulsat per {name}",
+  "status.reblogs": "{count, plural, one {# impuls} other {# impulsos}}",
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",

app/javascript/mastodon/locales/ckb.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
   "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
-  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
-  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
   "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
   "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
   "confirmations.delete.confirm": "سڕینەوە",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
   "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
   "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
-  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
   "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
   "confirmations.edit.confirm": "دەستکاری",
   "confirmations.edit.message": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
   "confirmations.logout.confirm": "چوونە دەرەوە",
   "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
   "confirmations.mute.confirm": "بێدەنگ",
-  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
-  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
   "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.reply.confirm": "وەڵام",
@@ -300,7 +295,6 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.follow": "شوێنکەوتنی هاشتاگ",
   "hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
-  "home.column_settings.basic": "بنەڕەتی",
   "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
   "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
   "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
@@ -371,9 +365,6 @@
   "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
   "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
   "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
-  "mute_modal.duration": "ماوە",
-  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
-  "mute_modal.indefinite": "نادیار",
   "navigation_bar.about": "دەربارە",
   "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "navigation_bar.bookmarks": "نیشانکراوەکان",
@@ -412,9 +403,6 @@
   "notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:",
   "notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
   "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
-  "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
-  "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
-  "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
   "notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
   "notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
   "notifications.column_settings.mention": "ئاماژەکان:",
@@ -563,7 +551,6 @@
   "status.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "status.direct_indicator": "ئاماژەی تایبەت",
   "status.edit": "دەستکاری",
-  "status.edited": "بەشداری {date}",
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",

app/javascript/mastodon/locales/co.json

@@ -86,21 +86,16 @@
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
   "confirmation_modal.cancel": "Annullà",
-  "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
-  "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
   "confirmations.delete.confirm": "Toglie",
   "confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
   "confirmations.discard_edit_media.confirm": "Scartà",
-  "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
   "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
   "confirmations.logout.confirm": "Scunnettassi",
   "confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
   "confirmations.mute.confirm": "Piattà",
-  "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.",
-  "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
   "confirmations.redraft.confirm": "Sguassà è riscrive",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
@@ -167,7 +162,6 @@
   "hashtag.column_settings.tag_mode.any": "Unu di quessi",
   "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
   "hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
-  "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
   "home.hide_announcements": "Piattà annunzii",
@@ -227,9 +221,6 @@
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
   "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
-  "mute_modal.indefinite": "Indifinita",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
@@ -258,8 +249,6 @@
   "notifications.clear": "Purgà e nutificazione",
   "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
   "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
-  "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
-  "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
   "notifications.column_settings.follow": "Abbunati novi:",
   "notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
   "notifications.column_settings.mention": "Minzione:",

app/javascript/mastodon/locales/cs.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
   "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
   "confirmation_modal.cancel": "Zrušit",
-  "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
-  "confirmations.block.message": "Opravdu chcete blokovat {name}?",
   "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
   "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
   "confirmations.delete.confirm": "Smazat",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
-  "confirmations.domain_block.confirm": "Blokovat celou doménu",
   "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
   "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
   "confirmations.mute.confirm": "Skrýt",
-  "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
-  "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
   "confirmations.redraft.confirm": "Smazat a přepsat",
   "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
   "confirmations.reply.confirm": "Odpovědět",
@@ -314,7 +309,6 @@
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
   "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
-  "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
   "home.hide_announcements": "Skrýt oznámení",
@@ -400,9 +394,6 @@
   "loading_indicator.label": "Načítání…",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
-  "mute_modal.duration": "Trvání",
-  "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
-  "mute_modal.indefinite": "Neomezeně",
   "navigation_bar.about": "O aplikaci",
   "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
@@ -446,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
   "notifications.column_settings.favourite": "Oblíbené:",
-  "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
-  "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
-  "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
   "notifications.column_settings.mention": "Zmínky:",
@@ -650,7 +638,6 @@
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
   "status.edit": "Upravit",
-  "status.edited": "Upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",

app/javascript/mastodon/locales/cy.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Diddymu",
-  "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
   "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
   "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Blocio parth cyfan",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
-  "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'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.reply.confirm": "Ateb",
@@ -241,6 +236,7 @@
   "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
   "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
   "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
+  "empty_column.notification_requests": "Dim i boeni amdano! Does dim byd yma. Pan fyddwch yn derbyn hysbysiadau newydd, byddan nhw'n ymddangos yma yn ôl eich gosodiadau.",
   "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
   "empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
   "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
@@ -271,6 +267,7 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
   "firehose.remote": "Gweinyddion eraill",
@@ -314,7 +311,6 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
-  "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
@@ -400,9 +396,6 @@
   "loading_indicator.label": "Yn llwytho…",
   "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
-  "mute_modal.duration": "Hyd",
-  "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
-  "mute_modal.indefinite": "Parhaus",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -440,15 +433,16 @@
   "notification.reblog": "Hybodd {name} eich post",
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
+  "notification_requests.accept": "Derbyn",
+  "notification_requests.dismiss": "Cau",
+  "notification_requests.notifications_from": "Hysbysiadau gan {name}",
+  "notification_requests.title": "Hysbysiadau wedi'u hidlo",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
   "notifications.column_settings.favourite": "Ffefrynnau:",
-  "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
-  "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
-  "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
   "notifications.column_settings.mention": "Crybwylliadau:",
@@ -474,6 +468,15 @@
   "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
+  "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
+  "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
+  "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai  {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
+  "notifications.policy.filter_not_followers_title": "Pobl sydd ddim yn eich dilyn",
+  "notifications.policy.filter_not_following_hint": "Hyd nes i chi eu cymeradwyo â llaw",
+  "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
+  "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
+  "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
+  "notifications.policy.title": "Hidlo hysbysiadau gan…",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
@@ -650,7 +653,6 @@
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
   "status.edit": "Golygu",
-  "status.edited": "Golygwyd {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
   "status.favourite": "Hoffi",

app/javascript/mastodon/locales/da.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
+  "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis flere",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+  "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
+  "block_modal.title": "Blokér bruger?",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
   "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
-  "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
   "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
   "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
   "confirmations.delete.confirm": "Slet",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
   "confirmations.discard_edit_media.confirm": "Kassér",
   "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
-  "confirmations.domain_block.confirm": "Blokér hele domænet",
+  "confirmations.domain_block.confirm": "Blokér server",
   "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.mute.confirm": "Skjul (mute)",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
-  "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
   "confirmations.redraft.confirm": "Slet og omformulér",
   "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
   "confirmations.reply.confirm": "Svar",
@@ -205,6 +209,25 @@
   "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
   "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
   "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
+  "domain_block_modal.block": "Blokér server",
+  "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
+  "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
+  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.title": "Blokér domæne?",
+  "domain_block_modal.you_will_lose_followers": "Alle følgerne fra denne server fjernes.",
+  "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
+  "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deres handle:",
+  "domain_pill.username": "Brugernavn",
+  "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
+  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.your_handle": "Dit handle:",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+  "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
@@ -241,6 +264,7 @@
   "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
   "empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
   "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
   "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
   "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
@@ -271,6 +295,8 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+  "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
   "firehose.remote": "Andre servere",
@@ -314,7 +340,6 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
-  "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
@@ -400,9 +425,15 @@
   "loading_indicator.label": "Indlæser…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
-  "mute_modal.duration": "Varighed",
-  "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
-  "mute_modal.indefinite": "Tidsubegrænset",
+  "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
+  "mute_modal.hide_options": "Skjul valgmuligheder",
+  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.show_options": "Vis valgmuligheder",
+  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+  "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+  "mute_modal.title": "Tavsgør bruger?",
+  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+  "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -440,15 +471,16 @@
   "notification.reblog": "{name} boostede dit indlæg",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
+  "notification_requests.accept": "Acceptér",
+  "notification_requests.dismiss": "Afvis",
+  "notification_requests.notifications_from": "Notifikationer fra {name}",
+  "notification_requests.title": "Filtrerede notifikationer",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
@@ -474,6 +506,15 @@
   "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
   "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
+  "notifications.policy.filter_new_accounts_title": "Ny konti",
+  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
+  "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+  "notifications.policy.filter_not_following_hint": "Indtil de manuelt godkendes",
+  "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+  "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
+  "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
+  "notifications.policy.title": "Bortfiltrér notifikationer fra…",
   "notifications_permission_banner.enable": "Aktivér computernotifikationer",
   "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
@@ -650,10 +691,11 @@
   "status.direct": "Privat omtale @{name}",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Redigér",
-  "status.edited": "Redigeret {date}",
+  "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
   "status.embed": "Indlejr",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
   "status.filtered": "Filtreret",
   "status.hide": "Skjul indlæg",
@@ -674,6 +716,7 @@
   "status.reblog": "Fremhæv",
   "status.reblog_private": "Boost med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
+  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",

app/javascript/mastodon/locales/de.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
+  "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
+  "block_modal.show_less": "Weniger anzeigen",
+  "block_modal.show_more": "Mehr anzeigen",
+  "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
+  "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
+  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+  "block_modal.title": "Profil blockieren?",
+  "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
   "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
-  "confirmations.block.message": "Möchtest du {name} wirklich blockieren?",
   "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
   "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
   "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
-  "confirmations.domain_block.confirm": "Domain blockieren",
+  "confirmations.domain_block.confirm": "Server blockieren",
   "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.edit.confirm": "Bearbeiten",
   "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
-  "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
-  "confirmations.mute.message": "Möchtest du {name} wirklich stummschalten?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.reply.confirm": "Antworten",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
   "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
   "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "domain_block_modal.block": "Server blockieren",
+  "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
+  "domain_block_modal.they_cant_follow": "Niemand von diesem Server wird dir folgen können.",
+  "domain_block_modal.they_wont_know": "Es wird nicht erkennbar sein, dass diese Domain blockiert wurde.",
+  "domain_block_modal.title": "Domain blockieren?",
+  "domain_block_modal.you_will_lose_followers": "Alle Follower von diesem Server werden entfernt.",
+  "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
+  "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
+  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deren Adresse:",
+  "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "domain_pill.username": "Profilname",
+  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.your_handle": "Deine Adresse:",
+  "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
@@ -241,6 +266,7 @@
   "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
   "empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
+  "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
   "empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
   "error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
   "firehose.remote": "Andere Server",
@@ -281,7 +309,7 @@
   "follow_suggestions.dismiss": "Nicht mehr anzeigen",
   "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
   "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
-  "follow_suggestions.hints.most_followed": "Dieses Profil wird von den meisten auf {domain} gefolgt.",
+  "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
   "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
   "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
   "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
-  "home.column_settings.basic": "Allgemein",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
   "home.hide_announcements": "Ankündigungen ausblenden",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Wird geladen …",
   "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
-  "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?",
-  "mute_modal.indefinite": "Unbegrenzt",
+  "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
+  "mute_modal.hide_options": "Einstellungen ausblenden",
+  "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+  "mute_modal.show_options": "Einstellungen anzeigen",
+  "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
+  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+  "mute_modal.title": "Profil stummschalten?",
+  "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
+  "notification_requests.accept": "Akzeptieren",
+  "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.notifications_from": "Benachrichtigungen von {name}",
+  "notification_requests.title": "Gefilterte Benachrichtigungen",
   "notifications.clear": "Benachrichtigungen löschen",
   "notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favoriten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
-  "notifications.column_settings.filter_bar.category": "Filterleiste:",
-  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
   "notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
   "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+  "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
+  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+  "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
+  "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+  "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
+  "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
   "notifications_permission_banner.title": "Nichts verpassen",
@@ -650,10 +693,11 @@
   "status.direct": "@{name} privat erwähnen",
   "status.direct_indicator": "Private Erwähnung",
   "status.edit": "Beitrag bearbeiten",
-  "status.edited": "Bearbeitet {date}",
+  "status.edited": "Zuletzt am {date} bearbeitet",
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
   "status.embed": "Beitrag per iFrame einbetten",
   "status.favourite": "Favorisieren",
+  "status.favourites": "{count, plural, one {Favorit} other {Favoriten}}",
   "status.filter": "Beitrag filtern",
   "status.filtered": "Gefiltert",
   "status.hide": "Beitrag ausblenden",
@@ -674,6 +718,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
   "status.reblogged_by": "{name} teilte",
+  "status.reblogs": "{count, plural, one {geteilt} other {geteilt}}",
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",

app/javascript/mastodon/locales/el.json

@@ -154,9 +154,7 @@
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
   "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
-  "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
-  "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
   "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
   "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
   "confirmations.delete.confirm": "Διαγραφή",
@@ -165,15 +163,12 @@
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
-  "confirmations.domain_block.confirm": "Αποκλεισμός ολόκληρου του τομέα",
   "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
   "confirmations.mute.confirm": "Αποσιώπηση",
-  "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
-  "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
   "confirmations.reply.confirm": "Απάντησε",
@@ -289,7 +284,6 @@
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
-  "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
@@ -367,9 +361,6 @@
   "loading_indicator.label": "Φόρτωση…",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
-  "mute_modal.duration": "Διάρκεια",
-  "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
-  "mute_modal.indefinite": "Επ᾽ αόριστον",
   "navigation_bar.about": "Σχετικά με",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
@@ -411,9 +402,6 @@
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
   "notifications.column_settings.favourite": "Αγαπημένα:",
-  "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
-  "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
-  "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
   "notifications.column_settings.mention": "Επισημάνσεις:",
@@ -590,7 +578,6 @@
   "status.direct": "Ιδιωτική επισήμανση @{name}",
   "status.direct_indicator": "Ιδιωτική επισήμανση",
   "status.edit": "Επεξεργασία",
-  "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Αγαπημένα",

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

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Add content warning",
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
@@ -308,7 +303,6 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -394,9 +388,6 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -440,9 +431,6 @@
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -644,7 +632,6 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",

app/javascript/mastodon/locales/en.json

@@ -145,6 +145,14 @@
   "antennas.warnings.range_radio": "Simultaneous account and domain designation is not recommended.",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "bookmark_categories.all_bookmarks": "All bookmarks",
   "bookmark_categories.delete": "Delete category",
   "bookmark_categories.edit": "Edit category",
@@ -247,9 +255,7 @@
   "compose_form.spoiler.unmarked": "Add content warning",
   "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -264,15 +270,13 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "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.reply.confirm": "Reply",
@@ -298,6 +302,27 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
   "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -374,7 +399,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
@@ -510,9 +535,15 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.antennas": "Antenna",
@@ -814,7 +845,7 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
+  "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.emoji_reaction": "Emoji reaction",
@@ -827,7 +858,9 @@
   "status.expiration.5_minutes": "Remove 5 minutes later",
   "status.expiration.7_days": "Remove 7 days later",
   "status.expiration.add": "Set status expired time",
+  "status.emoji_reactions": "{count, plural, one {reaction} other {reactions}}",
   "status.favourite": "Favorite",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",
@@ -851,6 +884,7 @@
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reference": "Reference",
@@ -867,6 +901,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
+  "status.status_references": "{count, plural, one {ref} other {refs}}",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
   "status.translate": "Translate",
   "status.translated_from_with": "Translated from {lang} using {provider}",

app/javascript/mastodon/locales/eo.json

@@ -152,9 +152,7 @@
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
   "confirmation_modal.cancel": "Nuligi",
-  "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
-  "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
   "confirmations.cancel_follow_request.confirm": "Eksigi peton",
   "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
   "confirmations.delete.confirm": "Forigi",
@@ -163,15 +161,12 @@
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
-  "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.logout.confirm": "Adiaŭi",
   "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
   "confirmations.mute.confirm": "Silentigi",
-  "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
-  "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
   "confirmations.reply.confirm": "Respondi",
@@ -295,7 +290,6 @@
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
-  "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
   "home.hide_announcements": "Kaŝi la anoncojn",
@@ -381,9 +375,6 @@
   "loading_indicator.label": "Ŝargado…",
   "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
-  "mute_modal.duration": "Daŭro",
-  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
-  "mute_modal.indefinite": "Nedifinita",
   "navigation_bar.about": "Pri",
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
   "navigation_bar.blocks": "Blokitaj uzantoj",
@@ -427,9 +418,6 @@
   "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
   "notifications.column_settings.alert": "Sciigoj de la retumilo",
   "notifications.column_settings.favourite": "Stelumoj:",
-  "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
-  "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
-  "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
   "notifications.column_settings.mention": "Mencioj:",
@@ -621,7 +609,6 @@
   "status.direct": "Private mencii @{name}",
   "status.direct_indicator": "Privata mencio",
   "status.edit": "Redakti",
-  "status.edited": "Redaktita {date}",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",

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

@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Se ocultarán los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a ésta, pero todavía esta cuenta podrá ver tus mensajes o seguirte.",
-  "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estos son los mensajes que están ganando popularidad en la web social, hoy mismo. Los mensajes más recientes con más adhesiones y marcados como favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son etiquetas que están ganando popularidad en la web social, hoy mismo. Las etiquetas que son usadas por diferentes cuentas obtienen más exposición.",
   "dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de cuentas en la web social que las personas en {domain} siguen.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las cuentas de este servidor pueden interactuar con tus mensajes antiguos.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
   "embed.preview": "Así es cómo se verá:",
   "emoji_button.activity": "Actividad",
@@ -241,6 +266,7 @@
   "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
   "empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada acá. Cuando recibás nuevas notificaciones, aparecerán acá, acorde a tu configuración.",
   "empty_column.notifications": "Todavía no tenés ninguna notificación. Cuando otras cuentas interactúen con vos, vas a ver la notificación acá.",
   "empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador web, esta página no se pudo mostrar correctamente.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que fueron silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Cuentas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las aprobés manualmente",
+  "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
@@ -650,10 +693,11 @@
   "status.direct": "Mención privada a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
+  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar mensaje",
@@ -674,6 +718,7 @@
   "status.reblog": "Adherir",
   "status.reblog_private": "Adherir a la audiencia original",
   "status.reblogged_by": "{name} adhirió",
+  "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",

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

@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Texto no oculto",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están en tendencia en la red ahora. Las publicaciones recientes con más impulsos y favoritos se muestran más arriba.",
   "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
   "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Todos tus seguidores de este servidor serán eliminados.",
+  "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -241,6 +266,7 @@
   "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
   "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -650,10 +693,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar toot",
@@ -674,6 +718,7 @@
   "status.reblog": "Retootear",
   "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",

app/javascript/mastodon/locales/es.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear todo el dominio",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá sus publicaciones y las publicaciones que los mencionen, pero podrán seguir viendo tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Seguro que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
   "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -238,10 +263,11 @@
   "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
   "empty_column.hashtag": "No hay nada en este hashtag aún.",
   "empty_column.home": "¡Tu línea temporal está vacía! Sigue a más personas para rellenarla.",
-  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
-  "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
+  "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos estados, estos aparecerán aquí.",
+  "empty_column.lists": "No tienes ninguna lista. Cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
-  "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
+  "empty_column.notifications": "Aún no tienes ninguna notificación. Cuando otras personas interactúen contigo, aparecerán aquí.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
   "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
@@ -257,7 +283,7 @@
   "explore.trending_tags": "Etiquetas",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
-  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
   "filter_modal.added.expired_title": "¡Filtro caducado!",
   "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -650,10 +693,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicación",
@@ -674,6 +718,7 @@
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar a la audiencia original",
   "status.reblogged_by": "Impulsado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",

app/javascript/mastodon/locales/et.json

@@ -89,6 +89,10 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
+  "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
+  "block_modal.show_less": "Kuva vähem",
+  "block_modal.show_more": "Kuva rohkem",
+  "block_modal.title": "Blokeeri kasutaja?",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -160,9 +164,7 @@
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
   "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
-  "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
   "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
   "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
   "confirmations.delete.confirm": "Kustuta",
@@ -171,15 +173,13 @@
   "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
   "confirmations.discard_edit_media.confirm": "Hülga",
   "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
-  "confirmations.domain_block.confirm": "Peida terve domeen",
+  "confirmations.domain_block.confirm": "Blokeeri server",
   "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.mute.confirm": "Vaigista",
-  "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.",
-  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.reply.confirm": "Vasta",
@@ -205,6 +205,9 @@
   "dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.",
   "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
   "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
+  "domain_block_modal.block": "Blokeeri server",
+  "domain_pill.server": "Server",
+  "domain_pill.username": "Kasutajanimi",
   "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
@@ -271,6 +274,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
+  "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
   "firehose.remote": "Teised serverid",
@@ -314,7 +318,6 @@
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
-  "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
   "home.hide_announcements": "Peida teadaanded",
@@ -400,9 +403,8 @@
   "loading_indicator.label": "Laadimine…",
   "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
-  "mute_modal.duration": "Kestus",
-  "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
-  "mute_modal.indefinite": "Lõpmatu",
+  "mute_modal.hide_options": "Peida valikud",
+  "mute_modal.show_options": "Kuva valikud",
   "navigation_bar.about": "Teave",
   "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
@@ -440,15 +442,14 @@
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
+  "notification_requests.accept": "Nõus",
+  "notification_requests.dismiss": "Hülga",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
   "notifications.column_settings.admin.report": "Uued teavitused:",
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
-  "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
-  "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
-  "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
   "notifications.column_settings.mention": "Mainimised:",
@@ -474,6 +475,7 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_new_accounts_title": "Uued kontod",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
@@ -650,7 +652,6 @@
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
   "status.edit": "Muuda",
-  "status.edited": "{date} muudetud",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
   "status.embed": "Manustamine",
   "status.favourite": "Lemmik",

app/javascript/mastodon/locales/eu.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
+  "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
+  "block_modal.show_less": "Erakutsi gutxiago",
+  "block_modal.show_more": "Erakutsi gehiago",
+  "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
+  "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
+  "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
+  "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
+  "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
   "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
-  "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
-  "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
   "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
   "confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
   "confirmations.delete.confirm": "Ezabatu",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
   "confirmations.discard_edit_media.confirm": "Baztertu",
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
-  "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
+  "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
   "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
   "confirmations.edit.confirm": "Editatu",
   "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.mute.confirm": "Mututu",
-  "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.",
-  "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
   "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
   "confirmations.reply.confirm": "Erantzun",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hauek dira gaur egun lekua hartzen ari diren sare sozial osoaren argitalpenak. Bultzada eta gogoko gehien dituzten argitalpen berrienek sailkapen altuagoa dute.",
   "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
   "dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.",
+  "domain_block_modal.block": "Blokeatu zerbitzaria",
+  "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
+  "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
+  "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
+  "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
+  "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+  "domain_block_modal.you_will_lose_followers": "Zerbitzari honetako jarraitzaile guztiak kenduko dira.",
+  "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
+  "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
+  "domain_pill.server": "Zerbitzaria",
+  "domain_pill.their_handle": "Bere helbidea:",
+  "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
+  "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
+  "domain_pill.username": "Erabiltzaile-izena",
+  "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
+  "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, <button>ActivityPub darabilten plataformen</button> sare sozialeko jendearekin jar zaitezke harremanetan.",
+  "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea <button>ActivityPub darabilten plataformen</button> sare sozialen bitartez jar daiteke zurekin harremanetan.",
+  "domain_pill.your_handle": "Zure helbidea:",
+  "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
+  "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
   "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
   "embed.preview": "Hau da izango duen itxura:",
   "emoji_button.activity": "Jarduera",
@@ -241,6 +266,7 @@
   "empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
   "empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
   "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
+  "empty_column.notification_requests": "Garbi-garbi! Ezertxo ere ez hemen. Jakinarazpenak jasotzen dituzunean, hemen agertuko dira zure ezarpenen arabera.",
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileei hau betetzen joateko",
   "error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
+  "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
+  "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
   "firehose.local": "Zerbitzari hau",
   "firehose.remote": "Beste zerbitzariak",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Jarraitu traolari",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
-  "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Kargatzen…",
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
-  "mute_modal.duration": "Iraupena",
-  "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
-  "mute_modal.indefinite": "Zehaztu gabe",
+  "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
+  "mute_modal.hide_options": "Ezkutatu aukerak",
+  "mute_modal.indefinite": "Desmututua izan arte",
+  "mute_modal.show_options": "Erakutsi aukerak",
+  "mute_modal.they_can_mention_and_follow": "Aipa eta jarrai zaitzakete, baina ez dituzu ikusiko.",
+  "mute_modal.they_wont_know": "Ez dute jakingo mututuak izan direnik.",
+  "mute_modal.title": "Erabiltzailea mututu nahi duzu?",
+  "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
+  "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
   "navigation_bar.about": "Honi buruz",
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
+  "notification_requests.accept": "Onartu",
+  "notification_requests.dismiss": "Baztertu",
+  "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
+  "notification_requests.title": "Iragazitako jakinarazpenak",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
-  "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak",
-  "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
-  "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
   "notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
   "notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+  "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
+  "notifications.policy.filter_new_accounts_title": "Kontu berriak",
+  "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
+  "notifications.policy.filter_not_followers_title": "Jarraitzen ez zaituen jendea",
+  "notifications.policy.filter_not_following_hint": "Eskuz onartzen dituzun arte",
+  "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
+  "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
+  "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+  "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
@@ -650,10 +693,11 @@
   "status.direct": "Aipatu pribatuki @{name}",
   "status.direct_indicator": "Aipamen pribatua",
   "status.edit": "Editatu",
-  "status.edited": "Editatua {date}",
+  "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
+  "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
   "status.filtered": "Iragazita",
   "status.hide": "Tuta ezkutatu",
@@ -674,6 +718,7 @@
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
   "status.reblogged_by": "{name}(r)en bultzada",
+  "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.remove_bookmark": "Kendu laster-marka",

app/javascript/mastodon/locales/fa.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
   "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
-  "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
-  "confirmations.block.message": "مطمئنید که می‌خواهید {name} را مسدود کنید؟",
   "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
   "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
   "confirmations.delete.confirm": "حذف",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
-  "confirmations.domain_block.confirm": "انسداد تمام دامنه",
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
   "confirmations.edit.confirm": "ویرایش",
   "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
   "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
   "confirmations.mute.confirm": "خموش",
-  "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی‌گیری کنند.",
-  "confirmations.mute.message": "مطمئنید می‌خواهید {name} را بخموشانید؟",
   "confirmations.redraft.confirm": "حذف و بازنویسی",
   "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
   "confirmations.reply.confirm": "پاسخ",
@@ -314,7 +309,6 @@
   "hashtag.follow": "پی‌گرفتن برچسب",
   "hashtag.unfollow": "پی‌نگرفتن برچسب",
   "hashtags.and_other": "…و {count, plural, other {# بیش‌تر}}",
-  "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
@@ -326,8 +320,8 @@
   "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
   "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
   "interaction_modal.description.reply": "با حسابی روی ماستودون می‌توانید به این فرسته پاسخ دهید.",
-  "interaction_modal.login.action": "من رو ببر خونه",
-  "interaction_modal.login.prompt": "دامنه سرور شخصی شما، به عنوان مثال. mastodon.social",
+  "interaction_modal.login.action": "رفتن به خانه",
+  "interaction_modal.login.prompt": "دامنهٔ کارساز شخصیتان چون mastodon.social",
   "interaction_modal.no_account_yet": "در ماستودون نیست؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
@@ -400,9 +394,6 @@
   "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
-  "mute_modal.duration": "مدت زمان",
-  "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کاربر؟",
-  "mute_modal.indefinite": "نامعلوم",
   "navigation_bar.about": "درباره",
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
@@ -446,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
-  "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
-  "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
-  "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
   "notifications.column_settings.mention": "اشاره‌ها:",
@@ -650,7 +638,6 @@
   "status.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "status.direct_indicator": "اشارهٔ خصوصی",
   "status.edit": "ویرایش",
-  "status.edited": "ویرایش شده در {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",

app/javascript/mastodon/locales/fi.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Tiedote",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
+  "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
+  "block_modal.show_less": "Näytä vähemmän",
+  "block_modal.show_more": "Näytä enemmän",
+  "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+  "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+  "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
+  "block_modal.title": "Estetäänkö käyttäjä?",
+  "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
   "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
-  "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
-  "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
   "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
   "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
   "confirmations.delete.confirm": "Poista",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
   "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
-  "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
+  "confirmations.domain_block.confirm": "Estä palvelin",
   "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
   "confirmations.edit.confirm": "Muokkaa",
   "confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
   "confirmations.mute.confirm": "Mykistä",
-  "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
-  "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
   "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
   "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "domain_block_modal.block": "Estä palvelin",
+  "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
+  "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+  "domain_block_modal.title": "Estetäänkö verkkotunnus?",
+  "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
+  "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
+  "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
+  "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
+  "domain_pill.server": "Palvelin",
+  "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+  "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
+  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+  "domain_pill.username": "Käyttäjänimi",
+  "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.your_handle": "Käyttäjänimesi:",
+  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
+  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Tältä se näyttää:",
   "emoji_button.activity": "Aktiviteetit",
@@ -241,6 +266,7 @@
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
+  "empty_column.notification_requests": "Kaikki kunnossa! Täällä ei ole mitään. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filtered_notifications_banner.pending_requests": "Ilmoitukset {count, plural, =0 {ei keltään} one {yhdeltä henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
   "firehose.remote": "Muut palvelimet",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
-  "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
   "home.hide_announcements": "Piilota tiedotteet",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Ladataan…",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
-  "mute_modal.duration": "Kesto",
-  "mute_modal.hide_notifications": "Piilotetaanko tältä käyttäjältä tulevat ilmoitukset?",
-  "mute_modal.indefinite": "Ikuisesti",
+  "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
+  "mute_modal.hide_options": "Piilota valinnat",
+  "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
+  "mute_modal.show_options": "Näytä valinnat",
+  "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
+  "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+  "mute_modal.title": "Mykistetäänkö käyttäjä?",
+  "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
+  "notification_requests.accept": "Hyväksy",
+  "notification_requests.dismiss": "Hylkää",
+  "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
+  "notification_requests.title": "Suodatetut ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
   "notifications.column_settings.admin.report": "Uudet ilmoitukset:",
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
-  "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
-  "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
-  "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "notifications.policy.filter_new_accounts_title": "Uudet tilit",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien ne, jotka ovat seuranneet sinua vähemmän kuin {days, plural, one {päivän} other {# päivää}}",
+  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
+  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
+  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
+  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
@@ -650,10 +693,11 @@
   "status.direct": "Mainitse @{name} yksityisesti",
   "status.direct_indicator": "Yksityinen maininta",
   "status.edit": "Muokkaa",
-  "status.edited": "Muokattu {date}",
+  "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Upota",
   "status.favourite": "Suosikki",
+  "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
   "status.filtered": "Suodatettu",
   "status.hide": "Piilota julkaisu",
@@ -674,6 +718,7 @@
   "status.reblog": "Tehosta",
   "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
   "status.reblogged_by": "{name} tehosti",
+  "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
   "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",

app/javascript/mastodon/locales/fil.json

@@ -106,16 +106,13 @@
   "compose_form.reply": "Tumugon",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
   "confirmation_modal.cancel": "Pagpaliban",
-  "confirmations.block.block_and_report": "Harangan at i-ulat",
   "confirmations.block.confirm": "Harangan",
-  "confirmations.block.message": "Sigurado ka bang gusto mong harangan si {name}?",
   "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
   "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
   "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
-  "confirmations.domain_block.confirm": "Harangan ang buong domain",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
   "copy_icon_button.copied": "Sinipi sa clipboard",
@@ -169,6 +166,7 @@
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
   "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
   "explore.search_results": "Mga resulta ng paghahanap",
+  "filter_modal.select_filter.search": "Hanapin o gumawa",
   "firehose.all": "Lahat",
   "firehose.local": "Itong serbiro",
   "firehose.remote": "Ibang mga serbiro",
@@ -272,7 +270,6 @@
   "status.direct": "Palihim na banggitin si/ang @{name}",
   "status.direct_indicator": "Palihim na banggit",
   "status.edit": "Baguhin",
-  "status.edited": "Binago noong {date}",
   "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
   "status.history.created": "Nilikha ni/ng {name} {date}",
   "status.history.edited": "Binago ni/ng {name} {date}",

app/javascript/mastodon/locales/fo.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
+  "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
+  "block_modal.show_less": "Vís minni",
+  "block_modal.show_more": "Vís meiri",
+  "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
+  "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
+  "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
+  "block_modal.title": "Banna brúkara?",
+  "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
   "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
-  "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
-  "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
   "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
   "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
   "confirmations.delete.confirm": "Strika",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
   "confirmations.discard_edit_media.confirm": "Vraka",
   "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
-  "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+  "confirmations.domain_block.confirm": "Banna ambætara",
   "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
   "confirmations.edit.confirm": "Rætta",
   "confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
   "confirmations.logout.confirm": "Rita út",
   "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
   "confirmations.mute.confirm": "Doyv",
-  "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
-  "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
   "confirmations.redraft.confirm": "Sletta og skriva umaftur",
   "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
   "confirmations.reply.confirm": "Svara",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.",
   "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
   "dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.",
+  "domain_block_modal.block": "Banna ambætara",
+  "domain_block_modal.block_account_instead": "Banna @{name} ístaðin",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá hesum ambætara kunnu svara tínum gomlu postum.",
+  "domain_block_modal.they_cant_follow": "Eingin frá hesum ambætara kann fylgja tær.",
+  "domain_block_modal.they_wont_know": "Tey vita ikki, at tey eru bannað.",
+  "domain_block_modal.title": "Banna økisnavni?",
+  "domain_block_modal.you_will_lose_followers": "Allir tínir fylgjarar á hesum ambætara hvørva.",
+  "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
+  "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
+  "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
+  "domain_pill.server": "Ambætari",
+  "domain_pill.their_handle": "Teirra hald:",
+  "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
+  "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+  "domain_pill.username": "Brúkaranavn",
+  "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
+  "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.your_handle": "Títt hald:",
+  "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
+  "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
   "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
   "embed.preview": "Soleiðis fer tað at síggja út:",
   "emoji_button.activity": "Virksemi",
@@ -241,6 +266,7 @@
   "empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
   "empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
   "empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+  "empty_column.notification_requests": "Alt er klárt! Her er einki. Tá tú fært nýggjar fráboðanir, síggjast tær her sambært tínum stillingum.",
   "empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
   "empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
   "error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
+  "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
   "firehose.remote": "Aðrir ambætarar",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
-  "home.column_settings.basic": "Grundleggjandi",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
   "home.hide_announcements": "Fjal kunngerðir",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Innlesur…",
   "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
-  "mute_modal.duration": "Tíðarbil",
-  "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
-  "mute_modal.indefinite": "Óásett tíðarskeið",
+  "mute_modal.hide_from_notifications": "Fjal boð",
+  "mute_modal.hide_options": "Fjal valmøguleikar",
+  "mute_modal.indefinite": "Inntil eg tendri tey aftur",
+  "mute_modal.show_options": "Vís valmøguleikar",
+  "mute_modal.they_can_mention_and_follow": "Tey kunnu bæði nevna og fylgja tær, men tú sært ikki tey.",
+  "mute_modal.they_wont_know": "Tey vita ikki, at tey eru sløkt.",
+  "mute_modal.title": "Sløkk brúkara?",
+  "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
+  "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} lyfti tín post",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
+  "notification_requests.accept": "Góðtak",
+  "notification_requests.dismiss": "Avvís",
+  "notification_requests.notifications_from": "Fráboðanir frá {name}",
+  "notification_requests.title": "Sáldaðar fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
   "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
-  "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
-  "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
-  "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka",
   "notifications.column_settings.follow": "Nýggir fylgjarar:",
   "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
   "notifications.column_settings.mention": "Umrøður:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
   "notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
   "notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+  "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
+  "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
+  "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
+  "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
+  "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
+  "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+  "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
+  "notifications.policy.title": "Sálda burtur fráboðanir frá…",
   "notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
   "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
   "notifications_permission_banner.title": "Miss einki",
@@ -650,10 +693,11 @@
   "status.direct": "Umrøð @{name} privat",
   "status.direct_indicator": "Privat umrøða",
   "status.edit": "Rætta",
-  "status.edited": "Rættað {date}",
+  "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
   "status.embed": "Legg inní",
   "status.favourite": "Dámdur postur",
+  "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
   "status.filtered": "Filtrerað",
   "status.hide": "Fjal post",
@@ -674,6 +718,7 @@
   "status.reblog": "Stimbra",
   "status.reblog_private": "Stimbra við upprunasýni",
   "status.reblogged_by": "{name} stimbrað",
+  "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
   "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
   "status.redraft": "Strika & ger nýggja kladdu",
   "status.remove_bookmark": "Gloym",

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

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
   "confirmations.delete.confirm": "Supprimer",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
-  "confirmations.domain_block.confirm": "Bloquer ce domaine entier",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Éditer",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
   "confirmations.redraft.confirm": "Supprimer et réécrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -271,6 +266,8 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
@@ -314,7 +311,6 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -400,9 +396,6 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
-  "mute_modal.indefinite": "Indéfinie",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -446,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
   "notifications.column_settings.favourite": "Favoris:",
-  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
   "notifications.column_settings.mention": "Mentions:",
@@ -650,7 +640,6 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifiée le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",

app/javascript/mastodon/locales/fr.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
   "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirer la demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
   "confirmations.delete.confirm": "Supprimer",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
-  "confirmations.domain_block.confirm": "Bloquer tout le domaine",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Modifier",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -271,6 +266,8 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
@@ -314,7 +311,6 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -400,9 +396,6 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
-  "mute_modal.indefinite": "Indéfinie",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -446,9 +439,6 @@
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
   "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
@@ -650,7 +640,6 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifié le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",

app/javascript/mastodon/locales/fy.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
   "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
   "confirmation_modal.cancel": "Annulearje",
-  "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
-  "confirmations.block.message": "Binne jo wis dat jo {name} blokkearje wolle?",
   "confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
   "confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
   "confirmations.delete.confirm": "Fuortsmite",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
-  "confirmations.domain_block.confirm": "Alles fan dit domein blokkearje",
   "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
   "confirmations.logout.confirm": "Ofmelde",
   "confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
   "confirmations.mute.confirm": "Negearje",
-  "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten dêr’t se yn fermeld wurde ûnsichtber meitsje, mar se sille jo berjochten noch hieltyd sjen kinne en jo folgje kinne.",
-  "confirmations.mute.message": "Binne jo wis dat jo {name} negearje wolle?",
   "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
   "confirmations.redraft.message": "Binne jo wis dat jo dit berjocht fuortsmite en opnij opstelle wolle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.",
   "confirmations.reply.confirm": "Reagearje",
@@ -314,7 +309,6 @@
   "hashtag.follow": "Hashtag folgje",
   "hashtag.unfollow": "Hashtag ûntfolgje",
   "hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
-  "home.column_settings.basic": "Algemien",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
   "home.hide_announcements": "Meidielingen ferstopje",
@@ -400,9 +394,6 @@
   "loading_indicator.label": "Lade…",
   "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
-  "mute_modal.duration": "Doer",
-  "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?",
-  "mute_modal.indefinite": "Foar ûnbepaalde tiid",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
@@ -446,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favoriten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
-  "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
   "notifications.column_settings.mention": "Fermeldingen:",
@@ -650,7 +638,6 @@
   "status.direct": "Privee fermelde @{name}",
   "status.direct_indicator": "Priveefermelding",
   "status.edit": "Bewurkje",
-  "status.edited": "Bewurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
   "status.embed": "Ynslute",
   "status.favourite": "Favoryt",

app/javascript/mastodon/locales/ga.json

@@ -133,9 +133,7 @@
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
   "confirmation_modal.cancel": "Cealaigh",
-  "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhac?",
   "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
   "confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
   "confirmations.delete.confirm": "Scrios",
@@ -144,13 +142,10 @@
   "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
   "confirmations.discard_edit_media.confirm": "Faigh réidh de",
   "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
-  "confirmations.domain_block.confirm": "Bac fearann go hiomlán",
   "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
   "confirmations.mute.confirm": "Balbhaigh",
-  "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.",
-  "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
@@ -249,7 +244,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Lean haischlib",
   "hashtag.unfollow": "Ná lean haischlib",
-  "home.column_settings.basic": "Bunúsach",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
   "home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -312,9 +306,6 @@
   "lists.replies_policy.title": "Taispeáin freagraí:",
   "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
   "lists.subheading": "Do liostaí",
-  "mute_modal.duration": "Tréimhse",
-  "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
-  "mute_modal.indefinite": "Gan téarma",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
@@ -349,9 +340,6 @@
   "notifications.clear": "Glan fógraí",
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
-  "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
-  "notifications.column_settings.filter_bar.category": "Barra scagaire tapa",
-  "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
   "notifications.column_settings.follow": "Leantóirí nua:",
   "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
   "notifications.column_settings.mention": "Tráchtanna:",
@@ -462,7 +450,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Scrios",
   "status.edit": "Cuir in eagar",
-  "status.edited": "Curtha in eagar in {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
   "status.embed": "Leabaigh",
   "status.filter": "Déan scagadh ar an bpostáil seo",

app/javascript/mastodon/locales/gd.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
+  "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
+  "block_modal.show_less": "Seall nas lugha dheth",
+  "block_modal.show_more": "Seall barrachd dheth",
+  "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.",
+  "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.",
+  "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
+  "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
+  "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
   "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
   "confirmation_modal.cancel": "Sguir dheth",
-  "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "A bheil thu cinnteach gu bheil thu airson {name} a bhacadh?",
   "confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
   "confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
   "confirmations.delete.confirm": "Sguab às",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
   "confirmations.discard_edit_media.confirm": "Tilg air falbh",
   "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
-  "confirmations.domain_block.confirm": "Bac an àrainn uile gu lèir",
+  "confirmations.domain_block.confirm": "Bac am frithealaiche",
   "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
   "confirmations.edit.confirm": "Deasaich",
   "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.logout.confirm": "Clàraich a-mach",
   "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
   "confirmations.mute.confirm": "Mùch",
-  "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
-  "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.reply.confirm": "Freagair",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo a’ fàs thar an lìona shòisealta an-diugh. Gheibh postaichean nas ùire le barrachd brosnaichean is annsachdan rangachadh nas àirde.",
   "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte an-diugh. Gheibh tagaichean hais a tha ’gan cleachdadh le daoine eadar-dhealaichte rangachadh nas àirde.",
   "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.",
+  "domain_block_modal.block": "Bac am frithealaiche",
+  "domain_block_modal.block_account_instead": "Bac @{name} ’na àite",
+  "domain_block_modal.they_can_interact_with_old_posts": "’S urrainn do dhaoine a th’ air an fhrithealaiche seo eadar-ghabhail leis na seann-phostaichean agad.",
+  "domain_block_modal.they_cant_follow": "Chan urrainn do neach sam bith a th’ air an fhrithealaiche seo do leantainn.",
+  "domain_block_modal.they_wont_know": "Cha bhi fios aca gun deach am bacadh.",
+  "domain_block_modal.title": "A bheil thu airson an àrainn a bhacadh?",
+  "domain_block_modal.you_will_lose_followers": "Thèid a h-uile neach-leantainn agad a th’ air an fhrithealaiche seo a thoirt air falbh.",
+  "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
+  "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
+  "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
+  "domain_pill.server": "Frithealaiche",
+  "domain_pill.their_handle": "An t-aithnichear aca:",
+  "domain_pill.their_server": "An dachaigh dhigiteach far a bheil na postaichean uile aca a’ fuireach.",
+  "domain_pill.their_username": "Seo an t-aithnichear àraidh aca air an fhrithealaiche aca. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
+  "domain_pill.username": "Ainm-cleachdaiche",
+  "domain_pill.whats_in_a_handle": "Dè th’ ann an aithnichear?",
+  "domain_pill.who_they_are": "On a dh’innseas aithnichearan cò cuideigin agus càit a bheil iad, ’s urrainn dhut conaltradh le daoine thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.who_you_are": "On a dh’innseas d’ aithnichear cò thusa agus càit a bheil thu, ’s urrainn do dhaoine conaltradh leat thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.your_handle": "An t-aithnichear agad:",
+  "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
+  "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
   "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
   "embed.preview": "Seo an coltas a bhios air:",
   "emoji_button.activity": "Gnìomhachd",
@@ -241,6 +266,7 @@
   "empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
   "empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
   "empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
+  "empty_column.notification_requests": "Glan! Chan eil dad an-seo. Nuair a gheibh thu brathan ùra, nochdaidh iad an-seo a-rèir nan roghainnean agad.",
   "empty_column.notifications": "Cha d’ fhuair thu brath sam bith fhathast. Nuair a nì càch conaltradh leat, chì thu an-seo e.",
   "empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean càch o fhrithealaichean eile a làimh airson seo a lìonadh",
   "error.unexpected_crash.explanation": "Air sàilleibh buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair, chan urrainn dhuinn an duilleag seo a shealltainn mar bu chòir.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+  "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
   "firehose.remote": "Frithealaichean eile",
@@ -287,7 +315,7 @@
   "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
   "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
   "follow_suggestions.view_all": "Seall na h-uile",
-  "follow_suggestions.who_to_follow": "Cò a leanas tu",
+  "follow_suggestions.who_to_follow": "Molaidhean leantainn",
   "followed_tags": "Tagaichean hais ’gan leantainn",
   "footer.about": "Mu dhèidhinn",
   "footer.directory": "Eòlaire nam pròifil",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
-  "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
   "home.hide_announcements": "Falaich na brathan-fios",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
-  "mute_modal.duration": "Faide",
-  "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
-  "mute_modal.indefinite": "Gun chrìoch",
+  "mute_modal.hide_from_notifications": "Falaich o na brathan",
+  "mute_modal.hide_options": "Roghainnean falaich",
+  "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
+  "mute_modal.show_options": "Seall na roghainnean",
+  "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
+  "mute_modal.they_wont_know": "Cha bhi fios aca gun deach am mùchadh.",
+  "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
+  "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
+  "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -440,15 +473,16 @@
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
+  "notification_requests.accept": "Gabh ris",
+  "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.notifications_from": "Brathan o {name}",
+  "notification_requests.title": "Brathan criathraichte",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
   "notifications.column_settings.favourite": "Annsachdan:",
-  "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
-  "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
-  "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
   "notifications.column_settings.mention": "Iomraidhean:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
+  "notifications.policy.filter_new_accounts.hint": "Chaidh a chruthachadh o chionn {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
+  "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
+  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {count, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
+  "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
+  "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
+  "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
+  "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an seòladair",
+  "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
+  "notifications.policy.title": "Falamhaich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
@@ -650,10 +693,11 @@
   "status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "status.direct_indicator": "Iomradh prìobhaideach",
   "status.edit": "Deasaich",
-  "status.edited": "Air a dheasachadh {date}",
+  "status.edited": "An deasachadh mu dheireadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
+  "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}",
   "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
   "status.hide": "Falaich am post",
@@ -674,6 +718,7 @@
   "status.reblog": "Brosnaich",
   "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
   "status.reblogged_by": "’Ga bhrosnachadh le {name}",
+  "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}",
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",

app/javascript/mastodon/locales/gl.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
   "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitude",
   "confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
-  "confirmations.domain_block.confirm": "Agochar dominio enteiro",
   "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.mute.confirm": "Acalar",
-  "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
-  "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
   "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.reply.confirm": "Responder",
@@ -241,6 +236,7 @@
   "empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
+  "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificación aparecerán aquí seguindo o criterio dos teus axustes.",
   "empty_column.notifications": "Aínda non tes notificacións. Aparecerán cando outras persoas interactúen contigo.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
@@ -271,6 +267,8 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
@@ -314,7 +312,6 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
   "home.hide_announcements": "Agochar anuncios",
@@ -400,9 +397,6 @@
   "loading_indicator.label": "Estase a cargar…",
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Agochar notificacións desta persoa?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
@@ -440,15 +434,16 @@
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Desbotar",
+  "notification_requests.notifications_from": "Notificacións de {name}",
+  "notification_requests.title": "Notificacións filtradas",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
   "notifications.column_settings.favourite": "Favoritas:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
@@ -474,6 +469,15 @@
   "notifications.permission_denied": "Non se activaron as notificacións de escritorio porque se denegou o permiso",
   "notifications.permission_denied_alert": "Non se poden activar as notificacións de escritorio, xa que o permiso para o navegador foi denegado previamente",
   "notifications.permission_required": "As notificacións de escritorio non están dispoñibles porque non se concedeu o permiso necesario.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas desde {days, plural, one {onte} other {fai # días}}",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Inclúe a persoas que te seguen desde fai menos de {days, plural, one {1 día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Persoas que non te seguen",
+  "notifications.policy.filter_not_following_hint": "Ata que as autorices",
+  "notifications.policy.filter_not_following_title": "Persoas que ti non segues",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a non ser que sexa unha resposta á túa propia mención ou se ti segues á remitente",
+  "notifications.policy.filter_private_mentions_title": "Mencións privadas non solicitadas",
+  "notifications.policy.title": "Desbotar notificacións de…",
   "notifications_permission_banner.enable": "Activar notificacións de escritorio",
   "notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
   "notifications_permission_banner.title": "Non perder nada",
@@ -650,10 +654,11 @@
   "status.direct": "Mencionar de xeito privado a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustar",
   "status.favourite": "Favorecer",
+  "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Agochar publicación",
@@ -674,6 +679,7 @@
   "status.reblog": "Promover",
   "status.reblog_private": "Compartir coa audiencia orixinal",
   "status.reblogged_by": "{name} promoveu",
+  "status.reblogs": "{count, plural, one {promoción} other {promocións}}",
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",

app/javascript/mastodon/locales/he.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
+  "block_modal.remote_users_caveat": "אנו נבקש מהשרת {domain} לכבד את החלטתך. עם זאת, ציות למוסכמות איננו מובטח כיוון ששרתים מסויימים עשויים לטפל בחסימות בצורה אחרת. הודעות פומביות עדיין יהיו גלויות לעיני משתמשים שאינם מחוברים.",
+  "block_modal.show_less": "הצג פחות",
+  "block_modal.show_more": "הצג עוד",
+  "block_modal.they_cant_mention": "הם אינם יכולים לאזכר אותך או לעקוב אחריך.",
+  "block_modal.they_cant_see_posts": "הם לא יכולים לראות את הודעותיך ואתם לא תוכלו לראות את שלהם.",
+  "block_modal.they_will_know": "הם יכולים לראות שהם חסומים.",
+  "block_modal.title": "לחסום משתמש?",
+  "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
   "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
-  "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
-  "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?",
   "confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
   "confirmations.cancel_follow_request.message": "לבטל את בקשת המעקב אחרי {name}?",
   "confirmations.delete.confirm": "למחוק",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
   "confirmations.discard_edit_media.confirm": "השלך",
   "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
-  "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)",
+  "confirmations.domain_block.confirm": "חסימת שרת",
   "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
   "confirmations.edit.confirm": "עריכה",
   "confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
   "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
-  "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.",
-  "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
   "confirmations.reply.confirm": "תגובה",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "אלו הודעות משרת זה ואחרים ברשת המבוזרת שצוברות חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגות גבוה יותר.",
   "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.",
   "dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.",
+  "domain_block_modal.block": "חסימת שרת",
+  "domain_block_modal.block_account_instead": "לחסום את @{name} במקום שרת שלם",
+  "domain_block_modal.they_can_interact_with_old_posts": "משתמשים משרת זה יכולים להתייחס להודעותיך הישנות.",
+  "domain_block_modal.they_cant_follow": "משתמש משרת זה לא יכול לעקוב אחריך.",
+  "domain_block_modal.they_wont_know": "הם לא ידעו כי נחסמו.",
+  "domain_block_modal.title": "לחסום שרת?",
+  "domain_block_modal.you_will_lose_followers": "כל עוקביך משרת זה יוסרו.",
+  "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
+  "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
+  "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
+  "domain_pill.server": "שרת",
+  "domain_pill.their_handle": "הכינוי שלהם:",
+  "domain_pill.their_server": "הבית המקוון שלהם, היכן שהודעותיהם שוכנות.",
+  "domain_pill.their_username": "המזהה הייחודי של השרת שלהם. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
+  "domain_pill.username": "שם משתמש/ת",
+  "domain_pill.whats_in_a_handle": "מה כולל כינוי?",
+  "domain_pill.who_they_are": "מאחר וכינויים מספרים על מישהו ומה מיקומו, ניתן להיות בקשר עם אנשים לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.who_you_are": "מאחר והכינוי שלך מספר על מי את.ה ומה מקומך בעולם, משתמשים מכל העולם יוכלו להיות בקשר עמך לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.your_handle": "הכינוי שלך:",
+  "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
+  "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
   "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
@@ -241,6 +266,7 @@
   "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
   "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
   "empty_column.mutes": "עוד לא השתקת שום משתמש.",
+  "empty_column.notification_requests": "בום! אין פה כלום. כשיווצרו עוד התראות, הן יופיעו כאן על בסיס ההעדפות שלך.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
   "error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
   "firehose.remote": "שרתים אחרים",
@@ -314,7 +342,6 @@
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
-  "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
   "home.hide_announcements": "הסתר הכרזות",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "בטעינה…",
   "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
   "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
-  "mute_modal.duration": "משך הזמן",
-  "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?",
-  "mute_modal.indefinite": "ללא תאריך סיום",
+  "mute_modal.hide_from_notifications": "להסתיר מהתראות",
+  "mute_modal.hide_options": "הסתרת אפשרויות",
+  "mute_modal.indefinite": "עד שאסיר השתקה",
+  "mute_modal.show_options": "הצגת אפשרויות",
+  "mute_modal.they_can_mention_and_follow": "הם יכולם לאזכר אתכם ולעקוב אחריכם, אבל לא תראו אותם.",
+  "mute_modal.they_wont_know": "הם לא ידעו כי הושתקו.",
+  "mute_modal.title": "להשתיק משתמש?",
+  "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
+  "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
@@ -440,15 +473,16 @@
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
+  "notification_requests.accept": "לקבל",
+  "notification_requests.dismiss": "לבטל",
+  "notification_requests.notifications_from": "התראות מ־ {name}",
+  "notification_requests.title": "התראות מסוננות",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "חיבובים:",
-  "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
-  "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
-  "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
   "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
   "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
+  "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
+  "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
+  "notifications.policy.filter_not_followers_title": "משתמשים שלא עוקבות.ים אחריך",
+  "notifications.policy.filter_not_following_hint": "עד שיאושרו ידנית על ידיך",
+  "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
+  "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
+  "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+  "notifications.policy.title": "להסתיר התראות מ…",
   "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
@@ -650,10 +693,11 @@
   "status.direct": "הודעה פרטית אל @{name}",
   "status.direct_indicator": "הודעה פרטית",
   "status.edit": "עריכה",
-  "status.edited": "נערך ב{date}",
+  "status.edited": "נערך לאחרונה {date}",
   "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
+  "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
   "status.filtered": "סונן",
   "status.hide": "הסתרת חיצרוץ",
@@ -674,6 +718,7 @@
   "status.reblog": "הדהוד",
   "status.reblog_private": "להדהד ברמת הנראות המקורית",
   "status.reblogged_by": "{name} הידהד/ה:",
+  "status.reblogs": "{count, plural, one {הדהוד אחד} two {שני הדהודים} other {# הדהודים}}",
   "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
   "status.redraft": "מחיקה ועריכה מחדש",
   "status.remove_bookmark": "הסרת סימניה",

app/javascript/mastodon/locales/hi.json

@@ -21,6 +21,7 @@
   "account.blocked": "ब्लॉक",
   "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
+  "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
   "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
   "account.domain_blocked": "छिपा हुआ डोमेन",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
   "account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
   "account.follow": "फॉलो करें",
+  "account.follow_back": "फॉलो करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
   "account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "सूचनाओ को शांत करे",
   "account.mute_short": "शांत करे",
   "account.muted": "म्यूट है",
+  "account.mutual": "आपसी",
   "account.no_bio": "कोई विवरण नहि दिया गया हे",
   "account.open_original_page": "ओरिजिनल पोस्ट खोलें",
   "account.posts": "टूट्स",
@@ -75,6 +78,8 @@
   "admin.dashboard.retention.average": "औसत",
   "admin.dashboard.retention.cohort": "साईन-अप महिना",
   "admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
+  "admin.impact_report.instance_accounts": "ये अकाउंट प्रोफाइल मिटा देगा",
+  "admin.impact_report.instance_followers": "हमारे यूजर्स इन फॉलोअर्स को खो देंगे",
   "admin.impact_report.title": "प्रभावकां सारांश",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
@@ -83,6 +88,13 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
+  "block_modal.show_less": "कम दिखाएं",
+  "block_modal.show_more": "और दिखाएँ",
+  "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते",
+  "block_modal.they_cant_see_posts": "वो आपके पोस्ट नहीं देख सकते और न आप उनके",
+  "block_modal.they_will_know": "वे नहीं देख सकते कि उन्हें ब्लॉक किया गया है",
+  "block_modal.title": "यूजर को ब्लॉक करें?",
+  "block_modal.you_wont_see_mentions": "वो पोस्ट आप नहीं देख सकते जिनमें उन्हें मेंशन किया गया है",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -130,7 +142,9 @@
   "community.column_settings.remote_only": "केवल सुदूर",
   "compose.language.change": "भाषा बदलें",
   "compose.language.search": "भाषाएँ खोजें...",
+  "compose.published.body": "पोस्ट प्रकाशित हुआ।",
   "compose.published.open": "खोलें",
+  "compose.saved.body": "पोस्ट सुरक्षित किया गया।",
   "compose_form.direct_message_warning_learn_more": "और जानें",
   "compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
   "compose_form.hashtag_warning": "ये पोस्ट किसी भी हैशटैग में लिस्ट नहीं किया जाएगा क्योंकि ये पब्लिक नहीं है। सिर्फ पब्लिक पोस्ट ही हैशटैग से खोजे जा सकते हैं।",
@@ -138,15 +152,21 @@
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.duration": "चुनाव की अवधि",
+  "compose_form.poll.multiple": "बहुविकल्पी",
+  "compose_form.poll.option_placeholder": "विकल्प {number}",
+  "compose_form.poll.single": "कोई एक चुनें",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
+  "compose_form.poll.type": "स्टाइल",
+  "compose_form.publish": "पोस्ट करें",
   "compose_form.publish_form": "पब्लिश",
+  "compose_form.reply": "जवाब दें",
+  "compose_form.save_changes": "अपडेट करें",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
+  "compose_form.spoiler_placeholder": "सामग्री चेतावनी (वैकल्पिक)",
   "confirmation_modal.cancel": "रद्द करें",
-  "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
-  "confirmations.block.message": "क्या आप वाकई {name} को ब्लॉक करना चाहते हैं?",
   "confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
   "confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
   "confirmations.delete.confirm": "मिटाए",
@@ -155,15 +175,13 @@
   "confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
   "confirmations.discard_edit_media.confirm": "डिस्कार्ड",
   "confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन छिपाएं",
+  "confirmations.domain_block.confirm": "सर्वर ब्लॉक करें",
   "confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
   "confirmations.edit.confirm": "संशोधित करें",
   "confirmations.edit.message": "अभी संपादन किया तो वो संदेश मिट जायेगा जिसे आप लिख रहे थे। क्या आप जारी रखना चाहते हैं?",
   "confirmations.logout.confirm": "लॉग आउट करें",
   "confirmations.logout.message": "आप सुनिश्चित हैं कि लॉगआउट करना चाहते हैं?",
   "confirmations.mute.confirm": "शांत",
-  "confirmations.mute.explanation": "यह उनसे और पोस्टों का उल्लेख करते हुए उनसे छिपाएगा, लेकिन यह अभी भी उन्हें आपकी पोस्ट देखने और आपको फॉलो करने की अनुमति देगा।",
-  "confirmations.mute.message": "क्या आप वाकई {name} को शांत करना चाहते हैं?",
   "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
   "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
   "confirmations.reply.confirm": "उत्तर दें",
@@ -174,6 +192,7 @@
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
   "conversation.with": "{names} के साथ",
+  "copy_icon_button.copied": "क्लिपबोर्ड पर कॉपी किया गया",
   "copypaste.copied": "कॉपी किआ जा चूका है",
   "copypaste.copy_to_clipboard": "क्लिपबोर्ड पर कॉपी करें",
   "directory.federated": "ज्ञात फेडीवर्स से",
@@ -277,7 +296,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हैशटैग को फॉलो करें",
   "hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
-  "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
   "home.hide_announcements": "घोषणाएँ छिपाएँ",
@@ -346,9 +364,6 @@
   "lists.replies_policy.none": "कोई नहीं",
   "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.subheading": "आपकी सूचियाँ",
-  "mute_modal.duration": "अवधि",
-  "mute_modal.hide_notifications": "इस सभ्य की ओरसे आनेवाली सूचनाए शांत करे",
-  "mute_modal.indefinite": "अनिश्चितकालीन",
   "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
@@ -376,8 +391,6 @@
   "notifications.clear": "सूचनाएं हटाए",
   "notifications.column_settings.admin.report": "नई रिपोर्ट:",
   "notifications.column_settings.favourite": "पसंदीदा:",
-  "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
-  "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
   "notifications.column_settings.follow": "नए फ़ॉलोअर्स",
   "notifications.column_settings.mention": "उल्लेख:",
   "notifications.column_settings.poll": "चुनाव परिणाम",
@@ -483,6 +496,7 @@
   "status.delete": "हटाएं",
   "status.detailed_status": "विस्तृत वार्ता दृश्य",
   "status.direct": "निजी संदेश @{name} से",
+  "status.edited": "पिछला संशोधन {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.media.open": "खोलने के लिए क्लिक करें",
   "status.media.show": "दिखाने के लिए क्लिक करें",

app/javascript/mastodon/locales/hr.json

@@ -146,9 +146,7 @@
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
   "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Sigurno želite blokirati {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtjev",
   "confirmations.delete.confirm": "Obriši",
   "confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
@@ -156,14 +154,11 @@
   "confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaciti",
   "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
-  "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
   "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišaj",
-  "confirmations.mute.explanation": "Ovo će sakriti njihove objave i objave koje ih spominju, ali i dalje će im dopuštati da vide Vaše objave i da Vas prate.",
-  "confirmations.mute.message": "Jeste li sigurni da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši i ponovno uredi",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovaranje sada će prepisati poruku koju upravo pišete. Jeste li sigurni da želite nastaviti?",
@@ -261,7 +256,6 @@
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
   "hashtag.follow": "Prati hashtag",
   "hashtag.unfollow": "Prestani pratiti hashtag",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Sakrij najave",
@@ -324,8 +318,6 @@
   "lists.search": "Traži među praćenim ljudima",
   "lists.subheading": "Vaše liste",
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
   "navigation_bar.about": "O aplikaciji",
   "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
@@ -358,8 +350,6 @@
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
   "notifications.column_settings.alert": "Obavijesti radne površine",
-  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
-  "notifications.column_settings.filter_bar.category": "Brza traka filtera",
   "notifications.column_settings.follow": "Novi pratitelji:",
   "notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
   "notifications.column_settings.mention": "Spominjanja:",
@@ -478,7 +468,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Obriši",
   "status.edit": "Uredi",
-  "status.edited": "Uređeno {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",

app/javascript/mastodon/locales/hu.json

@@ -16,7 +16,7 @@
   "account.badges.bot": "Automatizált",
   "account.badges.group": "Csoport",
   "account.block": "@{name} letiltása",
-  "account.block_domain": "Domain blokkolása: {domain}",
+  "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
   "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
@@ -89,6 +89,14 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
+  "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
+  "block_modal.show_less": "Kevesebb mutatása",
+  "block_modal.show_more": "Több mutatása",
+  "block_modal.they_cant_mention": "Nem említhetnek meg vagy követhetnek téged.",
+  "block_modal.they_cant_see_posts": "Nem láthatják a bejegyzéseidet, és te sem fogod látni az övékét.",
+  "block_modal.they_will_know": "Láthatják, hogy le vannak tiltva.",
+  "block_modal.title": "Letiltsuk a felhasználót?",
+  "block_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -113,7 +121,7 @@
   "column.community": "Helyi idővonal",
   "column.direct": "Személyes említések",
   "column.directory": "Profilok böngészése",
-  "column.domain_blocks": "Letiltott tartománynevek",
+  "column.domain_blocks": "Letiltott domainek",
   "column.favourites": "Kedvencek",
   "column.firehose": "Hírfolyamok",
   "column.follow_requests": "Követési kérelmek",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
   "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
-  "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
-  "confirmations.block.message": "Biztos, hogy letiltod: {name}?",
   "confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
   "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
   "confirmations.delete.confirm": "Törlés",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
   "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
-  "confirmations.domain_block.confirm": "Teljes tartomány tiltása",
+  "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
   "confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
   "confirmations.mute.confirm": "Némítás",
-  "confirmations.mute.explanation": "Ez elrejti a tőlük érkező bejegyzéseket, valamint az őket megemlítőket, de ők továbbra is láthatják a te bejegyzéseid, és követhetnek is téged.",
-  "confirmations.mute.message": "Biztos, hogy némítod: {name}?",
   "confirmations.redraft.confirm": "Törlés és újraírás",
   "confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
   "confirmations.reply.confirm": "Válasz",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ezek jelenleg népszerűvé váló bejegyzések a háló különböző szegleteiből. Az újabb vagy több megtolással rendelkező bejegyzéseket, illetve a kedvencnek jelöléssel rendelkezőeket rangsoroljuk előrébb.",
   "dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret a közösségi weben. Azokat a hashtageket, amelyeket több különböző ember használ, magasabbra rangsorolják.",
   "dismissable_banner.public_timeline": "Ezek a legfrissebb nyilvános bejegyzések a közösségi weben, amelyeket {domain} domain felhasználói követnek.",
+  "domain_block_modal.block": "Kiszolgáló letiltása",
+  "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
+  "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
+  "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
+  "domain_block_modal.they_wont_know": "Nem fogják tudni, hogy letiltották őket.",
+  "domain_block_modal.title": "Letiltsuk a domaint?",
+  "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
+  "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
+  "domain_pill.activitypub_lets_connect": "Lehetővé teszi, hogy kapcsolatba lépj nem csak a Mastodonon, hanem a más közösségi alkalmazásokon lévő emberekkel is.",
+  "domain_pill.activitypub_like_language": "Az ActivityPub olyan mint egy nyelv, amelyet a Mastodon a más közösségi hálózatokkal való kommunikációra használ.",
+  "domain_pill.server": "Kiszolgáló",
+  "domain_pill.their_handle": "A fiókneve:",
+  "domain_pill.their_server": "A digitális otthona, ahol a bejegyzései találhatók.",
+  "domain_pill.their_username": "Az egyedi azonosítója a kiszolgálóján. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
+  "domain_pill.username": "Felhasználónév",
+  "domain_pill.whats_in_a_handle": "Mi is egy fióknév?",
+  "domain_pill.who_they_are": "Mivel a fióknevek mondják meg, hogy valaki kicsoda és hol található, így ezek használatával léphetsz kapcsolatba az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberekkel.",
+  "domain_pill.who_you_are": "Mivel a fiókneved mondja meg, hogy ki vagy és hol, így ezek használatával léphetnek kapcsolatba veled az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberek.",
+  "domain_pill.your_handle": "Saját fióknév:",
+  "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
+  "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
   "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
   "embed.preview": "Így fog kinézni:",
   "emoji_button.activity": "Tevékenység",
@@ -230,7 +255,7 @@
   "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.",
-  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen tartomány sem.",
+  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen domain sem.",
   "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
   "empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.",
@@ -241,6 +266,7 @@
   "empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.",
   "empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.",
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+  "empty_column.notification_requests": "Minden tiszta! Itt nincs semmi. Ha új értesítéseket kapsz, azok itt jelennek meg a beállításoknak megfelelően.",
   "empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
   "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
   "error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
+  "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
   "firehose.remote": "Egyéb kiszolgálók",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
-  "home.column_settings.basic": "Általános",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Betöltés…",
   "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
   "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
-  "mute_modal.duration": "Időtartam",
-  "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
-  "mute_modal.indefinite": "Határozatlan",
+  "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
+  "mute_modal.hide_options": "Beállítások elrejtése",
+  "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
+  "mute_modal.show_options": "Beállítások megjelenítése",
+  "mute_modal.they_can_mention_and_follow": "Megemlíthetnek vagy követhetnek téged, de nem fogod őket látni.",
+  "mute_modal.they_wont_know": "Nem fogják tudni, hogy lenémították őket.",
+  "mute_modal.title": "Elnémítsuk a felhasználót?",
+  "mute_modal.you_wont_see_mentions": "Nem látsz majd őket említő bejegyzéseket.",
+  "mute_modal.you_wont_see_posts": "Továbbra is látni fogják a bejegyzéseidet, de te nem fogod látni az övékét.",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -411,7 +444,7 @@
   "navigation_bar.compose": "Új bejegyzés írása",
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
-  "navigation_bar.domain_blocks": "Letiltott tartományok",
+  "navigation_bar.domain_blocks": "Letiltott domainek",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
+  "notification_requests.accept": "Elfogadás",
+  "notification_requests.dismiss": "Elvetés",
+  "notification_requests.notifications_from": "{name} értesítései",
+  "notification_requests.title": "Szűrt értesítések",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
-  "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
-  "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
-  "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése",
   "notifications.column_settings.follow": "Új követők:",
   "notifications.column_settings.follow_request": "Új követési kérelmek:",
   "notifications.column_settings.mention": "Megemlítések:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
   "notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
   "notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+  "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
+  "notifications.policy.filter_new_accounts_title": "Új fiókok",
+  "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
+  "notifications.policy.filter_not_followers_title": "Olyan emberek, akik nem követnek",
+  "notifications.policy.filter_not_following_hint": "Amíg kézileg jóvá nem hagyod őket",
+  "notifications.policy.filter_not_following_title": "Nem követett emberek",
+  "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
+  "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
+  "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
   "notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
   "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
   "notifications_permission_banner.title": "Soha ne mulassz el semmit",
@@ -650,10 +693,11 @@
   "status.direct": "@{name} személyes említése",
   "status.direct_indicator": "Személyes említés",
   "status.edit": "Szerkesztés",
-  "status.edited": "Szerkesztve: {date}",
+  "status.edited": "Utoljára szerkesztve {date}",
   "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
   "status.embed": "Beágyazás",
   "status.favourite": "Kedvenc",
+  "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
   "status.filtered": "Megszűrt",
   "status.hide": "Bejegyzés elrejtése",
@@ -674,6 +718,7 @@
   "status.reblog": "Megtolás",
   "status.reblog_private": "Megtolás az eredeti közönségnek",
   "status.reblogged_by": "{name} megtolta",
+  "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",

app/javascript/mastodon/locales/hy.json

@@ -123,23 +123,18 @@
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
   "confirmation_modal.cancel": "Չեղարկել",
-  "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
-  "confirmations.block.message": "Վստա՞հ ես, որ ուզում ես արգելափակել {name}֊ին։",
   "confirmations.cancel_follow_request.confirm": "Կասեցնել հայցը",
   "confirmations.delete.confirm": "Ջնջել",
   "confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
   "confirmations.delete_list.confirm": "Ջնջել",
   "confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
   "confirmations.discard_edit_media.confirm": "Չեղարկել",
-  "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը",
   "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
   "confirmations.edit.confirm": "Խմբագրել",
   "confirmations.logout.confirm": "Ելք",
   "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
   "confirmations.mute.confirm": "Լռեցնել",
-  "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
-  "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.reply.confirm": "Պատասխանել",
   "confirmations.reply.message": "Այս պահին պատասխանելը կը չեղարկի ձեր՝ այս պահին անաւարտ հաղորդագրութիւնը։ Համոզուա՞ծ էք։",
@@ -235,7 +230,6 @@
   "hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
   "hashtag.follow": "Հետեւել պիտակին",
   "hashtag.unfollow": "Չհետեւել պիտակին",
-  "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
   "home.hide_announcements": "Թաքցնել յայտարարութիւնները",
@@ -303,9 +297,6 @@
   "lists.subheading": "Քո ցանկերը",
   "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
-  "mute_modal.duration": "Տեւողութիւն",
-  "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
-  "mute_modal.indefinite": "Անժամկէտ",
   "navigation_bar.about": "Մասին",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
@@ -345,9 +336,6 @@
   "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
   "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
   "notifications.column_settings.favourite": "Հաւանածներ՝",
-  "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
-  "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
-  "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
   "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
@@ -471,7 +459,6 @@
   "status.direct": "Մասնաւոր յիշատակում @{name}",
   "status.direct_indicator": "Մասնաւոր յիշատակում",
   "status.edit": "Խմբագրել",
-  "status.edited": "Խմբագրուել է՝ {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",

app/javascript/mastodon/locales/ia.json

@@ -123,21 +123,17 @@
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
   "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
   "confirmation_modal.cancel": "Cancellar",
-  "confirmations.block.block_and_report": "Blocar e signalar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Es tu secur que tu vole blocar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar requesta",
   "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta a sequer a {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
-  "confirmations.domain_block.confirm": "Blocar le dominio complete",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Clauder le session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Non plus sequer",
   "confirmations.unfollow.message": "Es tu secur que tu vole non plus sequer {name}?",
@@ -155,6 +151,7 @@
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
+  "domain_pill.username": "Nomine de usator",
   "embed.preview": "Hic es como il parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
@@ -269,8 +266,6 @@
   "lists.subheading": "Tu listas",
   "loading_indicator.label": "Cargante…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
   "navigation_bar.about": "A proposito de",
   "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
@@ -297,7 +292,6 @@
   "notifications.clear": "Rader notificationes",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.follow": "Nove sequitores:",
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del inquesta:",
@@ -367,7 +361,6 @@
   "status.direct": "Mentionar privatemente a @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
-  "status.edited": "Modificate le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} tempore} other {{count} tempores}}",
   "status.favourite": "Adder al favoritos",
   "status.filter": "Filtrar iste message",

app/javascript/mastodon/locales/id.json

@@ -140,9 +140,7 @@
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
-  "confirmations.block.message": "Apa Anda yakin ingin memblokir {name}?",
   "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
   "confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
   "confirmations.delete.confirm": "Hapus",
@@ -151,14 +149,11 @@
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
-  "confirmations.domain_block.confirm": "Sembunyikan keseluruhan domain",
   "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.edit.confirm": "Ubah",
   "confirmations.logout.confirm": "Keluar",
   "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.",
-  "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Hapus dan susun ulang",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
@@ -270,7 +265,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Ikuti tagar",
   "hashtag.unfollow": "Batalkan pengikutan tagar",
-  "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
@@ -341,9 +335,6 @@
   "load_pending": "{count, plural, other {# item baru}}",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
-  "mute_modal.duration": "Durasi",
-  "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
-  "mute_modal.indefinite": "Tak terbatas",
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
@@ -381,9 +372,6 @@
   "notifications.column_settings.admin.report": "Laporan baru:",
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Notifikasi desktop",
-  "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
-  "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
   "notifications.column_settings.follow": "Pengikut baru:",
   "notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
   "notifications.column_settings.mention": "Balasan:",
@@ -527,7 +515,6 @@
   "status.delete": "Hapus",
   "status.detailed_status": "Tampilan detail percakapan",
   "status.edit": "Edit",
-  "status.edited": "Diedit {date}",
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",

app/javascript/mastodon/locales/ie.json

@@ -89,6 +89,10 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
+  "block_modal.show_less": "Monstrar minu",
+  "block_modal.show_more": "Monstrar plu",
+  "block_modal.title": "Bloccar usator?",
+  "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -160,9 +164,7 @@
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
   "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
-  "confirmations.block.message": "Esque tu vermen vole bloccar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retraer petition",
   "confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
   "confirmations.delete.confirm": "Deleter",
@@ -171,15 +173,13 @@
   "confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
   "confirmations.discard_edit_media.confirm": "Forjettar",
   "confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
-  "confirmations.domain_block.confirm": "Bloccar li tot dominia",
+  "confirmations.domain_block.confirm": "Bloccar servitor",
   "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
   "confirmations.edit.confirm": "Redacter",
   "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.logout.confirm": "Exear",
   "confirmations.logout.message": "Esque tu vermen vole exear?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
-  "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
   "confirmations.redraft.confirm": "Deleter & redacter",
   "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.reply.confirm": "Responder",
@@ -205,6 +205,7 @@
   "dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
   "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
   "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
+  "domain_block_modal.block": "Bloccar servitor",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -314,7 +315,6 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Dessequer hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in plu}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Monstrar boosts",
   "home.column_settings.show_replies": "Monstrar responses",
   "home.hide_announcements": "Celar proclamationes",
@@ -400,9 +400,6 @@
   "loading_indicator.label": "Cargant…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
   "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
-  "mute_modal.indefinite": "Índefinit",
   "navigation_bar.about": "Information",
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
@@ -446,9 +443,6 @@
   "notifications.column_settings.admin.sign_up": "Nov registrationes:",
   "notifications.column_settings.alert": "Notificationes sur li computator",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
-  "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
-  "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
@@ -650,7 +644,6 @@
   "status.direct": "Privatmen mentionar @{name}",
   "status.direct_indicator": "Privat mention",
   "status.edit": "Modificar",
-  "status.edited": "Modificat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",

app/javascript/mastodon/locales/ig.json

@@ -37,7 +37,6 @@
   "confirmations.delete.confirm": "Hichapụ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Hichapụ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.edit.confirm": "Dezie",
   "confirmations.mute.confirm": "Mee ogbi",
   "confirmations.reply.confirm": "Zaa",

app/javascript/mastodon/locales/io.json

@@ -149,9 +149,7 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Anulez",
-  "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
-  "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
   "confirmations.cancel_follow_request.confirm": "Desendez demando",
   "confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
   "confirmations.delete.confirm": "Efacez",
@@ -160,15 +158,12 @@
   "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
   "confirmations.discard_edit_media.confirm": "Efacez",
   "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.edit.confirm": "Modifikez",
   "confirmations.edit.message": "Modifikar nun remplasos la mesajo quon vu nune skribas. Ka vu certe volas procedar?",
   "confirmations.logout.confirm": "Ekirez",
   "confirmations.logout.message": "Ka tu certe volas ekirar?",
   "confirmations.mute.confirm": "Silencigez",
-  "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
-  "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
   "confirmations.redraft.confirm": "Efacez e riskisez",
   "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.reply.confirm": "Respondez",
@@ -292,7 +287,6 @@
   "hashtag.follow": "Sequez hashtago",
   "hashtag.unfollow": "Desequez hashtago",
   "hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
-  "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
   "home.hide_announcements": "Celez anunci",
@@ -378,9 +372,6 @@
   "loading_indicator.label": "Kargante…",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
-  "mute_modal.duration": "Durado",
-  "mute_modal.hide_notifications": "Celez avizi de ca uzanto?",
-  "mute_modal.indefinite": "Nedefinitiva",
   "navigation_bar.about": "Pri co",
   "navigation_bar.advanced_interface": "Apertez per retintervizajo",
   "navigation_bar.blocks": "Blokusita uzeri",
@@ -424,9 +415,6 @@
   "notifications.column_settings.admin.sign_up": "Nova registranti:",
   "notifications.column_settings.alert": "Desktopavizi",
   "notifications.column_settings.favourite": "Favoriziti:",
-  "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
-  "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
-  "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
   "notifications.column_settings.follow": "Nova sequanti:",
   "notifications.column_settings.follow_request": "Nova sequodemandi:",
   "notifications.column_settings.mention": "Mencioni:",
@@ -614,7 +602,6 @@
   "status.direct": "Private mencionez @{name}",
   "status.direct_indicator": "Privata menciono",
   "status.edit": "Modifikez",
-  "status.edited": "Modifikesis ye {date}",
   "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
   "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",

app/javascript/mastodon/locales/is.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
+  "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
+  "block_modal.show_less": "Sýna minna",
+  "block_modal.show_more": "Sýna meira",
+  "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.",
+  "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.",
+  "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.",
+  "block_modal.title": "Útiloka notanda?",
+  "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
   "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
-  "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
-  "confirmations.block.message": "Ertu viss um að þú viljir loka á {name}?",
   "confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
   "confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
   "confirmations.delete.confirm": "Eyða",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
   "confirmations.discard_edit_media.confirm": "Henda",
   "confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
-  "confirmations.domain_block.confirm": "Útiloka allt lénið",
+  "confirmations.domain_block.confirm": "Útiloka netþjón",
   "confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
   "confirmations.edit.confirm": "Breyta",
   "confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.mute.confirm": "Þagga",
-  "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
-  "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
   "confirmations.redraft.confirm": "Eyða og endurvinna drög",
   "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
   "confirmations.reply.confirm": "Svara",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Þessar færslur frá þessum og öðrum netþjónum á dreifhýsta netkerfinu eru að fá aukna athygli í þessu töluðum orðum.",
   "dismissable_banner.explore_tags": "Þetta eru myllumerki sem í augnablikinu eru að fá aukna athygli hjá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
   "dismissable_banner.public_timeline": "Þetta eru nýjustu opinberu færslurnar frá fólki á samfélagsnetinu sem fólk á {domain} fylgjast með.",
+  "domain_block_modal.block": "Útiloka netþjón",
+  "domain_block_modal.block_account_instead": "Útiloka {name} í staðinn",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá þessum netþjóni getur sýslað með eldri færslur þínar.",
+  "domain_block_modal.they_cant_follow": "Enginn frá þessum netþjóni getur fylgst með þér.",
+  "domain_block_modal.they_wont_know": "Viðkomandi mun ekki vita að hann hafi verið útilokaður.",
+  "domain_block_modal.title": "Útiloka lén?",
+  "domain_block_modal.you_will_lose_followers": "Allir fylgjendur þínir af þessum netþjóni verða fjarlægðir.",
+  "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
+  "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
+  "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
+  "domain_pill.server": "Netþjónn",
+  "domain_pill.their_handle": "Kennislóðin þeirra:",
+  "domain_pill.their_server": "Stafrænt heimili viðkomandi, þar sem allar færslur hans eru hýstar.",
+  "domain_pill.their_username": "Sértækt auðkenni viðkomandi á netþjóni hans. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
+  "domain_pill.username": "Notandanafn",
+  "domain_pill.whats_in_a_handle": "Hvað er í kennislóð (handle)?",
+  "domain_pill.who_they_are": "Vegna þess að kennislóðir segja hver einhver sé og hvar hann sé að finna, getur þú átt í samskiptum við fólk í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.who_you_are": "Vegna þess að kennislóðin þín segir hver þú sért og hvar þig sé að finna, getur fólk átt í samskiptum við þig í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.your_handle": "Kennislóðin þín:",
+  "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
+  "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
   "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
   "embed.preview": "Svona mun þetta líta út:",
   "emoji_button.activity": "Virkni",
@@ -241,6 +266,7 @@
   "empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
   "empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
   "empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
+  "empty_column.notification_requests": "Allt hreint! Það er ekkert hér. Þegar þú færð nýjar tilkynningar, munu þær birtast hér í samræmi við stillingarnar þínar.",
   "empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
   "empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
   "error.unexpected_crash.explanation": "Vegna villu í kóðanum okkar eða samhæfnivandamála í vafra er ekki hægt að birta þessa síðu svo vel sé.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
   "firehose.remote": "öðrum netþjónum",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
-  "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
   "home.hide_announcements": "Fela auglýsingar",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Hleð inn…",
   "media_gallery.toggle_visible": "Víxla sýnileika",
   "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
-  "mute_modal.duration": "Lengd",
-  "mute_modal.hide_notifications": "Fela tilkynningar frá þessum notanda?",
-  "mute_modal.indefinite": "Óendanlegt",
+  "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
+  "mute_modal.hide_options": "Fela valkosti",
+  "mute_modal.indefinite": "Þar til ég hætti að þagga niður í viðkomandi",
+  "mute_modal.show_options": "Birta valkosti",
+  "mute_modal.they_can_mention_and_follow": "Viðkomandi geta minnst á þig og fylgst með þér, en þú munt ekki sjá þá.",
+  "mute_modal.they_wont_know": "Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.",
+  "mute_modal.title": "Þagga niður í notanda?",
+  "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
+  "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
+  "notification_requests.accept": "Samþykkja",
+  "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.notifications_from": "Tilkynningar frá {name}",
+  "notification_requests.title": "Síaðar tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
   "notifications.column_settings.favourite": "Eftirlæti:",
-  "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
-  "notifications.column_settings.filter_bar.category": "Skyndisíustika",
-  "notifications.column_settings.filter_bar.show_bar": "Birta síustikuna",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
   "notifications.column_settings.mention": "Tilvísanir:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
   "notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
   "notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+  "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
+  "notifications.policy.filter_new_accounts_title": "Nýir notendur",
+  "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
+  "notifications.policy.filter_not_followers_title": "Fólk sem fylgist ekki með þér",
+  "notifications.policy.filter_not_following_hint": "Þar til þú samþykkir viðkomandi handvirkt",
+  "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
+  "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
+  "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
+  "notifications.policy.title": "Sía út tilkynningar frá…",
   "notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
@@ -650,10 +693,11 @@
   "status.direct": "Einkaspjall við @{name}",
   "status.direct_indicator": "Einkaspjall",
   "status.edit": "Breyta",
-  "status.edited": "Breytt {date}",
+  "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
   "status.embed": "Ívefja",
   "status.favourite": "Eftirlæti",
+  "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
   "status.filtered": "Síað",
   "status.hide": "Fela færslu",
@@ -674,6 +718,7 @@
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
   "status.reblogged_by": "{name} endurbirti",
+  "status.reblogs": "{count, plural, one {endurbirting} other {endurbirtingar}}",
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",

app/javascript/mastodon/locales/it.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
   "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
-  "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
   "confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
   "confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
   "confirmations.delete.confirm": "Elimina",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
-  "confirmations.domain_block.confirm": "Blocca l'intero dominio",
   "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
-  "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.",
-  "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.reply.confirm": "Rispondi",
@@ -241,6 +236,7 @@
   "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
   "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
   "empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+  "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
   "empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
   "empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
   "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
@@ -271,6 +267,8 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
   "firehose.remote": "Altri server",
@@ -314,7 +312,6 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
-  "home.column_settings.basic": "Base",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
   "home.hide_announcements": "Nascondi annunci",
@@ -400,9 +397,6 @@
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?",
-  "mute_modal.indefinite": "Per sempre",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -440,15 +434,16 @@
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
+  "notification_requests.accept": "Accetta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notifiche da {name}",
+  "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
   "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
   "notifications.column_settings.favourite": "Preferiti:",
-  "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
-  "notifications.column_settings.filter_bar.category": "Barra rapida del filtro",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
@@ -474,6 +469,15 @@
   "notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
   "notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
   "notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+  "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
+  "notifications.policy.filter_new_accounts_title": "Nuovi account",
+  "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
+  "notifications.policy.filter_not_followers_title": "Persone che non ti seguono",
+  "notifications.policy.filter_not_following_hint": "Fino a quando non le approvi manualmente",
+  "notifications.policy.filter_not_following_title": "Persone che non segui",
+  "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
+  "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
+  "notifications.policy.title": "Filtra le notifiche da…",
   "notifications_permission_banner.enable": "Abilita le notifiche desktop",
   "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
@@ -650,10 +654,11 @@
   "status.direct": "Menziona privatamente @{name}",
   "status.direct_indicator": "Menzione privata",
   "status.edit": "Modifica",
-  "status.edited": "Modificato il {date}",
+  "status.edited": "Ultima modifica {date}",
   "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
   "status.embed": "Incorpora",
   "status.favourite": "Preferito",
+  "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
   "status.filtered": "Filtrato",
   "status.hide": "Nascondi il post",
@@ -674,6 +679,7 @@
   "status.reblog": "Reblog",
   "status.reblog_private": "Reblog con visibilità originale",
   "status.reblogged_by": "Rebloggato da {name}",
+  "status.reblogs": "{count, plural, one {boost} other {boost}}",
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",

app/javascript/mastodon/locales/ja.json

@@ -241,9 +241,7 @@
   "compose_form.spoiler.unmarked": "本文は隠されていません",
   "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
   "confirmation_modal.cancel": "キャンセル",
-  "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
-  "confirmations.block.message": "本当に{name}さんをブロックしますか？",
   "confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
   "confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
   "confirmations.delete.confirm": "削除",
@@ -258,15 +256,12 @@
   "confirmations.delete_antenna.message": "本当にこのアンテナを完全に削除しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
-  "confirmations.domain_block.confirm": "ドメイン全体をブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
   "confirmations.mute.confirm": "ミュート",
-  "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
-  "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
   "confirmations.reply.confirm": "返信",
@@ -334,6 +329,7 @@
   "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しい投稿をするとここに表示されます。",
   "empty_column.lists": "まだリストがありません。リストを作るとここに表示されます。",
   "empty_column.mutes": "まだ誰もミュートしていません。",
+  "empty_column.notification_requests": "ここに表示するものはありません。新しい通知を受け取ったとき、フィルタリング設定で通知がブロックされたアカウントがある場合はここに表示されます。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
   "empty_column.status_references": "まだ誰も参照していません。参照されるとここに表示されます。",
@@ -365,6 +361,8 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {アカウント} other {#アカウント}}からの通知がブロックされています",
+  "filtered_notifications_banner.title": "ブロック済みの通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
   "firehose.remote": "ほかのサーバー",
@@ -408,7 +406,6 @@
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "hashtags.and_other": "ほか{count, plural, other {#個}}",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
   "home.hide_announcements": "お知らせを隠す",
@@ -497,9 +494,6 @@
   "loading_indicator.label": "読み込み中…",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
-  "mute_modal.duration": "ミュートする期間",
-  "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
-  "mute_modal.indefinite": "無期限",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.antennas": "アンテナ",
@@ -547,6 +541,10 @@
   "notification.status_reference": "{name}さんがあなたの投稿を参照しました",
   "notification.update": "{name}さんが投稿を編集しました",
   "notification.warning": "あなたは警告を出され、「{action}」が実行されました。詳細はメールをご確認ください",
+  "notification_requests.accept": "受け入れる",
+  "notification_requests.dismiss": "無視",
+  "notification_requests.notifications_from": "{name}からの通知",
+  "notification_requests.title": "ブロック済みの通知",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.column_settings.admin.report": "新しい通報:",
@@ -554,9 +552,6 @@
   "notifications.column_settings.alert": "デスクトップ通知",
   "notifications.column_settings.emoji_reaction": "絵文字リアクション",
   "notifications.column_settings.favourite": "お気に入り:",
-  "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
-  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
-  "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
   "notifications.column_settings.mention": "返信:",
@@ -585,6 +580,15 @@
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
+  "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントからの通知がブロックされます",
+  "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
+  "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントはブロックされません",
+  "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
+  "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
+  "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
@@ -789,7 +793,6 @@
   "status.direct": "@{name}さんに非公開で投稿",
   "status.direct_indicator": "非公開の返信",
   "status.edit": "編集",
-  "status.edited": "{date}に編集",
   "status.edited_x_times": "{count}回編集",
   "status.embed": "埋め込み",
   "status.emoji_reaction": "絵文字リアクション",

app/javascript/mastodon/locales/ka.json

@@ -71,15 +71,12 @@
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
-  "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
   "confirmations.delete.confirm": "გაუქმება",
   "confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
   "confirmations.delete_list.confirm": "გაუქმება",
   "confirmations.delete_list.message": "დარწმუნებული ხართ, გსურთ სამუდამოდ გააუქმოთ ეს სია?",
-  "confirmations.domain_block.confirm": "მთელი დომენის დამალვა",
   "confirmations.domain_block.message": "ნაღდად, ნაღდად, დარწმუნებული ხართ, გსურთ დაბლოკოთ მთელი {domain}? უმეტეს შემთხვევაში რამდენიმე გამიზნული ბლოკი ან გაჩუმება საკმარისი და უკეთესია. კონტენტს ამ დომენიდან ვერ იხილავთ ვერც ერთ ღია თაიმლაინზე ან თქვენს შეტყობინებებში. ამ დომენიდან არსებული მიმდევრები ამოიშლება.",
   "confirmations.mute.confirm": "გაჩუმება",
-  "confirmations.mute.message": "დარწმუნებული ხართ, გსურთ გააჩუმოთ {name}?",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
   "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
@@ -114,7 +111,6 @@
   "follow_request.reject": "უარყოფა",
   "getting_started.heading": "დაწყება",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
   "keyboard_shortcuts.back": "უკან გადასასვლელად",
@@ -161,7 +157,6 @@
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
-  "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",

app/javascript/mastodon/locales/kab.json

@@ -48,7 +48,7 @@
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
-  "account.requested_follow": "{name} yessuter ad k-yeḍfer",
+  "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -67,6 +67,11 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
+  "block_modal.show_less": "Ssken-d drus",
+  "block_modal.show_more": "Ssken-d ugar",
+  "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
+  "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+  "block_modal.title": "Sewḥel aseqdac ?",
   "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -129,22 +134,18 @@
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
   "confirmation_modal.cancel": "Sefsex",
-  "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
-  "confirmations.block.message": "Tebɣiḍ s tidet ad tesḥebseḍ {name}?",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
-  "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
+  "confirmations.domain_block.confirm": "Sewḥel aqeddac",
   "confirmations.edit.confirm": "Ẓreg",
   "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
-  "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
-  "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?",
   "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
   "confirmations.reply.confirm": "Err",
   "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
@@ -166,6 +167,12 @@
   "dismissable_banner.explore_links": "D tiqsiḍin n yisallen i yettwabḍan ass-a deg web inmetti. Tiqsiḍin n yisallen timaynutin i d-yettwassufɣen s wugar n medden yemgaraden, d tid i d-yufraren ugar.",
   "dismissable_banner.explore_statuses": "Ti d tisufaɣ seg uzeṭṭa anmetti i d-yettawin tamyigawt ass-a. Tisufaɣ timaynutin yesεan aṭas n lǧehd d tid iḥemmlen s waṭas, ttwaεlayit d timezwura.",
   "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
+  "domain_block_modal.block": "Sewḥel aqeddac",
+  "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
+  "domain_pill.server": "Aqeddac",
+  "domain_pill.username": "Isem n useqdac",
+  "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
@@ -190,13 +197,13 @@
   "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
-  "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
+  "empty_column.follow_requests": "Ulac ɣur-k·m ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
-  "empty_column.lists": "Ulac ɣur-k kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
-  "empty_column.mutes": "Ulac ɣur-k imseqdacen i yettwasgugmen.",
-  "empty_column.notifications": "Ulac ɣur-k tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+  "empty_column.lists": "Ulac ɣur-k·m kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
+  "empty_column.notifications": "Ulac ɣur-k·m tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
@@ -209,14 +216,18 @@
   "explore.trending_tags": "Ihacṭagen",
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+  "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
+  "filter_modal.select_filter.expired": "yemmut",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+  "filter_modal.select_filter.title": "Sizdeg tassufeɣt-a",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
   "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+  "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
   "footer.about": "Ɣef",
@@ -242,11 +253,11 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
   "hashtag.follow": "Ḍfeṛ ahacṭag",
   "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
-  "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
+  "home.pending_critical_update.link": "Wali ileqman",
   "home.show_announcements": "Ssken-d ulɣuyen",
   "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
   "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
@@ -260,6 +271,7 @@
   "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
   "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
+  "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -272,6 +284,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+  "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
@@ -300,6 +313,7 @@
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
   "lightbox.next": "Ɣer zdat",
   "lightbox.previous": "Ɣer deffir",
+  "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
   "link_preview.author": "S-ɣur {name}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
@@ -317,11 +331,11 @@
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d …",
   "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
-  "mute_modal.duration": "Tanzagt",
-  "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
-  "mute_modal.indefinite": "Ur yettwasbadu ara",
+  "mute_modal.hide_options": "Ffer tinefrunin",
+  "mute_modal.show_options": "Sken-d tinefrunin",
+  "mute_modal.title": "Sgugem aseqdac?",
   "navigation_bar.about": "Ɣef",
-  "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
+  "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
@@ -345,18 +359,19 @@
   "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
-  "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
+  "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
   "notification.status": "{name} akken i d-yessufeɣ",
+  "notification_requests.accept": "Qbel",
+  "notification_requests.dismiss": "Agi",
+  "notification_requests.notifications_from": "Ilɣa sɣur {name}",
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
-  "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
-  "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
@@ -366,6 +381,7 @@
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
+  "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Imenyafen",
@@ -377,6 +393,14 @@
   "notifications.group": "{count} n tilɣa",
   "notifications.mark_as_read": "Creḍ meṛṛa iilɣa am wakken ttwaɣran",
   "notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
+  "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
+  "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
+  "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
+  "notifications.policy.filter_not_followers_title": "Wid akked tid ur k·m-id-yeṭṭafaren ara",
+  "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
+  "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
+  "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
+  "notifications.policy.title": "Sizdeg ilɣa sɣur …",
   "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.action.back": "Tuɣalin ɣer deffir",
@@ -385,8 +409,9 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Azul a #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "Ttwassnen deg Mastodon",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.note": "Tameddurt",
   "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
   "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
   "onboarding.profile.title": "Asbadu n umaɣnu",
@@ -400,7 +425,7 @@
   "onboarding.start.title": "Tseggmeḍ-tt !",
   "onboarding.steps.follow_people.body": "Aḍfer n medden yelhan, d tikti n Mastodon.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.body": "Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin {emoji}",
   "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
@@ -417,15 +442,16 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
-  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tuffeɣt",
-  "privacy.direct.short": "Imdanen ulmisen",
-  "privacy.private.long": "Ala wid i k-yeṭṭafaṛen",
+  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tsuffeɣt",
+  "privacy.direct.short": "Imdanen yettwafernen",
+  "privacy.private.long": "Ala wid i k·m-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
   "privacy.unlisted.long": "Kra kan n ilguritmen",
   "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
+  "recommended": "Yettuwelleh",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
@@ -490,9 +516,9 @@
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
   "status.edit": "Ẓreg",
-  "status.edited": "Tettwaẓreg deg {date}",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
+  "status.filter": "Sizdeg tassufeɣt-a",
   "status.filtered": "Yettwasizdeg",
   "status.hide": "Ffer tasuffeɣt",
   "status.load_more": "Sali ugar",
@@ -510,6 +536,7 @@
   "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tɛiwdeḍ tira",
   "status.remove_bookmark": "Kkes tacreḍt",
+  "status.replied_to": "Y·terra-yas i {name}",
   "status.reply": "Err",
   "status.replyAll": "Err i lxiḍ",
   "status.report": "Cetki ɣef @{name}",

app/javascript/mastodon/locales/kk.json

@@ -105,20 +105,15 @@
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
   "confirmation_modal.cancel": "Қайтып алу",
-  "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
-  "confirmations.block.message": "{name} атты қолданушыны бұғаттайтыныңызға сенімдісіз бе?",
   "confirmations.delete.confirm": "Өшіру",
   "confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
   "confirmations.delete_list.confirm": "Өшіру",
   "confirmations.delete_list.message": "Бұл тізімді жоясыз ба шынымен?",
-  "confirmations.domain_block.confirm": "Бұл доменді бұғатта",
   "confirmations.domain_block.message": "Бұл домендегі {domain} жазбаларды шынымен бұғаттайсыз ба? Кейде үнсіз қылып тастау да жеткілікті.",
   "confirmations.logout.confirm": "Шығу",
   "confirmations.logout.message": "Шығатыныңызға сенімдісіз бе?",
   "confirmations.mute.confirm": "Үнсіз қылу",
-  "confirmations.mute.explanation": "Олардың посттары же олар туралы меншндар сізге көрінбейді, бірақ олар сіздің посттарды көре алады және жазыла алады.",
-  "confirmations.mute.message": "{name} атты қолданушы үнсіз болсын ба?",
   "confirmations.redraft.confirm": "Өшіруді құптау",
   "confirmations.reply.confirm": "Жауап",
   "confirmations.reply.message": "Жауабыңыз жазып жатқан жазбаңыздың үстіне кетеді. Жалғастырамыз ба?",
@@ -181,7 +176,6 @@
   "hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
   "hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
   "hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
-  "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
   "home.hide_announcements": "Анонстарды жасыр",
@@ -235,7 +229,6 @@
   "lists.subheading": "Тізімдеріңіз",
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
   "media_gallery.toggle_visible": "Көрінуді қосу",
-  "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
@@ -263,8 +256,6 @@
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
   "notifications.column_settings.alert": "Үстел ескертпелері",
-  "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет",
-  "notifications.column_settings.filter_bar.category": "Жедел сүзгі",
   "notifications.column_settings.follow": "Жаңа оқырмандар:",
   "notifications.column_settings.follow_request": "Жазылуға жаңа сұранымдар:",
   "notifications.column_settings.mention": "Аталымдар:",

app/javascript/mastodon/locales/kn.json

@@ -31,7 +31,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",

app/javascript/mastodon/locales/ko.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
+  "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.",
+  "block_modal.show_less": "간략히 보기",
+  "block_modal.show_more": "더 보기",
+  "block_modal.they_cant_mention": "나를 멘션하거나 팔로우 할 수 없습니다.",
+  "block_modal.they_cant_see_posts": "내가 작성한 게시물을 볼 수 없고 나도 그가 작성한 게시물을 보지 않게 됩니다.",
+  "block_modal.they_will_know": "자신이 차단 당했다는 사실을 확인할 수 있습니다.",
+  "block_modal.title": "사용자를 차단할까요?",
+  "block_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않습니다.",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
   "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
   "confirmation_modal.cancel": "취소",
-  "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
-  "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
   "confirmations.cancel_follow_request.confirm": "요청 삭제",
   "confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
   "confirmations.delete.confirm": "삭제",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
   "confirmations.discard_edit_media.confirm": "저장 안함",
   "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
-  "confirmations.domain_block.confirm": "도메인 전체를 차단",
+  "confirmations.domain_block.confirm": "서버 차단",
   "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.edit.confirm": "수정",
   "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.mute.confirm": "뮤트",
-  "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
-  "confirmations.mute.message": "정말로 {name} 님을 뮤트하시겠습니까?",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.reply.confirm": "답글",
@@ -205,6 +209,22 @@
   "dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 게시물들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다.",
   "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
   "dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 공개 게시물들입니다.",
+  "domain_block_modal.block": "서버 차단",
+  "domain_block_modal.block_account_instead": "대신 @{name}를 차단",
+  "domain_block_modal.they_can_interact_with_old_posts": "이 서버에 있는 사람들이 내 예전 게시물에 상호작용할 수는 있습니다.",
+  "domain_block_modal.they_cant_follow": "이 서버의 누구도 나를 팔로우 할 수 없습니다.",
+  "domain_block_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "domain_block_modal.title": "도메인을 차단할까요?",
+  "domain_block_modal.you_will_lose_followers": "이 서버에 있는 팔로워들이 모두 제거될 것입니다.",
+  "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
+  "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
+  "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
+  "domain_pill.server": "서버",
+  "domain_pill.their_handle": "그의 핸들:",
+  "domain_pill.username": "사용자명",
+  "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+  "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 <button>액티비티펍</button>을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
+  "domain_pill.your_handle": "내 핸들:",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -241,6 +261,7 @@
   "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
+  "empty_column.notification_requests": "깔끔합니다! 여기엔 아무 것도 없습니다. 알림을 받게 되면 설정에 따라 여기에 나타나게 됩니다.",
   "empty_column.notifications": "아직 알림이 없습니다. 다른 사람들이 당신에게 반응했을 때, 여기에서 볼 수 있습니다.",
   "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
   "error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
@@ -271,10 +292,12 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
   "firehose.remote": "다른 서버",
-  "follow_request.authorize": "허가",
+  "follow_request.authorize": "승인",
   "follow_request.reject": "거부",
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
   "follow_suggestions.curated_suggestion": "스태프의 추천",
@@ -314,7 +337,6 @@
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
-  "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
@@ -400,9 +422,15 @@
   "loading_indicator.label": "불러오는 중...",
   "media_gallery.toggle_visible": "이미지 숨기기",
   "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
-  "mute_modal.duration": "기간",
-  "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
-  "mute_modal.indefinite": "무기한",
+  "mute_modal.hide_from_notifications": "알림에서 숨기기",
+  "mute_modal.hide_options": "옵션 숨기기",
+  "mute_modal.indefinite": "내가 뮤트를 해제하기 전까지",
+  "mute_modal.show_options": "옵션 표시",
+  "mute_modal.they_can_mention_and_follow": "나를 멘션하거나 팔로우 할 수 있습니다, 다만 나에게 안 보일 것입니다.",
+  "mute_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "mute_modal.title": "사용자를 뮤트할까요?",
+  "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
+  "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -440,15 +468,16 @@
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
+  "notification_requests.accept": "수락",
+  "notification_requests.dismiss": "지우기",
+  "notification_requests.notifications_from": "{name} 님으로부터의 알림",
+  "notification_requests.title": "걸러진 알림",
   "notifications.clear": "알림 비우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "좋아요:",
-  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시하기",
-  "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
-  "notifications.column_settings.filter_bar.show_bar": "필터 막대 보이기",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "멘션:",
@@ -474,6 +503,15 @@
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
+  "notifications.policy.filter_new_accounts_title": "새 계정",
+  "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
+  "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
+  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
+  "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+  "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
+  "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+  "notifications.policy.title": "알림을 거를 사람들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
@@ -650,10 +688,11 @@
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
-  "status.edited": "{date}에 수정함",
+  "status.edited": "%{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
+  "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
   "status.filtered": "필터로 걸러짐",
   "status.hide": "게시물 숨기기",
@@ -674,6 +713,7 @@
   "status.reblog": "부스트",
   "status.reblog_private": "원래의 수신자들에게 부스트",
   "status.reblogged_by": "{name} 님이 부스트했습니다",
+  "status.reblogs": "{count, plural, other {부스트}}",
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
   "status.remove_bookmark": "북마크 삭제",

app/javascript/mastodon/locales/ku.json

@@ -135,9 +135,7 @@
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
   "confirmation_modal.cancel": "Dev jê berde",
-  "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
-  "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
   "confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
   "confirmations.cancel_follow_request.message": "Tu dixwazî ​​daxwaza xwe ya şopandina {name} vekşînî?",
   "confirmations.delete.confirm": "Jê bibe",
@@ -146,14 +144,11 @@
   "confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
   "confirmations.discard_edit_media.confirm": "Biavêje",
   "confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
-  "confirmations.domain_block.confirm": "Tevahiya navperê asteng bike",
   "confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
   "confirmations.edit.confirm": "Serrast bike",
   "confirmations.logout.confirm": "Derkeve",
   "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
   "confirmations.mute.confirm": "Bêdeng bike",
-  "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
-  "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
   "confirmations.reply.confirm": "Bersivê bide",
   "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
@@ -258,7 +253,6 @@
   "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
   "hashtag.follow": "Hashtagê bişopîne",
   "hashtag.unfollow": "Hashtagê neşopîne",
-  "home.column_settings.basic": "Bingehîn",
   "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
   "home.column_settings.show_replies": "Bersivan nîşan bide",
   "home.hide_announcements": "Reklaman veşêre",
@@ -329,9 +323,6 @@
   "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
   "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
   "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
-  "mute_modal.duration": "Dem",
-  "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
-  "mute_modal.indefinite": "Nediyar",
   "navigation_bar.about": "Derbar",
   "navigation_bar.blocks": "Bikarhênerên astengkirî",
   "navigation_bar.bookmarks": "Şûnpel",
@@ -370,9 +361,6 @@
   "notifications.column_settings.admin.report": "Ragihandinên nû:",
   "notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
   "notifications.column_settings.alert": "Agahdariyên sermaseyê",
-  "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
-  "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
-  "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
   "notifications.column_settings.follow": "Şopînerên nû:",
   "notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
   "notifications.column_settings.mention": "Qalkirin:",
@@ -522,7 +510,6 @@
   "status.direct": "Bi taybetî qale @{name} bike",
   "status.direct_indicator": "Qalkirinê taybet",
   "status.edit": "Serrast bike",
-  "status.edited": "Di {date} de hate serrastkirin",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",

app/javascript/mastodon/locales/kw.json

@@ -86,20 +86,15 @@
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
   "confirmation_modal.cancel": "Hedhi",
-  "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
-  "confirmations.block.message": "Owgh hwi sur a vynnes lettya {name}?",
   "confirmations.delete.confirm": "Dilea",
   "confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
   "confirmations.delete_list.confirm": "Dilea",
   "confirmations.delete_list.message": "Owgh hwi sur a vynnes dilea'n rol ma yn fast?",
-  "confirmations.domain_block.confirm": "Lettya gorfarth dhien",
   "confirmations.domain_block.message": "Owgh hwi wir, wir sur a vynnes lettya'n {domain} dhien? Y'n brassa rann a gasow, boghes lettyansow medrys po tawheansow yw lowr ha gwell. Ny wrewgh hwi gweles dalgh a'n worfarth na yn py amserlin boblek pynag po yn agas gwarnyansow. Agas holyoryon an worfarth na a vydh diles.",
   "confirmations.logout.confirm": "Digelmi",
   "confirmations.logout.message": "Owgh hwi sur a vynnes digelmi?",
   "confirmations.mute.confirm": "Tawhe",
-  "confirmations.mute.explanation": "Hemm a wra kudha postow anedha ha postow orth aga meneges, mes hwath aga gasa dhe weles agas postow ha'gas holya.",
-  "confirmations.mute.message": "Owgh hwi sur a vynnes tawhe {name}?",
   "confirmations.redraft.confirm": "Dilea & daskynskrifa",
   "confirmations.reply.confirm": "Gorthebi",
   "confirmations.reply.message": "Gorthebi lemmyn a wra ughskrifa'n messach esowgh hwi orth y skrifa lemmyn. Owgh hwi sur a vynnes pesya?",
@@ -166,7 +161,6 @@
   "hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
   "hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
   "hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
-  "home.column_settings.basic": "Selyek",
   "home.column_settings.show_reblogs": "Diskwedhes kenerthow",
   "home.column_settings.show_replies": "Diskwedhes gorthebow",
   "home.hide_announcements": "Kudha deklaryansow",
@@ -226,9 +220,6 @@
   "lists.subheading": "Agas rolyow",
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
   "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
-  "mute_modal.duration": "Duryans",
-  "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
-  "mute_modal.indefinite": "Andhevri",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
@@ -257,8 +248,6 @@
   "notifications.clear": "Dilea gwarnyansow",
   "notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
   "notifications.column_settings.alert": "Gwarnyansow pennskrin",
-  "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
-  "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
   "notifications.column_settings.follow": "Holyoryon nowydh:",
   "notifications.column_settings.follow_request": "Govynnow holya nowydh:",
   "notifications.column_settings.mention": "Menegow:",

app/javascript/mastodon/locales/la.json

@@ -41,7 +41,6 @@
   "confirmations.delete.confirm": "Oblitterare",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Oblitterare",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.mute.confirm": "Confutare",
   "confirmations.reply.confirm": "Respondere",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -139,7 +138,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Oblitterare",
   "status.edit": "Recolere",
-  "status.edited": "Recultum {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Expand this status",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",

app/javascript/mastodon/locales/lad.json

@@ -89,6 +89,9 @@
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonde audio",
+  "block_modal.show_less": "Amostra manko",
+  "block_modal.show_more": "Amostra mas",
+  "block_modal.title": "Bloka utilizador?",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -160,9 +163,7 @@
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
   "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
   "confirmation_modal.cancel": "Anula",
-  "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
-  "confirmations.block.message": "Estas siguro ke keres blokar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Anula solisitud",
   "confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
   "confirmations.delete.confirm": "Efasa",
@@ -171,15 +172,13 @@
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
-  "confirmations.domain_block.confirm": "Bloka domeno entero",
+  "confirmations.domain_block.confirm": "Bloka sirvidor",
   "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
   "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
   "confirmations.mute.confirm": "Silensia",
-  "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
-  "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
   "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
   "confirmations.reply.confirm": "Arisponde",
@@ -205,6 +204,10 @@
   "dismissable_banner.explore_statuses": "Estas publikasyones de este sirvidor i otros de la red desentralizada estan agora popularas. Publikasyones mas muevas, kon mas repartajasiones i favoritadas por mas djente aparesen primero.",
   "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
+  "domain_block_modal.block": "Bloka sirvidor",
+  "domain_block_modal.title": "Bloka el domeno?",
+  "domain_pill.server": "Sirvidor",
+  "domain_pill.username": "Nombre de utilizador",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
   "embed.preview": "Paresera ansina:",
   "emoji_button.activity": "Aktivita",
@@ -271,6 +274,8 @@
   "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
   "filter_modal.select_filter.title": "Filtra esta publikasyon",
   "filter_modal.title.status": "Filtra una publikasyon",
+  "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
+  "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
   "firehose.remote": "Otros sirvidores",
@@ -314,7 +319,6 @@
   "hashtag.follow": "Sige etiketa",
   "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
-  "home.column_settings.basic": "Opsyones bazikas",
   "home.column_settings.show_reblogs": "Amostra repartajasyones",
   "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
@@ -400,9 +404,6 @@
   "loading_indicator.label": "Eskargando…",
   "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
   "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
-  "mute_modal.duration": "Durasyon",
-  "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sovre mozotros",
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
@@ -440,15 +441,16 @@
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
+  "notification_requests.accept": "Acheta",
+  "notification_requests.dismiss": "Kita",
+  "notification_requests.notifications_from": "Avizos de {name}",
+  "notification_requests.title": "Avizos filtrados",
   "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
   "notifications.column_settings.favourite": "Te plazen:",
-  "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
-  "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
   "notifications.column_settings.follow": "Muevos suivantes:",
   "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
   "notifications.column_settings.mention": "Enmentaduras:",
@@ -474,6 +476,13 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+  "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
+  "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
+  "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
+  "notifications.policy.filter_not_following_hint": "Asta ke las aproves manualmente",
+  "notifications.policy.filter_not_following_title": "Personas ke no siges",
+  "notifications.policy.filter_private_mentions_title": "Enmentaduras privadas no solisitadas",
+  "notifications.policy.title": "Filtra avizos de…",
   "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
   "notifications_permission_banner.title": "Nunkua te piedres niente",
@@ -650,7 +659,7 @@
   "status.direct": "Enmenta a @{name} en privado",
   "status.direct_indicator": "Enmentadura privada",
   "status.edit": "Edita",
-  "status.edited": "Editado {date}",
+  "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",

app/javascript/mastodon/locales/lt.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
   "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
-  "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
-  "confirmations.block.message": "Ar tikrai nori užblokuoti {name}?",
   "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
   "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
-  "confirmations.domain_block.confirm": "Blokuoti visą domeną",
   "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, bet jie vis tiek galės matyti tavo įrašus ir sekti.",
-  "confirmations.mute.message": "Ar tikrai nori nutildyti {name}?",
   "confirmations.redraft.confirm": "Ištrinti ir parengti iš naujo",
   "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo kaip juodraštį? Bus prarastos mėgstamiausios ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
   "confirmations.reply.confirm": "Atsakyti",
@@ -205,6 +200,19 @@
   "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
   "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
   "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai, kuriuos socialiniame žiniatinklyje paskelbė žmonės, sekantys {domain}.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_like_language": "ActivityPub – tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "domain_pill.server": "Serveris",
+  "domain_pill.their_handle": "Jų socialinis medijos vardas:",
+  "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
+  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.username": "Naudotojo vardas",
+  "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame tinkle, kuriame yra <button> ActivityPub valdomos platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame tinkle, kurį sudaro <button> ActivityPub valdomos platformos</button>.",
+  "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
+  "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
+  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
   "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
   "embed.preview": "Štai, kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
@@ -314,7 +322,6 @@
   "hashtag.follow": "Sekti saitažodį",
   "hashtag.unfollow": "Nebesekti saitažodį",
   "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
-  "home.column_settings.basic": "Paprastas",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -400,9 +407,6 @@
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
-  "mute_modal.duration": "Trukmė",
-  "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
-  "mute_modal.indefinite": "Neribota",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -440,15 +444,16 @@
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
+  "notification_requests.accept": "Priimti",
+  "notification_requests.dismiss": "Atmesti",
+  "notification_requests.notifications_from": "Pranešimai iš {name}",
+  "notification_requests.title": "Filtruojami pranešimai",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
   "notifications.column_settings.favourite": "Mėgstami:",
-  "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
-  "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
   "notifications.column_settings.follow": "Nauji sekėjai:",
   "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
@@ -474,6 +479,12 @@
   "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
   "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
   "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
+  "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
+  "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
+  "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
+  "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
+  "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
+  "notifications.policy.title": "Filtruoti pranešimus iš…",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
   "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
   "notifications_permission_banner.title": "Niekada nieko nepraleisk",
@@ -650,10 +661,11 @@
   "status.direct": "Privačiai paminėti @{name}",
   "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
-  "status.edited": "Redaguota {date}",
+  "status.edited": "Paskutinį kartą redaguota {date}",
   "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
   "status.embed": "Įterpti",
   "status.favourite": "Pamėgti",
+  "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",
   "status.filtered": "Filtruota",
   "status.hide": "Slėpti įrašą",

app/javascript/mastodon/locales/lv.json

@@ -159,9 +159,7 @@
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
   "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
   "confirmation_modal.cancel": "Atcelt",
-  "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
   "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
   "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
@@ -170,15 +168,12 @@
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
-  "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
-  "confirmations.mute.explanation": "Šādi tiks slēpti ieraksti no viņiem un ieraksti, kuros viņi tiek pieminēti, taču viņi joprojām varēs redzēt Tavus ierakstus un sekot Tev.",
-  "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "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.reply.confirm": "Atbildēt",
@@ -306,7 +301,6 @@
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
-  "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",
@@ -392,9 +386,6 @@
   "loading_indicator.label": "Ielādē…",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
-  "mute_modal.duration": "Ilgums",
-  "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
-  "mute_modal.indefinite": "Beztermiņa",
   "navigation_bar.about": "Par",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
@@ -438,9 +429,6 @@
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlase:",
-  "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
-  "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminēšanas:",
@@ -627,18 +615,17 @@
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
-  "status.cancel_reblog_private": "Neizcelt",
+  "status.cancel_reblog_private": "Nepastiprināt",
   "status.cannot_reblog": "Šo ziņu nevar izcelt",
-  "status.copy": "Kopēt saiti uz ziņu",
+  "status.copy": "Ievietot ieraksta saiti starpliktuvē",
   "status.delete": "Dzēst",
   "status.detailed_status": "Detalizēts sarunas skats",
   "status.direct": "Pieminēt @{name} privāti",
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
-  "status.edited": "Labots {date}",
   "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
-  "status.favourite": "Iecienīts",
+  "status.favourite": "Izlasē",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",

app/javascript/mastodon/locales/mk.json

@@ -80,20 +80,15 @@
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
-  "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.block.message": "Сигурни сте дека дека го блокирате {name}?",
   "confirmations.delete.confirm": "Избриши",
   "confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
   "confirmations.delete_list.confirm": "Избриши",
   "confirmations.delete_list.message": "Дали сте сигурни дека сакате да го избришете списоков?",
-  "confirmations.domain_block.confirm": "Сокриј цел домеин",
   "confirmations.domain_block.message": "Дали скроз сте сигурни дека ќе блокирате сѐ од {domain}? Во повеќето случаеви неколку таргетирани блокирања или заќутувања се доволни и предложени. Нема да ја видите содржината од тој домеин во никој јавен времеплов или вашите нотификации. Вашите следбеници од тој домеин ќе бидат остранети.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
-  "confirmations.mute.explanation": "Ќе сокрие објави од нив и објави кои ги спомнуваат нив, но сеуште ќе им дозволи да ги видат вашите постови и ве следат.",
-  "confirmations.mute.message": "Дали ќе го заќутите {name}?",
   "confirmations.reply.confirm": "Одговори",
   "confirmations.unfollow.confirm": "Одследи",
   "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
@@ -137,7 +132,6 @@
   "hashtag.column_settings.tag_mode.any": "Било кои",
   "hashtag.column_settings.tag_mode.none": "Никои",
   "hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи бустирања",
   "home.column_settings.show_replies": "Прикажи одговори",
   "intervals.full.days": "{number, plural, one {# ден} other {# дена}}",

app/javascript/mastodon/locales/ml.json

@@ -108,14 +108,11 @@
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
-  "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
-  "confirmations.block.message": "{name} തടയാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
   "confirmations.delete.confirm": "മായ്ക്കുക",
   "confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "confirmations.delete_list.confirm": "മായ്ക്കുക",
   "confirmations.delete_list.message": "ഈ പട്ടിക എന്നെന്നേക്കുമായി നീക്കം ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
-  "confirmations.domain_block.confirm": "മുഴുവൻ ഡൊമെയ്‌നും തടയുക",
   "confirmations.logout.confirm": "പുറത്തുകടക്കുക",
   "confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?",
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
@@ -181,7 +178,6 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
-  "home.column_settings.basic": "അടിസ്ഥാനം",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
@@ -230,8 +226,6 @@
   "lists.replies_policy.none": "ആരുമില്ല",
   "lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
   "lists.subheading": "എന്റെ പട്ടികകൾ",
-  "mute_modal.duration": "കാലാവധി",
-  "mute_modal.indefinite": "അനിശ്ചിതകാല",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
@@ -255,7 +249,6 @@
   "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
   "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
-  "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
   "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
   "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
   "notifications.column_settings.mention": "സൂചനകൾ:",

app/javascript/mastodon/locales/mr.json

@@ -105,7 +105,6 @@
   "confirmations.delete.message": "हे स्टेटस तुम्हाला नक्की हटवायचंय?",
   "confirmations.delete_list.confirm": "हटवा",
   "confirmations.delete_list.message": "ही यादी तुम्हाला नक्की कायमची हटवायचीय?",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा",
   "confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?",
   "confirmations.mute.confirm": "आवाज बंद करा",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -122,7 +121,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हॅशटॅग फॉलो करा",
   "hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
-  "home.column_settings.basic": "मूळ",
   "home.column_settings.show_reblogs": "बूस्ट दाखवा",
   "home.column_settings.show_replies": "उत्तरे दाखवा",
   "home.hide_announcements": "घोषणा लपवा",

app/javascript/mastodon/locales/ms.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
   "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
-  "confirmations.block.message": "Adakah anda pasti anda ingin menyekat {name}?",
   "confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
   "confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
   "confirmations.delete.confirm": "Padam",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
   "confirmations.discard_edit_media.confirm": "Singkir",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
-  "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.edit.confirm": "Sunting",
   "confirmations.edit.message": "Mengedit sekarang akan menimpa mesej yang sedang anda karang. Adakah anda pasti mahu meneruskan?",
   "confirmations.logout.confirm": "Log keluar",
   "confirmations.logout.message": "Adakah anda pasti anda ingin log keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.",
-  "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Padam & rangka semula",
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam pos ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke pos asal akan menjadi yatim.",
   "confirmations.reply.confirm": "Balas",
@@ -311,7 +306,6 @@
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
-  "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
@@ -397,9 +391,6 @@
   "loading_indicator.label": "Memuatkan…",
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
-  "mute_modal.duration": "Tempoh",
-  "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?",
-  "mute_modal.indefinite": "Tidak tentu",
   "navigation_bar.about": "Perihal",
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
   "navigation_bar.blocks": "Pengguna yang disekat",
@@ -443,9 +434,6 @@
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Pemberitahuan atas meja",
   "notifications.column_settings.favourite": "Kegemaran:",
-  "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
-  "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
   "notifications.column_settings.follow": "Pengikut baharu:",
   "notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
   "notifications.column_settings.mention": "Sebutan:",
@@ -636,7 +624,6 @@
   "status.direct": "Sebut secara peribadi @{name}",
   "status.direct_indicator": "Sebutan peribadi",
   "status.edit": "Sunting",
-  "status.edited": "Disunting {date}",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",

app/javascript/mastodon/locales/my.json

@@ -150,9 +150,7 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
-  "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
-  "confirmations.block.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.cancel_follow_request.confirm": "ပန်ကြားချက်ကို ပယ်ဖျက်မည်",
   "confirmations.cancel_follow_request.message": "{name} ကို စောင့်ကြည့်ခြင်းအားပယ်ဖျက်ရန် သေချာပါသလား။",
   "confirmations.delete.confirm": "ဖျက်မည်",
@@ -161,15 +159,12 @@
   "confirmations.delete_list.message": "ဖျက်ရန် သေချာပါသလား?",
   "confirmations.discard_edit_media.confirm": "ဖယ်ထုတ်ပါ",
   "confirmations.discard_edit_media.message": "သင်သည် မီဒီယာဖော်ပြချက် သို့မဟုတ် အစမ်းကြည့်ရှုခြင်းတွင် မသိမ်းဆည်းရသေးသော အပြောင်းအလဲများရှိသည်။ မည်သို့ပင်ဖြစ်စေ ဖျက်ပစ်မည်လား။",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "{domain} တစ်ခုလုံးကို ဘလော့လုပ်ရန် တကယ် သေချာပါသလား? များသောအားဖြင့် အနည်းစုကို ပစ်မှတ်ထား ဘလော့လုပ်ခြင်းသည် လုံလောက်ပါသည်။ ထို ဒိုမိန်းမှ အကြောင်းအရာ တစ်ခုမှ မြင်ရမည်မဟုတ်သည့်အပြင် ထို ဒိုမိန်းတွင်ရှိသော သင်၏ စောင့်ကြည့်သူများပါ ဖယ်ရှားပစ်မည်ဖြစ်သည်။",
   "confirmations.edit.confirm": "ပြင်ရန်",
   "confirmations.edit.message": "ယခုပြင်ဆင်ခြင်းတွင် သင်လက်ရှိမက်ဆေ့ချ်ကို ဖျက်ပစ်ပြီး အသစ်ရေးပါမည်။ ရှေ့ဆက်လိုသည်မှာ သေချာပါသလား။",
   "confirmations.logout.confirm": "အကောင့်မှထွက်မည်",
   "confirmations.logout.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.mute.confirm": "ပိတ်ထားရန်",
-  "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။",
-  "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ",
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
   "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.reply.confirm": "စာပြန်မည်",
@@ -292,7 +287,6 @@
   "hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
   "hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
   "hashtags.and_other": "{count, plural, other {# more}} နှင့်",
-  "home.column_settings.basic": "အခြေခံ",
   "home.column_settings.show_reblogs": "Boost များကို ပြပါ",
   "home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
   "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
@@ -378,9 +372,6 @@
   "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
-  "mute_modal.duration": "ကြာချိန်",
-  "mute_modal.hide_notifications": "ဤအကောင့်မှသတိပေးချက်များကိုပိတ်မလား?",
-  "mute_modal.indefinite": "ရေတွက်လို့မရပါ",
   "navigation_bar.about": "အကြောင်း",
   "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
   "navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
@@ -424,9 +415,6 @@
   "notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -",
   "notifications.column_settings.alert": "Desktop သတိပေးချက်များ",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ",
-  "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား",
-  "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ",
   "notifications.column_settings.follow": "စောင့်ကြည့်သူအသစ်များ -",
   "notifications.column_settings.follow_request": "စောင့်ကြည့်ရန် တောင်းဆိုမှုအသစ်များ -",
   "notifications.column_settings.mention": "ဖော်ပြချက်များ -",
@@ -614,7 +602,6 @@
   "status.direct": "@{name} ကို သီးသန့်ဖော်ပြမည်\n",
   "status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
   "status.edit": "ပြင်ဆင်ရန်",
-  "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ",
   "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
   "status.embed": "Embed",
   "status.favourite": "Favorite",

app/javascript/mastodon/locales/ne.json

@@ -50,6 +50,10 @@
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
   "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+  "announcement.announcement": "घोषणा",
+  "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
+  "block_modal.show_less": "कम देखाउनुहोस्",
+  "block_modal.show_more": "थप देखाउनुहोस्",
   "bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
   "bundle_modal_error.close": "बन्द गर्नुहोस्",
   "bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",

app/javascript/mastodon/locales/nl.json

@@ -89,6 +89,14 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
+  "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
+  "block_modal.show_less": "Minder tonen",
+  "block_modal.show_more": "Meer tonen",
+  "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.",
+  "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.",
+  "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.",
+  "block_modal.title": "Gebruiker blokkeren?",
+  "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -160,9 +168,7 @@
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
   "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
-  "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
-  "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
   "confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
   "confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
   "confirmations.delete.confirm": "Verwijderen",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
   "confirmations.discard_edit_media.confirm": "Weggooien",
   "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
-  "confirmations.domain_block.confirm": "Blokkeer alles van deze server",
-  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen berichten van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
+  "confirmations.domain_block.confirm": "Server blokkeren",
+  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je ziet geen berichten van deze server meer op openbare tijdlijnen of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
   "confirmations.edit.confirm": "Bewerken",
   "confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.mute.confirm": "Negeren",
-  "confirmations.mute.explanation": "Dit verbergt diens berichten en berichten waar diegene in wordt vermeld, maar diegene kan nog steeds jouw berichten bekijken en jou volgen.",
-  "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
   "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
   "confirmations.reply.confirm": "Reageren",
@@ -205,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
   "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web. Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
   "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web die door mensen op {domain} worden gevolgd.",
+  "domain_block_modal.block": "Server blokkeren",
+  "domain_block_modal.block_account_instead": "In plaats hiervan {name} blokkeren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Mensen op deze server kunnen interactie hebben met jouw oude berichten.",
+  "domain_block_modal.they_cant_follow": "Niemand op deze server kan jou volgen.",
+  "domain_block_modal.they_wont_know": "Ze krijgen niet te weten dat ze worden geblokkeerd.",
+  "domain_block_modal.title": "Server blokkeren?",
+  "domain_block_modal.you_will_lose_followers": "Al jouw volgers van deze server worden ontvolgd.",
+  "domain_block_modal.you_wont_see_posts": "Je ziet geen berichten of meldingen meer van gebruikers op deze server.",
+  "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Hun Mastodon-adres:",
+  "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.",
+  "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
+  "domain_pill.username": "Gebruikersnaam",
+  "domain_pill.whats_in_a_handle": "Wat is een Mastodon-adres?",
+  "domain_pill.who_they_are": "Omdat je aan een Mastodon-adres kunt zien wie iemand is en waar die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web communiceren.",
+  "domain_pill.who_you_are": "Omdat je aan jouw Mastodon-adres kunt zien wie jij bent is en waar je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web met jou communiceren.",
+  "domain_pill.your_handle": "Jouw Mastodon-adres:",
+  "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
+  "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
@@ -229,18 +254,19 @@
   "empty_column.blocks": "Je hebt nog geen gebruikers geblokkeerd.",
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, zullen deze hier verschijnen.",
+  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, komen deze hier te staan.",
   "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde servers.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
   "empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
-  "empty_column.follow_requests": "Je hebt nog geen volgverzoeken. Wanneer je er een ontvangt, zal dat hier te zien zijn.",
-  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Wanneer je dit doet, zullen ze hier verschijnen.",
+  "empty_column.follow_requests": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
+  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Nadat je dit doet, komen deze hier te staan.",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Deze tijdlijn is leeg! Volg meer mensen om het te vullen.",
   "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
-  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
+  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, valt dat hier te zien.",
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
+  "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
   "empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
   "error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
@@ -271,6 +297,8 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
   "firehose.remote": "Andere servers",
@@ -314,7 +342,6 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
-  "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
   "home.hide_announcements": "Mededelingen verbergen",
@@ -400,9 +427,15 @@
   "loading_indicator.label": "Laden…",
   "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
-  "mute_modal.duration": "Tijdsduur",
-  "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
-  "mute_modal.indefinite": "Voor onbepaalde tijd",
+  "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
+  "mute_modal.hide_options": "Opties verbergen",
+  "mute_modal.indefinite": "Totdat ik ze niet meer negeer",
+  "mute_modal.show_options": "Opties tonen",
+  "mute_modal.they_can_mention_and_follow": "De persoon kan jou vermelden en volgen, maar jij ziet niks meer van deze persoon.",
+  "mute_modal.they_wont_know": "De persoon krijgt niet te weten dat die wordt genegeerd.",
+  "mute_modal.title": "Gebruiker negeren?",
+  "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
+  "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -440,15 +473,16 @@
   "notification.reblog": "{name} boostte jouw bericht",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
+  "notification_requests.accept": "Accepteren",
+  "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.notifications_from": "Meldingen van {name}",
+  "notification_requests.title": "Gefilterde meldingen",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
-  "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
-  "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalk tonen",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
   "notifications.column_settings.mention": "Vermeldingen:",
@@ -474,6 +508,15 @@
   "notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+  "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
+  "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
+  "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
+  "notifications.policy.filter_not_followers_title": "Mensen die jou niet volgen",
+  "notifications.policy.filter_not_following_hint": "Totdat je ze handmatig goedkeurt",
+  "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
+  "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
+  "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
+  "notifications.policy.title": "Meldingen verbergen van…",
   "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
   "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
@@ -483,7 +526,7 @@
   "onboarding.actions.go_to_home": "Ga naar je starttijdlijn",
   "onboarding.compose.template": "Hallo #Mastodon!",
   "onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
-  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het zal zijn. Om te beginnen, zijn hier enkele suggesties:",
+  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het wordt. Om te beginnen zijn hier enkele suggesties:",
   "onboarding.follows.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.profile.discoverable": "Maak mijn profiel vindbaar",
   "onboarding.profile.discoverable_hint": "Wanneer je akkoord gaat met het vindbaar zijn op Mastodon, verschijnen je berichten in zoekresultaten en kunnen ze trending worden, en je profiel kan aan andere mensen worden aanbevolen wanneer ze vergelijkbare interesses hebben.",
@@ -507,7 +550,7 @@
   "onboarding.steps.follow_people.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.steps.publish_status.body": "Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen {emoji}",
   "onboarding.steps.publish_status.title": "Maak je eerste bericht",
-  "onboarding.steps.setup_profile.body": "Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.",
+  "onboarding.steps.setup_profile.body": "Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.",
   "onboarding.steps.setup_profile.title": "Je profiel aanpassen",
   "onboarding.steps.share_profile.body": "Laat je vrienden weten waar je te vinden bent op Mastodon",
   "onboarding.steps.share_profile.title": "Deel je Mastodonprofiel",
@@ -535,7 +578,7 @@
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het beticht niet verschijnt op openbare tijdlijnen of hashtags, onder verkennen of Mastodon zoeken, zelfs als je je account daarvoor hebt ingesteld.",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
   "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
@@ -650,10 +693,11 @@
   "status.direct": "@{name} een privébericht sturen",
   "status.direct_indicator": "Privébericht",
   "status.edit": "Bewerken",
-  "status.edited": "Bewerkt op {date}",
+  "status.edited": "Laatste bewerking op {date}",
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
   "status.embed": "Embedden",
   "status.favourite": "Favoriet",
+  "status.favourites": "{count, plural, one {# favoriet} other {# favorieten}}",
   "status.filter": "Dit bericht filteren",
   "status.filtered": "Gefilterd",
   "status.hide": "Bericht verbergen",
@@ -674,12 +718,13 @@
   "status.reblog": "Boosten",
   "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
   "status.reblogged_by": "{name} boostte",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
-  "status.replyAll": "Reageer op iedereen",
+  "status.replyAll": "Op iedereen reageren",
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",

app/javascript/mastodon/locales/nn.json

@@ -89,6 +89,9 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
+  "block_modal.remote_users_caveat": "Vi vil be tenaren {domain} om å respektere di avgjerd. Det kan ikkje garanterast at det vert etterfølgd, sidan nokre tenarar kan handtere blokkering ulikt. Offentlege innlegg kan framleis vere synlege for ikkje-innlogga brukarar.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis meir",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -160,9 +163,7 @@
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
   "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
-  "confirmations.block.message": "Er du sikker på at du vil blokkera {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -171,15 +172,12 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
-  "confirmations.domain_block.confirm": "Blokker heile domenet",
   "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
   "confirmations.mute.confirm": "Målbind",
-  "confirmations.mute.explanation": "Dette vil gøyma innlegga deira og innlegg som nemner dei, men dei vil framleis kunna sjå innlegga dine og fylgja deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
@@ -205,6 +203,19 @@
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
   "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
+  "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
+  "domain_pill.server": "Tenar",
+  "domain_pill.their_handle": "Deira handtak:",
+  "domain_pill.their_server": "Deira digitale heim, som alle innlegga deira bur.",
+  "domain_pill.their_username": "Deira unike identifikator på serveren deira. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
+  "domain_pill.username": "Brukarnamn",
+  "domain_pill.whats_in_a_handle": "Kva er i eit handtak?",
+  "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, som alle postane dine bur i. Liker du ikkje dette? Overfør tenarar når som helst og ta med følgjarane 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:",
   "emoji_button.activity": "Aktivitet",
@@ -241,6 +252,7 @@
   "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.",
   "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.",
   "empty_column.mutes": "Du har ikkje målbunde nokon enno.",
+  "empty_column.notification_requests": "Ferdig! Her er det ingenting. Når du får nye varsel, kjem dei opp her slik du har valt.",
   "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp",
   "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.",
@@ -271,6 +283,8 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
+  "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
   "firehose.remote": "Andre tenarar",
@@ -314,7 +328,6 @@
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
-  "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjeringar",
@@ -400,9 +413,6 @@
   "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
-  "mute_modal.duration": "Varigheit",
-  "mute_modal.hide_notifications": "Gøym varsel frå denne brukaren?",
-  "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -440,15 +450,16 @@
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
+  "notification_requests.accept": "Godkjenn",
+  "notification_requests.dismiss": "Avvis",
+  "notification_requests.notifications_from": "Varslingar frå {name}",
+  "notification_requests.title": "Filtrerte varslingar",
   "notifications.clear": "Tøm varsel",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
   "notifications.column_settings.admin.report": "Nye rapportar:",
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
   "notifications.column_settings.favourite": "Favorittar:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
-  "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
   "notifications.column_settings.mention": "Omtalar:",
@@ -474,6 +485,15 @@
   "notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
   "notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
   "notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+  "notifications.policy.filter_new_accounts.hint": "Skrive siste {days, plural, one {dag} other {# dagar}}",
+  "notifications.policy.filter_new_accounts_title": "Nye brukarkontoar",
+  "notifications.policy.filter_not_followers_hint": "Inkludert folk som har fylgt deg mindre enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
+  "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
+  "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne nemningar eller viss du fylgjer avsendaren",
+  "notifications.policy.filter_private_mentions_title": "Masseutsende private nemningar",
+  "notifications.policy.title": "Filtrer ut varslingar frå…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
   "notifications_permission_banner.title": "Gå aldri glipp av noko",
@@ -650,7 +670,6 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",

app/javascript/mastodon/locales/no.json

@@ -160,9 +160,7 @@
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
   "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
-  "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
-  "confirmations.domain_block.confirm": "Skjul alt fra domenet",
   "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logge ut?",
   "confirmations.mute.confirm": "Demp",
-  "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
   "confirmations.redraft.confirm": "Slett og skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
   "confirmations.reply.confirm": "Svar",
@@ -304,7 +299,6 @@
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
-  "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjøring",
@@ -390,9 +384,6 @@
   "loading_indicator.label": "Laster…",
   "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
-  "mute_modal.duration": "Varighet",
-  "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
-  "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
   "navigation_bar.blocks": "Blokkerte brukere",
@@ -436,9 +427,6 @@
   "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
   "notifications.column_settings.favourite": "Favoritter:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgerforespørsler:",
   "notifications.column_settings.mention": "Nevnt:",
@@ -638,7 +626,6 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
   "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",

app/javascript/mastodon/locales/oc.json

@@ -137,9 +137,7 @@
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Volètz vertadièrament blocar {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirar la demandar",
   "confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
   "confirmations.delete.confirm": "Escafar",
@@ -147,14 +145,11 @@
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
   "confirmations.discard_edit_media.confirm": "Ignorar",
-  "confirmations.domain_block.confirm": "Amagar tot lo domeni",
   "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Desconnexion",
   "confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
   "confirmations.mute.confirm": "Rescondre",
-  "confirmations.mute.explanation": "Aquò lor escondrà las publicacions e mencions, mas aquò lor permetrà encara de veire vòstra publicacions e de vos sègre.",
-  "confirmations.mute.message": "Volètz vertadièrament rescondre {name} ?",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
   "confirmations.reply.confirm": "Respondre",
   "confirmations.reply.message": "Respondre remplaçarà lo messatge que sètz a escriure. Volètz vertadièrament contunhar ?",
@@ -262,7 +257,6 @@
   "hashtag.follow": "Sègre l’etiqueta",
   "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
   "home.hide_announcements": "Rescondre las anóncias",
@@ -334,9 +328,6 @@
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
   "loading_indicator.label": "Cargament…",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
-  "mute_modal.indefinite": "Cap de data de fin",
   "navigation_bar.about": "A prepaus",
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
   "navigation_bar.blocks": "Personas blocadas",
@@ -379,9 +370,6 @@
   "notifications.column_settings.admin.sign_up": "Nòus inscrits :",
   "notifications.column_settings.alert": "Notificacions localas",
   "notifications.column_settings.favourite": "Favorits :",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
-  "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
   "notifications.column_settings.mention": "Mencions :",
@@ -529,7 +517,6 @@
   "status.direct": "Mencionar @{name} en privat",
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
-  "status.edited": "Modificat {date}",
   "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",

app/javascript/mastodon/locales/pa.json

@@ -86,13 +86,11 @@
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "compose_form.spoiler_placeholder": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ (ਚੋਣਵਾਂ)",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
-  "confirmations.block.block_and_report": "ਰੋਕ ਲਾਓ ਤੇ ਰਿਪੋਰਟ ਕਰੋ",
   "confirmations.block.confirm": "ਪਾਬੰਦੀ",
   "confirmations.delete.confirm": "ਹਟਾਓ",
   "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.delete_list.confirm": "ਹਟਾਓ",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
-  "confirmations.domain_block.confirm": "ਪੂਰੀ ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "confirmations.edit.confirm": "ਸੋਧ",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
@@ -153,7 +151,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
-  "home.column_settings.basic": "ਆਮ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
@@ -197,7 +194,6 @@
   "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
   "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
-  "mute_modal.duration": "ਮਿਆਦ",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -311,7 +307,6 @@
   "status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
-  "status.edited": "{date} ਨੂੰ ਸੋਧਿਆ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ਮੜ੍ਹੋ",
   "status.favourite": "ਪਸੰਦ",