Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream

Gemfile

@@ -88,7 +88,7 @@ gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'simple_form', '~> 5.2'
 gem 'simple-navigation', '~> 4.4'
 gem 'stoplight', '~> 4.1'
-gem 'strong_migrations', '1.8.0'
+gem 'strong_migrations'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'

Gemfile.lock

@@ -781,7 +781,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -821,8 +821,8 @@ GEM
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
-    strong_migrations (1.8.0)
+    strong_migrations (2.0.0)
-      activerecord (>= 5.2)
+      activerecord (>= 6.1)
     strscan (3.1.0)
     swd (1.3.0)
       activesupport (>= 3)
@@ -894,7 +894,7 @@ GEM
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     webrick (1.8.1)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -1046,7 +1046,7 @@ DEPENDENCIES
   simplecov-lcov (~> 0.8)
   stackprof
   stoplight (~> 4.1)
-  strong_migrations (= 1.8.0)
+  strong_migrations
   test-prof
   thor (~> 1.2)
   tty-prompt (~> 0.23)

app/controllers/api/v1/admin/domain_allows_controller.rb

@@ -47,18 +47,13 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
   private
 
   def set_domain_allows
-    @domain_allows = filtered_domain_allows.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_allow
     @domain_allow = DomainAllow.find(params[:id])
   end
 
-  def filtered_domain_allows
-    # TODO: no filtering yet
-    DomainAllow.all
-  end
-
   def next_path
     api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end

app/controllers/api/v1/admin/domain_blocks_controller.rb

@@ -59,18 +59,13 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def set_domain_blocks
-    @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_domain_block
     @domain_block = DomainBlock.find(params[:id])
   end
 
-  def filtered_domain_blocks
-    # TODO: no filtering yet
-    DomainBlock.all
-  end
-
   def domain_block_params
     params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
   end

app/javascript/mastodon/actions/compose.js

@@ -4,6 +4,7 @@ import axios from 'axios';
 import { throttle } from 'lodash';
 
 import api from 'mastodon/api';
+import { browserHistory } from 'mastodon/components/router';
 import { search as emojiSearch } from 'mastodon/features/emoji/emoji_mart_search_light';
 import { tagHistory } from 'mastodon/settings';
 
@@ -88,9 +89,9 @@ const messages = defineMessages({
   saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
 });
 
-export const ensureComposeIsVisible = (getState, routerHistory) => {
+export const ensureComposeIsVisible = (getState) => {
   if (!getState().getIn(['compose', 'mounted'])) {
-    routerHistory.push('/publish');
+    browserHistory.push('/publish');
   }
 };
 
@@ -110,14 +111,14 @@ export function changeCompose(text) {
   };
 }
 
-export function replyCompose(status, routerHistory) {
+export function replyCompose(status) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_REPLY,
       status: status,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
@@ -133,38 +134,38 @@ export function resetCompose() {
   };
 }
 
-export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
+export const focusCompose = (defaultText) => (dispatch, getState) => {
   dispatch({
     type: COMPOSE_FOCUS,
     defaultText,
   });
 
-  ensureComposeIsVisible(getState, routerHistory);
+  ensureComposeIsVisible(getState);
 };
 
-export function mentionCompose(account, routerHistory) {
+export function mentionCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function directCompose(account, routerHistory) {
+export function directCompose(account) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_DIRECT,
       account: account,
     });
 
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
   };
 }
 
-export function submitCompose(routerHistory) {
+export function submitCompose() {
   return function (dispatch, getState) {
     const status   = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
@@ -214,8 +215,8 @@ export function submitCompose(routerHistory) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (routerHistory && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new') && window.history.state) {
+      if ((browserHistory.location.pathname === '/publish' || browserHistory.location.pathname === '/statuses/new') && window.history.state) {
-        routerHistory.goBack();
+        browserHistory.goBack();
       }
 
       dispatch(insertIntoTagHistory(response.data.tags, status));
@@ -251,7 +252,7 @@ export function submitCompose(routerHistory) {
         message: statusId === null ? messages.published : messages.saved,
         action: messages.open,
         dismissAfter: 10000,
-        onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
+        onClick: () => browserHistory.push(`/@${response.data.account.username}/${response.data.id}`),
       }));
     }).catch(function (error) {
       dispatch(submitComposeFail(error));

app/javascript/mastodon/actions/statuses.js

@@ -93,7 +93,7 @@ export function redraft(status, raw_text) {
   };
 }
 
-export const editStatus = (id, routerHistory) => (dispatch, getState) => {
+export const editStatus = (id) => (dispatch, getState) => {
   let status = getState().getIn(['statuses', id]);
 
   if (status.get('poll')) {
@@ -104,7 +104,7 @@ export const editStatus = (id, routerHistory) => (dispatch, getState) => {
 
   api().get(`/api/v1/statuses/${id}/source`).then(response => {
     dispatch(fetchStatusSourceSuccess());
-    ensureComposeIsVisible(getState, routerHistory);
+    ensureComposeIsVisible(getState);
     dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text));
   }).catch(error => {
     dispatch(fetchStatusSourceFail(error));
@@ -124,7 +124,7 @@ export const fetchStatusSourceFail = error => ({
   error,
 });
 
-export function deleteStatus(id, routerHistory, withRedraft = false) {
+export function deleteStatus(id, withRedraft = false) {
   return (dispatch, getState) => {
     let status = getState().getIn(['statuses', id]);
 
@@ -141,7 +141,7 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
 
       if (withRedraft) {
         dispatch(redraft(status, response.data.text));
-        ensureComposeIsVisible(getState, routerHistory);
+        ensureComposeIsVisible(getState);
       }
     }).catch(error => {
       dispatch(deleteStatusFail(id, error));

app/javascript/mastodon/components/router.tsx

@@ -22,7 +22,7 @@ type LocationState = MastodonLocationState | null | undefined;
 
 type HistoryPath = Path | LocationDescriptor<LocationState>;
 
-const browserHistory = createBrowserHistory<LocationState>();
+export const browserHistory = createBrowserHistory<LocationState>();
 const originalPush = browserHistory.push.bind(browserHistory);
 const originalReplace = browserHistory.replace.bind(browserHistory);
 

app/javascript/mastodon/components/status.jsx

@@ -268,7 +268,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyReply = e => {
     e.preventDefault();
-    this.props.onReply(this._properStatus(), this.props.history);
+    this.props.onReply(this._properStatus());
   };
 
   handleHotkeyFavourite = () => {
@@ -281,7 +281,7 @@ class Status extends ImmutablePureComponent {
 
   handleHotkeyMention = e => {
     e.preventDefault();
-    this.props.onMention(this._properStatus().get('account'), this.props.history);
+    this.props.onMention(this._properStatus().get('account'));
   };
 
   handleHotkeyOpen = () => {

app/javascript/mastodon/components/status_action_bar.jsx

@@ -118,7 +118,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { signedIn } = this.props.identity;
 
     if (signedIn) {
-      this.props.onReply(this.props.status, this.props.history);
+      this.props.onReply(this.props.status);
     } else {
       this.props.onInteractionModal('reply', this.props.status);
     }
@@ -157,15 +157,15 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handlePinClick = () => {
@@ -173,11 +173,11 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {

app/javascript/mastodon/containers/status_container.jsx

@@ -76,7 +76,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
 
@@ -86,10 +86,10 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)) },
+            onConfirm: () => dispatch(replyCompose(status)) },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -144,22 +144,22 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onEdit (status, history) {
+  onEdit (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -168,11 +168,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.editMessage),
             confirm: intl.formatMessage(messages.editConfirm),
-            onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+            onConfirm: () => dispatch(editStatus(status.get('id'))),
           },
         }));
       } else {
-        dispatch(editStatus(status.get('id'), history));
+        dispatch(editStatus(status.get('id')));
       }
     });
   },
@@ -185,12 +185,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onDirect (account, router) {
+  onDirect (account) {
-    dispatch(directCompose(account, router));
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
+  onMention (account) {
-    dispatch(mentionCompose(account, router));
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (statusId, media, index, lang) {

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

@@ -2,13 +2,11 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import { NavLink, withRouter } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
 import InnerHeader from '../../account/components/header';
 
 import MemorialNote from './memorial_note';
@@ -36,7 +34,6 @@ class Header extends ImmutablePureComponent {
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
     hidden: PropTypes.bool,
-    ...WithRouterPropTypes,
   };
 
   handleFollow = () => {
@@ -48,11 +45,11 @@ class Header extends ImmutablePureComponent {
   };
 
   handleMention = () => {
-    this.props.onMention(this.props.account, this.props.history);
+    this.props.onMention(this.props.account);
   };
 
   handleDirect = () => {
-    this.props.onDirect(this.props.account, this.props.history);
+    this.props.onDirect(this.props.account);
   };
 
   handleReport = () => {
@@ -155,4 +152,4 @@ class Header extends ImmutablePureComponent {
 
 }
 
-export default withRouter(Header);
+export default Header;

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

@@ -77,12 +77,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onMention (account, router) {
+  onMention (account) {
-    dispatch(mentionCompose(account, router));
+    dispatch(mentionCompose(account));
   },
 
-  onDirect (account, router) {
+  onDirect (account) {
-    dispatch(directCompose(account, router));
+    dispatch(directCompose(account));
   },
 
   onReblogToggle (account) {

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

@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
-
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
@@ -71,7 +69,6 @@ class ComposeForm extends ImmutablePureComponent {
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
     maxChars: PropTypes.number,
-    ...WithOptionalRouterPropTypes
   };
 
   static defaultProps = {
@@ -120,7 +117,7 @@ class ComposeForm extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onSubmit(this.props.history || null);
+    this.props.onSubmit();
 
     if (e) {
       e.preventDefault();
@@ -317,4 +314,4 @@ class ComposeForm extends ImmutablePureComponent {
 
 }
 
-export default withOptionalRouter(injectIntl(ComposeForm));
+export default injectIntl(ComposeForm);

app/javascript/mastodon/features/compose/containers/compose_form_container.js

@@ -37,8 +37,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit (router) {
+  onSubmit () {
-    dispatch(submitCompose(router));
+    dispatch(submitCompose());
   },
 
   onClearSuggestions () {

app/javascript/mastodon/features/direct_timeline/components/conversation.jsx

@@ -108,14 +108,14 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(lastStatus, history)),
+            onConfirm: () => dispatch(replyCompose(lastStatus)),
           },
         }));
       } else {
-        dispatch(replyCompose(lastStatus, history));
+        dispatch(replyCompose(lastStatus));
       }
     });
-  }, [dispatch, lastStatus, history, intl]);
+  }, [dispatch, lastStatus, intl]);
 
   const handleDelete = useCallback(() => {
     dispatch(deleteConversation(id));

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

@@ -101,7 +101,7 @@ class Notification extends ImmutablePureComponent {
     e.preventDefault();
 
     const { notification, onMention } = this.props;
-    onMention(notification.get('account'), this.props.history);
+    onMention(notification.get('account'));
   };
 
   handleHotkeyFavourite = () => {

app/javascript/mastodon/features/notifications/containers/notification_container.js

@@ -34,8 +34,8 @@ const makeMapStateToProps = () => {
 };
 
 const mapDispatchToProps = dispatch => ({
-  onMention: (account, router) => {
+  onMention: (account) => {
-    dispatch(mentionCompose(account, router));
+    dispatch(mentionCompose(account));
   },
 
   onModalReblog (status, privacy) {

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

@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
-import { Link, Switch, Route, useHistory } from 'react-router-dom';
+import { Link, Switch, Route } from 'react-router-dom';
 
 import { useDispatch } from 'react-redux';
 
@@ -35,11 +35,10 @@ const Onboarding = () => {
   const account = useAppSelector(state => state.getIn(['accounts', me]));
   const dispatch = useDispatch();
   const intl = useIntl();
-  const history = useHistory();
 
   const handleComposeClick = useCallback(() => {
-    dispatch(focusCompose(history, intl.formatMessage(messages.template)));
+    dispatch(focusCompose(intl.formatMessage(messages.template)));
-  }, [dispatch, intl, history]);
+  }, [dispatch, intl]);
 
   return (
     <Column>

app/javascript/mastodon/features/picture_in_picture/components/footer.jsx

@@ -61,13 +61,13 @@ class Footer extends ImmutablePureComponent {
   };
 
   _performReply = () => {
-    const { dispatch, status, onClose, history } = this.props;
+    const { dispatch, status, onClose } = this.props;
 
     if (onClose) {
       onClose(true);
     }
 
-    dispatch(replyCompose(status, history));
+    dispatch(replyCompose(status));
   };
 
   handleReplyClick = () => {

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

@@ -4,7 +4,6 @@ import { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -23,7 +22,6 @@ import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
@@ -91,7 +89,6 @@ class ActionBar extends PureComponent {
     onPin: PropTypes.func,
     onEmbed: PropTypes.func,
     intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
   };
 
   handleReplyClick = () => {
@@ -111,23 +108,23 @@ class ActionBar extends PureComponent {
   };
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status, this.props.history);
+    this.props.onDelete(this.props.status);
   };
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, this.props.history, true);
+    this.props.onDelete(this.props.status, true);
   };
 
   handleEditClick = () => {
-    this.props.onEdit(this.props.status, this.props.history);
+    this.props.onEdit(this.props.status);
   };
 
   handleDirectClick = () => {
-    this.props.onDirect(this.props.status.get('account'), this.props.history);
+    this.props.onDirect(this.props.status.get('account'));
   };
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.props.history);
+    this.props.onMention(this.props.status.get('account'));
   };
 
   handleMuteClick = () => {
@@ -323,4 +320,4 @@ class ActionBar extends PureComponent {
 
 }
 
-export default withRouter(connect(mapStateToProps)(withIdentity(injectIntl(ActionBar))));
+export default connect(mapStateToProps)(withIdentity(injectIntl(ActionBar)));

app/javascript/mastodon/features/status/containers/detailed_status_container.js

@@ -55,7 +55,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
-  onReply (status, router) {
+  onReply (status) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -64,11 +64,11 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, router));
+        dispatch(replyCompose(status));
       }
     });
   },
@@ -115,27 +115,27 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
-  onDelete (status, history, withRedraft = false) {
+  onDelete (status, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   },
 
-  onDirect (account, router) {
+  onDirect (account) {
-    dispatch(directCompose(account, router));
+    dispatch(directCompose(account));
   },
 
-  onMention (account, router) {
+  onMention (account) {
-    dispatch(mentionCompose(account, router));
+    dispatch(mentionCompose(account));
   },
 
   onOpenMedia (media, index, lang) {

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

@@ -280,11 +280,11 @@ class Status extends ImmutablePureComponent {
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, this.props.history)),
+            onConfirm: () => dispatch(replyCompose(status)),
           },
         }));
       } else {
-        dispatch(replyCompose(status, this.props.history));
+        dispatch(replyCompose(status));
       }
     } else {
       dispatch(openModal({
@@ -336,33 +336,33 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleDeleteClick = (status, history, withRedraft = false) => {
+  handleDeleteClick = (status, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
           message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
           confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-          onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+          onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
         },
       }));
     }
   };
 
-  handleEditClick = (status, history) => {
+  handleEditClick = (status) => {
-    this.props.dispatch(editStatus(status.get('id'), history));
+    this.props.dispatch(editStatus(status.get('id')));
   };
 
-  handleDirectClick = (account, router) => {
+  handleDirectClick = (account) => {
-    this.props.dispatch(directCompose(account, router));
+    this.props.dispatch(directCompose(account));
   };
 
-  handleMentionClick = (account, router) => {
+  handleMentionClick = (account) => {
-    this.props.dispatch(mentionCompose(account, router));
+    this.props.dispatch(mentionCompose(account));
   };
 
   handleOpenMedia = (media, index, lang) => {

app/javascript/mastodon/locales/an.json

@@ -342,7 +342,6 @@
   "notification.follow_request": "{name} ha solicitau seguir-te",
   "notification.mention": "{name} t'ha mencionau",
   "notification.own_poll": "La tuya enqüesta ha rematau",
-  "notification.poll": "Una enqüesta en a quala has votau ha rematau",
   "notification.reblog": "{name} ha retutau la tuya publicación",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",

app/javascript/mastodon/locales/ar.json

@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "لقد تم تقييد حسابك.",
   "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
-  "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
   "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
   "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",

app/javascript/mastodon/locales/ast.json

@@ -1,7 +1,7 @@
 {
   "about.blocks": "Sirvidores moderaos",
   "about.contact": "Contautu:",
-  "about.disclaimer": "Mastodon ye software gratuito ya de códigu llibre, ya una marca rexistrada de Mastodon gGmbH.",
+  "about.disclaimer": "Mastodon ye software gratuito y de códigu llibre, y una marca rexistrada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "El motivu nun ta disponible",
   "about.domain_blocks.preamble": "Polo xeneral, Mastodon permítete ver el conteníu ya interactuar colos perfiles d'otros sirvidores nel fediversu. Estes son les esceiciones que se ficieron nesti sirvidor.",
   "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles ya'l conteníu d'esti sirvidor sacante que los busques o decidas siguilos.",
@@ -37,15 +37,15 @@
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
-  "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
+  "account.link_verified_on": "La propiedá d'esti enllaz comprobóse'l {date}",
   "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
   "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
   "account.mute": "Desactivar los avisos de @{name}",
   "account.open_original_page": "Abrir la páxina orixinal",
   "account.posts": "Artículos",
-  "account.posts_with_replies": "Artículos ya rempuestes",
+  "account.posts_with_replies": "Artículos y rempuestes",
-  "account.report": "Informar de: @{name}",
+  "account.report": "Informar de @{name}",
   "account.requested_follow": "{name} solicitó siguite",
   "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
   "account.unblock": "Desbloquiar a @{name}",
@@ -71,7 +71,7 @@
   "bundle_column_error.routing.body": "Nun se pudo atopar la páxina solicitada. ¿De xuru que la URL de la barra de direiciones ta bien escrita?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.message": "Asocedió daqué malo mentanto se cargaba esti componente.",
-  "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor ya siguir interactuando con esti.",
+  "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor y siguir interactuando con esti.",
   "closed_registrations_modal.description": "Anguaño nun ye posible crear cuentes en {domain}, mas ten en cuenta que nun precises una cuenta nesti sirvidor pa usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Atopar otru sirvidor",
   "closed_registrations_modal.preamble": "Mastodon ye una rede social descentralizada polo que nun importa ónde crees la cuenta, vas ser a siguir ya interactuar con persones d'esti sirvidor. ¡Ya tamién pues tener el to propiu sirvidor!",
@@ -107,7 +107,7 @@
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.type": "Estilu",
+  "compose_form.poll.type": "Tipu",
   "compose_form.publish_form": "Artículu nuevu",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.confirm": "Bloquiar",
@@ -120,7 +120,7 @@
   "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?",
-  "confirmations.redraft.confirm": "Desaniciar ya reeditar",
+  "confirmations.redraft.confirm": "Desaniciar y reeditar",
   "confirmations.reply.confirm": "Responder",
   "confirmations.unfollow.confirm": "Dexar de siguir",
   "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
@@ -140,7 +140,7 @@
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
   "emoji_button.flags": "Banderes",
-  "emoji_button.food": "Comida ya bébora",
+  "emoji_button.food": "Comida y bébora",
   "emoji_button.nature": "Natura",
   "emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
   "emoji_button.objects": "Oxetos",
@@ -149,7 +149,7 @@
   "emoji_button.search": "Buscar…",
   "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
-  "emoji_button.travel": "Viaxes ya llugares",
+  "emoji_button.travel": "Viaxes y llugares",
   "empty_column.account_timeline": "¡Equí nun hai nengún artículu!",
   "empty_column.blocks": "Nun bloquiesti a nengún perfil.",
   "empty_column.bookmarked_statuses": "Nun tienes nengún artículu en Marcadores. Cuando amiestes dalgún, apaez equí.",
@@ -168,7 +168,7 @@
   "error.unexpected_crash.explanation": "Pola mor d'un fallu nel códigu o un problema de compatibilidá del restolador, esta páxina nun se pudo amosar correutamente.",
   "error.unexpected_crash.explanation_addons": "Esta páxina nun se pudo amosar correutamente. Ye probable que dalgún complementu del restolador o dalguna ferramienta de traducción automática produxere esti error.",
   "error.unexpected_crash.next_steps": "Prueba a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
-  "error.unexpected_crash.next_steps_addons": "Prueba a desactivalos ya a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prueba a desactivalos y a anovar la páxina. Si nun sirve, ye posible que tovía seyas a usar Mastodon pente otru restolador o una aplicación nativa.",
   "explore.search_results": "Resultaos de la busca",
   "explore.suggested_follows": "Perfiles",
   "explore.title": "Esploración",
@@ -179,7 +179,7 @@
   "filter_modal.added.context_mismatch_title": "¡El contestu nun coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de peñera caducó, tienes de camudar la so data de caducidá p'aplicala.",
   "filter_modal.added.expired_title": "¡La peñera caducó!",
-  "filter_modal.added.review_and_configure": "Pa revisar ya configurar a fondu esta categoría de peñera, vete a la {settings_link}.",
+  "filter_modal.added.review_and_configure": "Pa revisar y configurar a fondu esta categoría de peñera, vete a la {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Configuración de la peñera",
   "filter_modal.added.settings_link": "páxina de configuración",
   "filter_modal.added.short_explanation": "Esti artículu amestóse a la categoría de peñera siguiente: {title}.",
@@ -195,8 +195,10 @@
   "follow_request.reject": "Refugar",
   "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
   "follow_suggestions.dismiss": "Nun volver amosar",
+  "follow_suggestions.friends_of_friends_longer": "Ye popular ente los perfiles que sigues",
   "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
   "follow_suggestions.popular_suggestion": "Suxerencia popular",
+  "follow_suggestions.similar_to_recently_followed_longer": "Aseméyase a los perfiles que siguiesti apocayá",
   "follow_suggestions.view_all": "Ver too",
   "follow_suggestions.who_to_follow": "A quién siguir",
   "footer.about": "Tocante a",
@@ -272,6 +274,8 @@
   "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}}",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -281,11 +285,11 @@
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
-  "navigation_bar.follows_and_followers": "Perfiles que sigues ya te siguen",
+  "navigation_bar.follows_and_followers": "Perfiles que sigues y te siguen",
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Zarrar la sesión",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
-  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes ya otres páxines específiques ábrense por defeutu na interfaz web clásica.",
+  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
   "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
@@ -296,13 +300,13 @@
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} solicitó siguite",
   "notification.mention": "{name} mentóte",
-  "notification.poll": "Finó una encuesta na que votesti",
   "notification.reblog": "{name} compartió'l to artículu",
   "notification.status": "{name} ta acabante d'espublizar",
   "notification.update": "{name} editó un artículu",
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
+  "notifications.column_settings.beta.category": "Funciones esperimentales",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
@@ -319,7 +323,7 @@
   "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
   "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
-  "onboarding.start.lead": "Xá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu ya non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
+  "onboarding.start.lead": "Yá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu y non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
   "onboarding.start.skip": "¿Nun precises ayuda pa comenzar?",
   "onboarding.steps.follow_people.body": "Mastodon trata namás de siguir a cuentes interesantes.",
   "onboarding.steps.publish_status.body": "Saluda al mundu con semeyes, vídeos, testu o encuestes {emoji}",
@@ -334,6 +338,8 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
+  "privacy.direct.short": "Perfiles específicos",
+  "privacy.private.short": "Siguidores",
   "privacy.public.short": "Artículu públicu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
@@ -383,10 +389,11 @@
   "report.thanks.take_action": "Equí tienes les opciones pa controlar qué ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mentanto revisamos esti informe, pues tomar midíes contra @{name}:",
   "report.thanks.title": "¿Nun quies ver esti conteníu?",
-  "report.thanks.title_actionable": "Gracies pol informe, el casu xá ta n'investigación.",
+  "report.thanks.title_actionable": "Gracies pol informe, el casu yá ta n'investigación.",
   "report.unfollow": "Dexar de siguir a @{name}",
   "report.unfollow_explanation": "Sigues a esta cuenta. Pa dexar de ver los sos artículos nel to feed d'aniciu, dexa de siguila.",
   "report_notification.attached_statuses": "{count, plural, one {Axuntóse {count} artículu} other {Axuntáronse {count} artículos}}",
+  "report_notification.categories.legal_sentence": "conteníu illegal",
   "report_notification.open": "Abrir l'informe",
   "search.no_recent_searches": "Nun hai nenguna busca recién",
   "search.placeholder": "Buscar",
@@ -396,6 +403,7 @@
   "search.quick_action.status_search": "Artículos que concasen con {x}",
   "search.search_or_paste": "Busca o apiega una URL",
   "search_popout.language_code": "códigu de llingua ISO",
+  "search_popout.options": "Opciones de busca",
   "search_popout.quick_actions": "Aiciones rápides",
   "search_popout.recent": "Busques de recién",
   "search_popout.specific_date": "data específica",
@@ -440,12 +448,13 @@
   "status.reblog": "Compartir",
   "status.reblogged_by": "{name} compartió",
   "status.reblogs.empty": "Naide nun compartió esti artículu. Cuando daquién lo faiga, apaez equí.",
-  "status.redraft": "Desaniciar ya reeditar",
+  "status.redraft": "Desaniciar y reeditar",
   "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al filu",
   "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
+  "status.share": "Compartir",
   "status.show_filter_reason": "Amosar de toes toes",
   "status.show_less": "Amosar menos",
   "status.show_more": "Amosar más",
@@ -472,7 +481,7 @@
   "units.short.thousand": "{count} mil",
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
-  "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
+  "upload_form.audio_description": "Describi'l conteníu pa persones sordes y/o ciegues",
   "upload_form.edit": "Editar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",

app/javascript/mastodon/locales/be.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
   "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
   "notification.own_poll": "Ваша апытанне скончылася",
-  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",

app/javascript/mastodon/locales/bg.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
   "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
-  "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
   "notification.relationships_severance_event": "Изгуби се връзката с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",

app/javascript/mastodon/locales/bn.json

@@ -320,7 +320,6 @@
   "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
   "notification.mention": "{name} আপনাকে উল্লেখ করেছেন",
   "notification.own_poll": "আপনার পোল শেষ হয়েছে",
-  "notification.poll": "আপনি ভোট দিয়েছিলেন এমন এক  নির্বাচনের ভোটের সময় শেষ হয়েছে",
   "notification.reblog": "{name} আপনার কার্যক্রমে সমর্থন দেখিয়েছেন",
   "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে",
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",

app/javascript/mastodon/locales/br.json

@@ -398,7 +398,6 @@
   "notification.mention": "Gant {name} oc'h bet meneget",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
-  "notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
   "notification.status": "Emañ {name} o paouez toudañ",
   "notification.update": "Gant {name} ez eus bet kemmet un toud",

app/javascript/mastodon/locales/ca.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
-  "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",

app/javascript/mastodon/locales/ckb.json

@@ -391,7 +391,6 @@
   "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت",
   "notification.mention": "{name} باسی ئێوەی کرد",
   "notification.own_poll": "ڕاپرسیەکەت کۆتایی هات",
-  "notification.poll": "ڕاپرسییەک کە دەنگی پێداویت کۆتایی هات",
   "notification.reblog": "{name} نووسراوەکەتی دووبارە توتاند",
   "notification.status": "{name} تازە بڵاوکرایەوە",
   "notification.update": "{name} پۆستێکی دەستکاریکرد",

app/javascript/mastodon/locales/co.json

@@ -240,7 +240,6 @@
   "notification.follow_request": "{name} vole abbunassi à u vostru contu",
   "notification.mention": "{name} v'hà mintuvatu",
   "notification.own_poll": "U vostru scandagliu hè compiu",
-  "notification.poll": "Un scandagliu induve avete vutatu hè finitu",
   "notification.reblog": "{name} hà spartutu u vostru statutu",
   "notification.status": "{name} hà appena pubblicatu",
   "notifications.clear": "Purgà e nutificazione",

app/javascript/mastodon/locales/cs.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
-  "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",

app/javascript/mastodon/locales/cy.json

@@ -481,7 +481,6 @@
   "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
-  "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",

app/javascript/mastodon/locales/da.json

@@ -37,6 +37,7 @@
   "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.following": "Følger",
+  "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul boosts fra @{name}",
@@ -62,6 +63,7 @@
   "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "account.unblock": "Afblokér @{name}",
   "account.unblock_domain": "Afblokér domænet {domain}",
   "account.unblock_short": "Afblokér",
@@ -441,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} og {count, plural, one {# anden} other {# andre}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -468,6 +472,10 @@
   "navigation_bar.security": "Sikkerhed",
   "not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.",
   "notification.admin.report": "{name} anmeldte {target}",
+  "notification.admin.report_account": "{name} anmeldte {count, plural, one {et indlæg} other {# indlæg}} fra {target} angående {category}",
+  "notification.admin.report_account_other": "{name} anmeldte {count, plural, one {et indlæg} other {# indlæg}} fra {target}",
+  "notification.admin.report_statuses": "{name} anmeldte {target} angående {category}",
+  "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
   "notification.follow": "{name} begyndte at følge dig",
@@ -483,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
-  "notification.poll": "En afstemning, hvori du stemte, er slut",
+  "notification.poll": "En afstemning, hvori du har stemt, er slut",
+  "notification.private_mention": "{name} nævnte dig privat",
   "notification.reblog": "{name} boostede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
   "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
@@ -501,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
+  "notifications.column_settings.beta.category": "Eksperimentelle funktioner",
+  "notifications.column_settings.beta.grouping": "Gruppér notifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
@@ -664,9 +675,13 @@
   "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i dit hjemmefeed, kan du stoppe med at følge dem.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
   "report_notification.categories.legal": "Juridisk",
+  "report_notification.categories.legal_sentence": "ikke-tilladt indhold",
   "report_notification.categories.other": "Andre",
+  "report_notification.categories.other_sentence": "andet",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Regelovertrædelse",
+  "report_notification.categories.violation_sentence": "regelovertrædelse",
   "report_notification.open": "Åbn anmeldelse",
   "search.no_recent_searches": "Ingen seneste søgninger",
   "search.placeholder": "Søg",
@@ -694,8 +709,11 @@
   "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
+  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fediverset.",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
+  "sign_in_banner.follow_anyone": "Følg alle på tværs af fediverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
+  "sign_in_banner.mastodon_is": "Mastodon er den bedste måde at holde sig ajour med, hvad der sker.",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",

app/javascript/mastodon/locales/de.json

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}}",
+  "name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a>",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Sicherheit",
   "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
   "notification.admin.report": "{name} meldete {target}",
+  "notification.admin.report_account": "{name} meldete {count, plural, one {einen Beitrag} other {# Beiträge}} von {target} wegen {category}",
+  "notification.admin.report_account_other": "{name} meldete {count, plural, one {einen Beitrag} other {# Beiträge}} von {target}",
+  "notification.admin.report_statuses": "{name} meldete {target} wegen {category}",
+  "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
   "notification.favourite": "{name} favorisierte deinen Beitrag",
   "notification.follow": "{name} folgt dir",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
+  "notification.private_mention": "{name} hat dich privat erwähnt",
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
+  "notifications.column_settings.beta.category": "Experimentelle Funktionen",
+  "notifications.column_settings.beta.grouping": "Benachrichtigungen gruppieren",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
   "notifications.column_settings.filter_bar.category": "Filterleiste",
@@ -644,7 +653,7 @@
   "report.placeholder": "Ergänzende Hinweise",
   "report.reasons.dislike": "Das gefällt mir nicht",
   "report.reasons.dislike_description": "Das ist etwas, das du nicht sehen möchtest",
-  "report.reasons.legal": "Das ist illegal",
+  "report.reasons.legal": "Das ist rechtswidrig",
   "report.reasons.legal_description": "Du glaubst, dass es gegen die Gesetze deines Landes oder des Landes des Servers verstößt",
   "report.reasons.other": "Es ist etwas anderes",
   "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
   "report_notification.attached_statuses": "{count, plural, one {{count} angehangener Beitrag} other {{count} angehängte Beiträge}}",
   "report_notification.categories.legal": "Rechtliches",
+  "report_notification.categories.legal_sentence": "rechtswidrigem Inhalt",
   "report_notification.categories.other": "Nicht aufgeführt",
+  "report_notification.categories.other_sentence": "etwas anderem",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "Spam",
   "report_notification.categories.violation": "Regelverstoß",
+  "report_notification.categories.violation_sentence": "Regelverletzung",
   "report_notification.open": "Meldung öffnen",
   "search.no_recent_searches": "Keine früheren Suchanfragen",
   "search.placeholder": "Suche",

app/javascript/mastodon/locales/el.json

@@ -389,7 +389,6 @@
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.mention": "Ο/Η {name} σε επισήμανε",
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
-  "notification.poll": "Τελείωσε μια από τις δημοσκοπήσεις που συμμετείχες",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
   "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",

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

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Your account has been limited.",
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",

app/javascript/mastodon/locales/eo.json

@@ -405,7 +405,6 @@
   "notification.follow_request": "{name} petis sekvi vin",
   "notification.mention": "{name} menciis vin",
   "notification.own_poll": "Via enketo finiĝis",
-  "notification.poll": "Partoprenita balotenketo finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.status": "{name} ĵus afiŝis",
   "notification.update": "{name} redaktis afiŝon",

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

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a>",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitás iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.report_account": "{name} denunció {count, plural, one {un mensaje} other {# mensajes}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} denunció {count, plural, one {un mensaje} other {# mensajes}} de {target}",
+  "notification.admin.report_statuses": "{name} denunció a {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} denunció a {target}",
   "notification.admin.sign_up": "Se registró {name}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
@@ -503,6 +510,8 @@
   "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.beta.category": "Funciones experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo a esta cuenta. Para no ver sus mensajes en tu línea temporal principal, dejá de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} mensaje adjunto} other {{count} mensajes adjuntos}}",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otros",
+  "report_notification.categories.other_sentence": "[otras categorías]",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violación de regla",
+  "report_notification.categories.violation_sentence": "violación de regla",
   "report_notification.open": "Abrir denuncia",
   "search.no_recent_searches": "Sin búsquedas recientes",
   "search.placeholder": "Buscar",

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

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.report_account": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target}",
+  "notification.admin.report_statuses": "{name} informó de {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se unio",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
-  "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.poll": "Una encuesta ha terminado",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -503,6 +510,8 @@
   "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.beta.category": "Características experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otro",
+  "report_notification.categories.other_sentence": "otra",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.categories.violation_sentence": "infracción de regla",
   "report_notification.open": "Abrir denuncia",
   "search.no_recent_searches": "Sin búsquedas recientes",
   "search.placeholder": "Buscar",

app/javascript/mastodon/locales/es.json

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
+  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Seguridad",
   "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
   "notification.admin.report": "{name} informó {target}",
+  "notification.admin.report_account": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target} por {category}",
+  "notification.admin.report_account_other": "{name} informó de {count, plural, one {una publicación} other {# publicaciones}} de {target}",
+  "notification.admin.report_statuses": "{name} informó de {target} por {category}",
+  "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se registró",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.follow": "{name} te empezó a seguir",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
-  "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.poll": "Una encuesta ha terminado",
+  "notification.private_mention": "{name} te mencionó en privado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
@@ -503,6 +510,8 @@
   "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.beta.category": "Características experimentales",
+  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otros",
+  "report_notification.categories.other_sentence": "otra",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.categories.violation_sentence": "infracción de regla",
   "report_notification.open": "Abrir informe",
   "search.no_recent_searches": "No hay búsquedas recientes",
   "search.placeholder": "Buscar",

app/javascript/mastodon/locales/et.json

@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Su kontole pandi piirang.",
   "notification.moderation_warning.action_suspend": "Su konto on peatatud.",
   "notification.own_poll": "Su küsitlus on lõppenud",
-  "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
   "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",

app/javascript/mastodon/locales/eu.json

@@ -480,7 +480,6 @@
   "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
   "notification.moderation_warning.action_suspend": "Kontua itxi da.",
   "notification.own_poll": "Zure inkesta amaitu da",
-  "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
   "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",

app/javascript/mastodon/locales/fa.json

@@ -424,7 +424,6 @@
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.mention": "‫{name}‬ به شما اشاره کرد",
   "notification.own_poll": "نظرسنجیتان پایان یافت",
-  "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسیده است",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",

app/javascript/mastodon/locales/fi.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
-  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",

app/javascript/mastodon/locales/fo.json

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} og {count, plural, one {# annar} other {# onnur}}",
+  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# onnur}}</a>",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Trygd",
   "not_signed_in_indicator.not_signed_in": "Tú mást rita inn fyri at fáa atgongd til hetta tilfarið.",
   "notification.admin.report": "{name} hevur meldað {target}",
+  "notification.admin.report_account": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target} fyri {category}",
+  "notification.admin.report_account_other": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target}",
+  "notification.admin.report_statuses": "{name} melaði {target} fyri {category}",
+  "notification.admin.report_statuses_other": "{name} meldaði {target}",
   "notification.admin.sign_up": "{name} meldaði seg til",
   "notification.favourite": "{name} dámdi postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
   "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
-  "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
+  "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
+  "notification.private_mention": "{name} nevndi teg í privatum boðum",
   "notification.reblog": "{name} lyfti tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
   "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
@@ -503,6 +510,8 @@
   "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.beta.category": "Royndarhentleikar",
+  "notifications.column_settings.beta.grouping": "Bólkafrá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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Tú fylgir hesi kontuni. Gevst at fylgja henni, um tú ikki longur ynskir at síggja postarnar á heimarásini hjá tær.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postur atknýttur} other {{count} postar atknýttir}}",
   "report_notification.categories.legal": "Løgfrøðisligt",
+  "report_notification.categories.legal_sentence": "ólógligt innihald",
   "report_notification.categories.other": "Aðrir",
+  "report_notification.categories.other_sentence": "aðrir",
   "report_notification.categories.spam": "Ruskpostur",
+  "report_notification.categories.spam_sentence": "ruskpostur",
   "report_notification.categories.violation": "Brotin regla",
+  "report_notification.categories.violation_sentence": "brot á reglu",
   "report_notification.open": "Opna melding",
   "search.no_recent_searches": "Ongar nýggjar leitingar",
   "search.placeholder": "Leita",

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

@@ -466,7 +466,6 @@
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.mention": "{name} vous a mentionné·e",
   "notification.own_poll": "Votre sondage est terminé",
-  "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",

app/javascript/mastodon/locales/fr.json

@@ -466,7 +466,6 @@
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
-  "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
   "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",

app/javascript/mastodon/locales/fy.json

@@ -455,7 +455,6 @@
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
   "notification.mention": "{name} hat dy fermeld",
   "notification.own_poll": "Jo poll is beëinige",
-  "notification.poll": "In enkête dêr’t jo yn stimd hawwe is beëinige",
   "notification.reblog": "{name} hat jo berjocht boost",
   "notification.relationships_severance_event.learn_more": "Mear ynfo",
   "notification.status": "{name} hat in berjocht pleatst",

app/javascript/mastodon/locales/ga.json

@@ -207,7 +207,7 @@
   "dismissable_banner.dismiss": "Diúltaigh",
   "dismissable_banner.explore_links": "Tá na scéalta nuachta seo á phlé anseo agus ar fhreastalaithe eile ar an líonra díláraithe faoi láthair.",
   "dismissable_banner.explore_statuses": "Is postálacha iad seo ó ar fud an ghréasáin shóisialta atá ag éirí níos tarraingtí inniu. Rangaítear poist níos nuaí le níos mó teanntáin agus ceanáin níos airde.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_tags": "Is hashtags iad seo atá ag tarraingt ar an ngréasán sóisialta inniu. Tá na hashtags a úsáideann níos mó daoine difriúla rangaithe níos airde.",
   "dismissable_banner.public_timeline": "Seo iad na postálacha poiblí is déanaí ó dhaoine ar an ngréasán sóisialta a leanann daoine ar {domain}.",
   "domain_block_modal.block": "Bloc freastalaí",
   "domain_block_modal.block_account_instead": "Cuir bac ar @{name} ina ionad sin",
@@ -263,7 +263,7 @@
   "empty_column.followed_tags": "Níor lean tú aon hashtags fós. Nuair a dhéanann tú, beidh siad a thaispeáint suas anseo.",
   "empty_column.hashtag": "Níl rud ar bith faoin haischlib seo go fóill.",
   "empty_column.home": "Tá d'amlíne baile folamh! B'fhiú duit cúpla duine eile a leanúint lena líonadh! {suggestions}",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.list": "Níl aon rud ar an liosta seo fós. Nuair a fhoilseoidh baill an liosta seo postálacha nua, beidh siad le feiceáil anseo.",
   "empty_column.lists": "Níl aon liostaí fós agat. Nuair a chruthaíonn tú ceann, feicfear anseo é.",
   "empty_column.mutes": "Níl aon úsáideoir balbhaithe agat fós.",
   "empty_column.notification_requests": "Gach soiléir! Níl aon rud anseo. Nuair a gheobhaidh tú fógraí nua, beidh siad le feiceáil anseo de réir do shocruithe.",
@@ -298,7 +298,7 @@
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
   "filtered_notifications_banner.mentions": "{count, plural, one {tagairt} other {tagairtí}}",
-  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {níl éinne} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
+  "filtered_notifications_banner.pending_requests": "Fógraí ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b'fhéidir go mbeadh a fhios agat",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
   "firehose.local": "An freastalaí seo",
@@ -340,7 +340,7 @@
   "hashtag.column_settings.tag_mode.all": "Iad seo go léir",
   "hashtag.column_settings.tag_mode.any": "Aon cheann díobh seo",
   "hashtag.column_settings.tag_mode.none": "Níl aon cheann díobh seo",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Cuir clibeanna breise san áireamh don cholún seo",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} rannpháirtí} two {{counter} rannpháirtí} few {{counter} rannpháirtí} many {{counter} rannpháirtí} other {{counter} rannpháirtí}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} two {{counter} post} few {{counter} post} many {{counter} post} other {{counter} poist}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post inniu} other {{counter} poist inniu}} inniu",
@@ -375,10 +375,10 @@
   "keyboard_shortcuts.back": "Nasclean siar",
   "keyboard_shortcuts.blocked": "Oscail liosta na n-úsáideoirí bactha",
   "keyboard_shortcuts.boost": "Treisigh postáil",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.column": "Colún fócas",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.compose": "Fócas a chumadh textarea",
   "keyboard_shortcuts.description": "Cur síos",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "chun colún lua príobháideach a oscailt",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
   "keyboard_shortcuts.favourite": "Postáil is fearr leat",
@@ -387,12 +387,12 @@
   "keyboard_shortcuts.heading": "Aicearraí méarchláir",
   "keyboard_shortcuts.home": "Oscail amlíne bhaile",
   "keyboard_shortcuts.hotkey": "Eochair aicearra",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "Taispeáin an finscéal seo",
   "keyboard_shortcuts.local": "Oscail an amlíne áitiúil",
   "keyboard_shortcuts.mention": "Luaigh údar",
   "keyboard_shortcuts.muted": "Oscail liosta na n-úsáideoirí balbhaithe",
   "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.notifications": "Oscail colún fógraí",
   "keyboard_shortcuts.open_media": "Oscail meáin",
   "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
@@ -443,6 +443,8 @@
   "mute_modal.title": "An bhfuil fonn ort úsáideoir a bhalbhú?",
   "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
+  "name_and_others": "{name} and {count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}",
+  "name_and_others_with_link": "{name} agus <a>{count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
@@ -468,8 +470,12 @@
   "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
   "navigation_bar.search": "Cuardaigh",
   "navigation_bar.security": "Slándáil",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "Ní mór duit logáil isteach chun rochtain a fháil ar an acmhainn seo.",
   "notification.admin.report": "Tuairiscigh {name} {target}",
+  "notification.admin.report_account": "{name} thuairiscigh {count, plural, one {aon phost} two {# phost} few {# phost} many {# bpost} other {# bpost}} ó {target} do {category}",
+  "notification.admin.report_account_other": "{name} thuairiscigh {count, plural, one {aon phost} two {# phost} few {# phost} many {# bpost} other {# bpost}} ó {target}",
+  "notification.admin.report_statuses": "Thuairiscigh {name} {target} le haghaidh {category}",
+  "notification.admin.report_statuses_other": "{name} tuairiscithe {target}",
   "notification.admin.sign_up": "Chláraigh {name}",
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.follow": "Lean {name} thú",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Tá do chuntas teoranta.",
   "notification.moderation_warning.action_suspend": "Cuireadh do chuntas ar fionraí.",
   "notification.own_poll": "Tá do suirbhé críochnaithe",
-  "notification.poll": "Tá suirbhé inar vótáil tú tar éis críochnú",
+  "notification.poll": "Tá deireadh le vótaíocht inar vótáil tú",
+  "notification.private_mention": "luaigh {name} tú go príobháideach",
   "notification.reblog": "Mhol {name} do phostáil",
   "notification.relationships_severance_event": "Cailleadh naisc le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir riarthóir ó {from} {target} ar fionraí, rud a chiallaíonn nach féidir leat nuashonruithe a fháil uathu a thuilleadh ná idirghníomhú leo.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
+  "notifications.column_settings.beta.category": "Gnéithe turgnamhacha",
+  "notifications.column_settings.beta.grouping": "Fógraí grúpa",
   "notifications.column_settings.favourite": "Ceanáin:",
   "notifications.column_settings.filter_bar.advanced": "Taispeáin gach catagóir",
   "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Tá tú ag leanúint an chuntais seo. Chun nach bhfeicfidh tú a bpoist i do fhotha baile a thuilleadh, dílean ​​iad.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "Dlíthiúil",
+  "report_notification.categories.legal_sentence": "ábhar mídhleathach",
   "report_notification.categories.other": "Eile",
+  "report_notification.categories.other_sentence": "eile",
   "report_notification.categories.spam": "Turscar",
+  "report_notification.categories.spam_sentence": "turscar",
   "report_notification.categories.violation": "Sárú rialach",
+  "report_notification.categories.violation_sentence": "sárú riail",
   "report_notification.open": "Oscail tuairisc",
   "search.no_recent_searches": "Níl aon chuardach le déanaí",
   "search.placeholder": "Cuardaigh",
@@ -787,11 +800,11 @@
   "upload_button.label": "Cuir íomhánna, físeán nó comhad fuaime leis",
   "upload_error.limit": "Sáraíodh an teorainn uaslódála comhaid.",
   "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Déan cur síos ar dhaoine bodhra nó lagéisteachta",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
   "upload_form.thumbnail": "Athraigh mionsamhail",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Déan cur síos ar dhaoine atá bodhar, lagéisteachta, dall nó lagamhairc",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
   "upload_modal.applying": "Á gcur i bhfeidhm…",

app/javascript/mastodon/locales/gd.json

@@ -470,7 +470,6 @@
   "notification.mention": "Thug {name} iomradh ort",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
-  "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
   "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",

app/javascript/mastodon/locales/gl.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
-  "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",

app/javascript/mastodon/locales/he.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
   "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
-  "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
   "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",

app/javascript/mastodon/locales/hr.json

@@ -342,7 +342,6 @@
   "notification.follow_request": "{name} zatražio/la je da Vas prati",
   "notification.mention": "{name} Vas je spomenuo",
   "notification.own_poll": "Vaša anketa je završila",
-  "notification.poll": "Anketa u kojoj ste glasali je završila",
   "notification.reblog": "{name} je boostao/la Vaš status",
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",

app/javascript/mastodon/locales/hu.json

@@ -443,6 +443,8 @@
   "mute_modal.title": "Elnémítsuk a felhasználót?",
   "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
+  "name_and_others": "{name} és {count, plural, one {# másik} other {# másik}}",
+  "name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a>",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Biztonság",
   "not_signed_in_indicator.not_signed_in": "Az erőforrás eléréséhez be kell jelentkezned.",
   "notification.admin.report": "{name} jelentette: {target}",
+  "notification.admin.report_account": "{name} jelentett {count, plural, one {egy bejegyzést} other {# bejegyzést}} itt: {target}, ezért: {category}",
+  "notification.admin.report_account_other": "{name} jelentett {count, plural, one {egy bejegyzést} other {# bejegyzést}} itt: {target}",
+  "notification.admin.report_statuses": "{name} jelentette: {target}, ezért: {category}",
+  "notification.admin.report_statuses_other": "{name} jelentette: {target}",
   "notification.admin.sign_up": "{name} regisztrált",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
   "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
-  "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
+  "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
+  "notification.private_mention": "{name} privátban megemlített",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
   "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
@@ -503,6 +510,8 @@
   "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.beta.category": "Kísérleti funkciók",
+  "notifications.column_settings.beta.grouping": "Csoporté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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Követed ezt a fiókot. Hogy ne lásd a bejegyzéseit a saját idővonaladon, szüntesd meg a követését.",
   "report_notification.attached_statuses": "{count} bejegyzés mellékelve",
   "report_notification.categories.legal": "Jogi",
+  "report_notification.categories.legal_sentence": "illegális tartalom",
   "report_notification.categories.other": "Egyéb",
+  "report_notification.categories.other_sentence": "egyéb",
   "report_notification.categories.spam": "Kéretlen üzenet",
+  "report_notification.categories.spam_sentence": "kéretlen üzenet",
   "report_notification.categories.violation": "Szabálysértés",
+  "report_notification.categories.violation_sentence": "szabálysértés",
   "report_notification.open": "Bejelentés megnyitása",
   "search.no_recent_searches": "Nincsenek keresési előzmények",
   "search.placeholder": "Keresés",

app/javascript/mastodon/locales/hy.json

@@ -324,7 +324,6 @@
   "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
   "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
-  "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
   "notification.reblog": "{name} տարածեց գրառումդ",
   "notification.status": "{name} հենց նոր գրառում արեց",
   "notification.update": "{name}-ը փոխել է գրառումը",

app/javascript/mastodon/locales/ia.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
   "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
-  "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",

app/javascript/mastodon/locales/id.json

@@ -426,7 +426,6 @@
   "notification.follow_request": "{name} ingin mengikuti Anda",
   "notification.mention": "{name} menyebut Anda",
   "notification.own_poll": "Japat Anda telah berakhir",
-  "notification.poll": "Japat yang Anda ikuti telah berakhir",
   "notification.reblog": "{name} mem-boost kiriman Anda",
   "notification.status": "{name} baru saja mengirim",
   "notification.update": "{name} mengedit kiriman",

app/javascript/mastodon/locales/ie.json

@@ -480,7 +480,6 @@
   "notification.moderation_warning.action_silence": "Tui conto ha esset limitat.",
   "notification.moderation_warning.action_suspend": "Tui conto ha esset suspendet.",
   "notification.own_poll": "Tui balotation ha finit",
-  "notification.poll": "Un balotation in quel tu votat ha finit",
   "notification.reblog": "{name} boostat tui posta",
   "notification.relationships_severance_event": "Perdit conexiones con {name}",
   "notification.relationships_severance_event.account_suspension": "Un admin de {from} ha suspendet {target}, dunc con ti person tu ne plu posse reciver actualisationes ni far interactiones.",

app/javascript/mastodon/locales/io.json

@@ -402,7 +402,6 @@
   "notification.follow_request": "{name} demandas sequar vu",
   "notification.mention": "{name} mencionis tu",
   "notification.own_poll": "Vua votposto finigis",
-  "notification.poll": "Votposto quo havas vua voto finigis",
   "notification.reblog": "{name} repetis tua mesajo",
   "notification.status": "{name} nove postigis",
   "notification.update": "{name} modifikis posto",

app/javascript/mastodon/locales/is.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
-  "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",

app/javascript/mastodon/locales/it.json

@@ -443,6 +443,8 @@
   "mute_modal.title": "Silenziare l'utente?",
   "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
+  "name_and_others": "{name} e {count, plural, one {# un altro} other {# altri}}",
+  "name_and_others_with_link": "{name} e <a>{count, plural, one {# un altro} other {# altri}}</a>",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Sicurezza",
   "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.",
   "notification.admin.report": "{name} ha segnalato {target}",
+  "notification.admin.report_account": "{name} ha segnalato {count, plural, one {un post} other {# post}} da {target} per {category}",
+  "notification.admin.report_account_other": "{name} ha segnalato {count, plural, one {un post} other {# post}} da {target}",
+  "notification.admin.report_statuses": "{name} ha segnalato {target} per {category}",
+  "notification.admin.report_statuses_other": "{name} ha segnalato {target}",
   "notification.admin.sign_up": "{name} si è iscritto",
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
+  "notification.private_mention": "{name} ti ha citato privatamente",
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
+  "notifications.column_settings.beta.category": "Funzioni sperimentali",
+  "notifications.column_settings.beta.grouping": "Notifiche di gruppo",
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Segui questo profilo. Per non visualizzare più i suoi post nel feed della tua home, smetti di seguirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post allegato} other {{count} post allegati}}",
   "report_notification.categories.legal": "Legale",
+  "report_notification.categories.legal_sentence": "contenuti illegali",
   "report_notification.categories.other": "Altro",
+  "report_notification.categories.other_sentence": "altri",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Violazione delle regole",
+  "report_notification.categories.violation_sentence": "violazione delle regole",
   "report_notification.open": "Apri segnalazione",
   "search.no_recent_searches": "Nessuna ricerca recente",
   "search.placeholder": "Cerca",

app/javascript/mastodon/locales/ja.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
   "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
-  "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",

app/javascript/mastodon/locales/kab.json

@@ -383,7 +383,6 @@
   "notification.moderation-warning.learn_more": "Issin ugar",
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "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.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",

app/javascript/mastodon/locales/kk.json

@@ -248,7 +248,6 @@
   "notification.follow_request": "{name} сізге жазылғысы келеді",
   "notification.mention": "{name} сізді атап өтті",
   "notification.own_poll": "Сауалнама аяқталды",
-  "notification.poll": "Бұл сауалнаманың мерзімі аяқталыпты",
   "notification.reblog": "{name} жазбаңызды бөлісті",
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",

app/javascript/mastodon/locales/ko.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
-  "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
   "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",

app/javascript/mastodon/locales/ku.json

@@ -349,7 +349,6 @@
   "notification.follow_request": "{name} dixwazê te bişopîne",
   "notification.mention": "{name} qale te kir",
   "notification.own_poll": "Rapirsîya te qediya",
-  "notification.poll": "Rapirsiyeke ku te deng daye qediya",
   "notification.reblog": "{name} şandiya te bilind kir",
   "notification.status": "{name} niha şand",
   "notification.update": "{name} şandiyek serrast kir",

app/javascript/mastodon/locales/kw.json

@@ -239,7 +239,6 @@
   "notification.follow_request": "{name} a bysis agas holya",
   "notification.mention": "{name} a wrug agas meneges",
   "notification.own_poll": "Agas sondyans a worfennas",
-  "notification.poll": "An sondyans may hwrussowgh ragleva a worfennas",
   "notification.reblog": "{name} a generthas agas post",
   "notification.status": "{name} a wrug nowydh postya",
   "notifications.clear": "Dilea gwarnyansow",

app/javascript/mastodon/locales/la.json

@@ -150,7 +150,6 @@
   "notification.moderation_warning.action_silence": "Ratio tua est limitata.",
   "notification.moderation_warning.action_suspend": "Ratio tua suspensus est.",
   "notification.own_poll": "Suffragium tuum terminatum est.",
-  "notification.poll": "Electione in quam suffragium dedisti finita est.",
   "notification.reblog": "{name} tuum nuntium amplificavit.",
   "notification.relationships_severance_event.account_suspension": "Admin ab {from} {target} suspendit, quod significat nōn iam posse tē novitātēs ab eīs accipere aut cum eīs interagere.",
   "notification.relationships_severance_event.domain_block": "Admin ab {from} {target} obsēcāvit, includēns {followersCount} ex tuīs sectātōribus et {followingCount, plural, one {# ratione} other {# rationibus}} quās sequeris.",

app/javascript/mastodon/locales/lad.json

@@ -457,7 +457,6 @@
   "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
   "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
   "notification.own_poll": "Tu anketa eskapo",
-  "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
   "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
   "notification.relationships_severance_event.learn_more": "Ambezate mas",

app/javascript/mastodon/locales/lt.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
   "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
-  "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
   "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",

app/javascript/mastodon/locales/lv.json

@@ -440,7 +440,6 @@
   "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
   "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
   "notification.own_poll": "Tava aptauja ir noslēgusies",
-  "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
   "notification.reblog": "{name} pastiprināja Tavu ierakstu",
   "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
   "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",

app/javascript/mastodon/locales/ms.json

@@ -421,7 +421,6 @@
   "notification.follow_request": "{name} meminta untuk mengikuti anda",
   "notification.mention": "{name} menyebut anda",
   "notification.own_poll": "Undian anda telah tamat",
-  "notification.poll": "Sebuah undian yang anda undi telah tamat",
   "notification.reblog": "{name} menggalak hantaran anda",
   "notification.status": "{name} baru sahaja mengirim hantaran",
   "notification.update": "{name} menyunting hantaran",

app/javascript/mastodon/locales/my.json

@@ -402,7 +402,6 @@
   "notification.follow_request": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
   "notification.mention": "{name} က သင့်ကို ဖော်ပြခဲ့သည်",
   "notification.own_poll": "စစ်တမ်းကောက်မှု ပြီးဆုံးပါပြီ",
-  "notification.poll": "သင်ပါဝင်ခဲ့သော စစ်တမ်းပြီးပါပြီ",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} က အခုလေးတင် ပို့စ်တင်လိုက်ပါပြီ",
   "notification.update": "{name} က ပို့စ်တစ်ခုကို ပြင်ဆင်ခဲ့သည်",

app/javascript/mastodon/locales/nl.json

@@ -443,6 +443,8 @@
   "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.",
+  "name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}}",
+  "name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a>",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Beveiliging",
   "not_signed_in_indicator.not_signed_in": "Je moet inloggen om toegang tot deze informatie te krijgen.",
   "notification.admin.report": "{name} heeft {target} geapporteerd",
+  "notification.admin.report_account": "{name} rapporteerde {count, plural, one {een bericht} other {# berichten}} van {target} voor {category}",
+  "notification.admin.report_account_other": "{name} rapporteerde {count, plural, one {een bericht} other {# berichten}} van {target}",
+  "notification.admin.report_statuses": "{name} rapporteerde {target} voor {category}",
+  "notification.admin.report_statuses_other": "{name} rapporteerde {target}",
   "notification.admin.sign_up": "{name} heeft zich geregistreerd",
   "notification.favourite": "{name} markeerde jouw bericht als favoriet",
   "notification.follow": "{name} volgt jou nu",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
-  "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
+  "notification.poll": "Een peiling waaraan je hebt deelgenomen, is verlopen",
+  "notification.private_mention": "{name} heeft je privé genoemd",
   "notification.reblog": "{name} boostte jouw bericht",
   "notification.relationships_severance_event": "Verloren verbindingen met {name}",
   "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
+  "notifications.column_settings.beta.category": "Experimentele functies",
+  "notifications.column_settings.beta.grouping": "Groepsmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Je volgt dit account. Om diens berichten niet meer op jouw starttijdlijn te zien, kun je diegene ontvolgen.",
   "report_notification.attached_statuses": "{count, plural, one {{count} bericht} other {{count} berichten}} toegevoegd",
   "report_notification.categories.legal": "Juridisch",
+  "report_notification.categories.legal_sentence": "illegale inhoud",
   "report_notification.categories.other": "Overig",
+  "report_notification.categories.other_sentence": "overig",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Overtreden regel(s)",
+  "report_notification.categories.violation_sentence": "regel overtreden",
   "report_notification.open": "Rapportage openen",
   "search.no_recent_searches": "Geen recente zoekopdrachten",
   "search.placeholder": "Zoeken",

app/javascript/mastodon/locales/nn.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
   "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
-  "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.relationships_severance_event": "Tapte samband med {name}",
   "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",

app/javascript/mastodon/locales/no.json

@@ -414,7 +414,6 @@
   "notification.follow_request": "{name} har bedt om å få følge deg",
   "notification.mention": "{name} nevnte deg",
   "notification.own_poll": "Avstemningen din er ferdig",
-  "notification.poll": "En avstemning du stemte på har avsluttet",
   "notification.reblog": "{name} fremhevet ditt innlegg",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte et innlegg",

app/javascript/mastodon/locales/oc.json

@@ -357,7 +357,6 @@
   "notification.follow_request": "{name} a demandat a vos sègre",
   "notification.mention": "{name} vos a mencionat",
   "notification.own_poll": "Vòstre sondatge es acabat",
-  "notification.poll": "Avètz participat a un sondatge que ven de s’acabar",
   "notification.reblog": "{name} a partejat vòstre estatut",
   "notification.status": "{name} ven de publicar",
   "notification.update": "{name} modiquè sa publicacion",

app/javascript/mastodon/locales/pl.json

@@ -443,6 +443,8 @@
   "mute_modal.title": "Wyciszyć użytkownika?",
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
+  "name_and_others": "{name} i {count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}",
+  "name_and_others_with_link": "{name} i <a>{count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}</a>",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Bezpieczeństwo",
   "not_signed_in_indicator.not_signed_in": "Musisz się zalogować, aby uzyskać dostęp do tego zasobu.",
   "notification.admin.report": "{name} zgłosił {target}",
+  "notification.admin.report_account": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target} w kategorii {category}",
+  "notification.admin.report_account_other": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target}",
+  "notification.admin.report_statuses": "{name} zgłosił(a) {target} w kategorii {category}",
+  "notification.admin.report_statuses_other": "{name} zgłosił(a) {target}",
   "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
   "notification.follow": "{name} obserwuje Cię",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
   "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
-  "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
+  "notification.poll": "Głosowanie, w którym brałeś(-aś) udział, zostało zakończone",
+  "notification.private_mention": "{name} prywatnie o tobie wspomniał(a)",
   "notification.reblog": "Twój post został podbity przez {name}",
   "notification.relationships_severance_event": "Utracone związki z {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
@@ -502,6 +509,8 @@
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
+  "notifications.column_settings.beta.category": "Funkcje eksperymentalne",
+  "notifications.column_settings.beta.grouping": "Powiadomienia grupowe",
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
@@ -665,9 +674,13 @@
   "report.unfollow_explanation": "Obserwujesz to konto. Jeśli nie chcesz już widzieć postów z tego konta w swojej głównej osi czasu, przestań je obserwować.",
   "report_notification.attached_statuses": "{count, plural, one {{count} wpis} few {{count} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "report_notification.categories.legal": "Prawne",
+  "report_notification.categories.legal_sentence": "treść nielegalna",
   "report_notification.categories.other": "Inne",
+  "report_notification.categories.other_sentence": "inne",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Naruszenie zasad",
+  "report_notification.categories.violation_sentence": "naruszenie zasad",
   "report_notification.open": "Otwórz zgłoszenie",
   "search.no_recent_searches": "Brak ostatnich wyszukiwań",
   "search.placeholder": "Szukaj",

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

@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
-  "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",

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

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
   "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua votação terminou",
-  "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",

app/javascript/mastodon/locales/ro.json

@@ -393,7 +393,6 @@
   "notification.follow_request": "{name} a trimis o cerere de abonare",
   "notification.mention": "{name} te-a menționat",
   "notification.own_poll": "Sondajul tău s-a încheiat",
-  "notification.poll": "Un sondaj pentru care ai votat s-a încheiat",
   "notification.reblog": "{name} ți-a distribuit postarea",
   "notification.status": "{name} tocmai a postat",
   "notification.update": "{name} și-a modificat o postare",

app/javascript/mastodon/locales/ru.json

@@ -482,7 +482,6 @@
   "notification.moderation_warning.action_silence": "Ваша учётная запись была ограничена.",
   "notification.moderation_warning.action_suspend": "Действие вашей учётной записи приостановлено.",
   "notification.own_poll": "Ваш опрос закончился",
-  "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
   "notification.relationships_severance_event": "Потеряно соединение с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",

app/javascript/mastodon/locales/sa.json

@@ -355,7 +355,6 @@
   "notification.follow_request": "{name} त्वामनुसर्तुमयाचीत्",
   "notification.mention": "{name} त्वामुल्लिलेख",
   "notification.own_poll": "तव निर्वाचनं समाप्तम्",
-  "notification.poll": "यस्मिन्निर्वाचने मतमदास्तन्निर्वाचनं समाप्तम्",
   "notification.reblog": "{name} तव पत्रं बुस्तिमिति अकार्षीत्",
   "notification.status": "{name} अधुना अस्थापयिष्ट",
   "notification.update": "{name} पत्रमेकं समपादयिष्ट",

app/javascript/mastodon/locales/sc.json

@@ -282,7 +282,6 @@
   "notification.follow_request": "{name} at dimandadu de ti sighire",
   "notification.mention": "{name} t'at mentovadu",
   "notification.own_poll": "Sondàgiu acabbadu",
-  "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
   "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
   "notification.status": "{name} at publicadu cosa",
   "notifications.clear": "Lìmpia notìficas",

app/javascript/mastodon/locales/sco.json

@@ -338,7 +338,6 @@
   "notification.follow_request": "{name} is wantin tae follae ye",
   "notification.mention": "{name} menshied ye",
   "notification.own_poll": "Yer poll is duin",
-  "notification.poll": "A poll thit ye votit in is duin",
   "notification.reblog": "{name} heezed yer post",
   "notification.status": "{name} juist postit",
   "notification.update": "{name} editit a post",

app/javascript/mastodon/locales/si.json

@@ -289,7 +289,6 @@
   "notification.follow": "{name} ඔබව අනුගමනය කළා",
   "notification.mention": "{name} ඔබව සඳහන් කර ඇත",
   "notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
-  "notification.poll": "ඔබ ඡන්දය දුන් මත විමසුමක් නිමයි",
   "notification.status": "{name} දැන් පළ කළා",
   "notification.update": "{name} ලිපියක් සංස්කරණය කළා",
   "notifications.clear": "දැනුම්දීම් මකන්න",

app/javascript/mastodon/locales/sk.json

@@ -452,7 +452,6 @@
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
-  "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",

app/javascript/mastodon/locales/sl.json

@@ -443,6 +443,8 @@
   "mute_modal.title": "Utišaj uporabnika?",
   "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
+  "name_and_others": "{name} in {count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}",
+  "name_and_others_with_link": "{name} in <a>{count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}</a>",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Varnost",
   "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.",
   "notification.admin.report": "{name} je prijavil/a {target}",
+  "notification.admin.report_account": "{name} je prijavil/a {count, plural, one {# objavo} two {# objavi} few {# objave} other {# objav}} od {target} zaradi {category}",
+  "notification.admin.report_account_other": "{name} je prijavil/a {count, plural, one {# objavo} two {# objavi} few {# objave} other {# objav}} od {target}",
+  "notification.admin.report_statuses": "{name} je prijavil/a {target} zaradi {category}",
+  "notification.admin.report_statuses_other": "{name} je prijavil/a {target}",
   "notification.admin.sign_up": "{name} se je vpisal/a",
   "notification.favourite": "{name} je vzljubil/a vašo objavo",
   "notification.follow": "{name} vam sledi",
@@ -486,6 +492,7 @@
   "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
+  "notification.private_mention": "{name} vas je zasebno omenil/a",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
   "notification.relationships_severance_event": "Povezave z {name} prekinjene",
   "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
@@ -503,6 +510,8 @@
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
+  "notifications.column_settings.beta.category": "Poskusne funkcionalnosti",
+  "notifications.column_settings.beta.grouping": "Skupine obvestil",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "Temu računu sledite. Da ne boste več videli njegovih objav v svojem domačem viru, mu prenehajte slediti.",
   "report_notification.attached_statuses": "{count, plural, one {{count} objava pripeta} two {{count} objavi pripeti} few {{count} objave pripete} other {{count} objav pripetih}}",
   "report_notification.categories.legal": "Legalno",
+  "report_notification.categories.legal_sentence": "nedovoljena vsebina",
   "report_notification.categories.other": "Drugo",
+  "report_notification.categories.other_sentence": "drugo",
   "report_notification.categories.spam": "Neželeno",
+  "report_notification.categories.spam_sentence": "neželeno",
   "report_notification.categories.violation": "Kršitev pravila",
+  "report_notification.categories.violation_sentence": "kršitev pravila",
   "report_notification.open": "Odpri prijavo",
   "search.no_recent_searches": "Ni nedavnih iskanj",
   "search.placeholder": "Iskanje",

app/javascript/mastodon/locales/sq.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
   "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
-  "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
   "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",

app/javascript/mastodon/locales/sr-Latn.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Vaš nalog je ograničen.",
   "notification.moderation_warning.action_suspend": "Vaš nalog je suspendovan.",
   "notification.own_poll": "Vaša anketa je završena",
-  "notification.poll": "Završena je anketa u kojoj ste glasali",
   "notification.reblog": "{name} je podržao vašu objavu",
   "notification.relationships_severance_event": "Izgubljena veza sa {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator sa {from} je suspendovao {target}, što znači da više ne možete da primate ažuriranja od njih niti da komunicirate sa njima.",

app/javascript/mastodon/locales/sr.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш налог је ограничен.",
   "notification.moderation_warning.action_suspend": "Ваш налог је суспендован.",
   "notification.own_poll": "Ваша анкета је завршена",
-  "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
   "notification.relationships_severance_event": "Изгубљена веза са {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор са {from} је суспендовао {target}, што значи да више не можете да примате ажурирања од њих нити да комуницирате са њима.",

app/javascript/mastodon/locales/sv.json

@@ -469,6 +469,7 @@
   "navigation_bar.security": "Säkerhet",
   "not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.",
   "notification.admin.report": "{name} rapporterade {target}",
+  "notification.admin.report_statuses_other": "{name} rapporterade {target}",
   "notification.admin.sign_up": "{name} registrerade sig",
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
   "notification.follow": "{name} följer dig",
@@ -484,7 +485,7 @@
   "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
   "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
-  "notification.poll": "En omröstning du röstat i har avslutats",
+  "notification.private_mention": "{name} nämnde dig privat",
   "notification.reblog": "{name} boostade ditt inlägg",
   "notification.relationships_severance_event": "Förlorade kontakter med {name}",
   "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
@@ -502,6 +503,7 @@
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
+  "notifications.column_settings.beta.category": "Experimentella funktioner",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
@@ -666,7 +668,9 @@
   "report_notification.attached_statuses": "bifogade {count, plural, one {{count} inlägg} other {{count} inlägg}}",
   "report_notification.categories.legal": "Rättsligt",
   "report_notification.categories.other": "Övrigt",
+  "report_notification.categories.other_sentence": "övrigt",
   "report_notification.categories.spam": "Skräppost",
+  "report_notification.categories.spam_sentence": "skräppost",
   "report_notification.categories.violation": "Regelöverträdelse",
   "report_notification.open": "Öppna rapport",
   "search.no_recent_searches": "Inga sökningar nyligen",

app/javascript/mastodon/locales/ta.json

@@ -278,7 +278,6 @@
   "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்",
   "notification.mention": "{name} நீங்கள் குறிப்பிட்டுள்ளீர்கள்",
   "notification.own_poll": "கருத்துக்கணிப்பு நிறைவடைந்தது",
-  "notification.poll": "நீங்கள் வாக்களித்த வாக்கெடுப்பு முடிவடைந்தது",
   "notification.reblog": "{name} உங்கள் நிலை அதிகரித்தது",
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
   "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",

app/javascript/mastodon/locales/te.json

@@ -187,7 +187,6 @@
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
   "notification.mention": "{name} మిమ్మల్ని ప్రస్తావించారు",
-  "notification.poll": "మీరు పాల్గొనిన ఎన్సిక ముగిసినది",
   "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",

app/javascript/mastodon/locales/th.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
   "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
-  "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
   "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",

app/javascript/mastodon/locales/tok.json

@@ -294,7 +294,6 @@
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
   "notification.moderation-warning.learn_more": "o kama sona e ijo ante",
-  "notification.poll": "sina pana lon pana la pana ni li pini",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",

app/javascript/mastodon/locales/tr.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
   "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
-  "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
   "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",

app/javascript/mastodon/locales/uk.json

@@ -485,7 +485,6 @@
   "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
-  "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",