209 changed files with 841 additions and 2758 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -50,7 +50,6 @@ All notable changes to this project will be documented in this file.
 - **Add search syntax for operators and phrases** ([Gargron](https://github.com/tootsuite/mastodon/pull/11411))
 - **Add REST API for managing featured hashtags** ([noellabo](https://github.com/tootsuite/mastodon/pull/11778))
 - **Add REST API for managing timeline read markers** ([Gargron](https://github.com/tootsuite/mastodon/pull/11762))
- Add `exclude_unreviewed` param to `GET /api/v2/search` REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/11977))
 - **Add ActivityPub secure mode** ([Gargron](https://github.com/tootsuite/mastodon/pull/11269), [ThibG](https://github.com/tootsuite/mastodon/pull/11332), [ThibG](https://github.com/tootsuite/mastodon/pull/11295))
 - Add HTTP signatures to all outgoing ActivityPub GET requests ([Gargron](https://github.com/tootsuite/mastodon/pull/11284), [ThibG](https://github.com/tootsuite/mastodon/pull/11300))
 - Add support for ActivityPub Audio activities ([ThibG](https://github.com/tootsuite/mastodon/pull/11189))
@ -99,7 +98,6 @@ All notable changes to this project will be documented in this file.
 - Change Dockerfile ([Shleeble](https://github.com/tootsuite/mastodon/pull/11710), [ykzts](https://github.com/tootsuite/mastodon/pull/11768), [Shleeble](https://github.com/tootsuite/mastodon/pull/11707))
 - Change supported Node versions to include v12 ([abcang](https://github.com/tootsuite/mastodon/pull/11706))
 - Change Portuguese language from `pt` to `pt-PT` ([Gargron](https://github.com/tootsuite/mastodon/pull/11820))
- Change domain block silence to always require approval on follow ([ThibG](https://github.com/tootsuite/mastodon/pull/11975))

 ### Removed

@ -174,8 +172,6 @@ All notable changes to this project will be documented in this file.
 - Fix URLs counting towards RTL detection ([ahangarha](https://github.com/tootsuite/mastodon/pull/11759))
 - Fix unnecessary status re-rendering in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/11211))
 - Fix http_parser.rb gem not being compiled when no network available ([petabyteboy](https://github.com/tootsuite/mastodon/pull/11444))
- Fix muted text color not applying to all text ([trwnh](https://github.com/tootsuite/mastodon/pull/11996))
- Fix follower/following lists resetting on back-navigation in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/11986))

 ## [2.9.3] - 2019-08-10
 ### Added
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -10,7 +10,6 @@ class AccountsController < ApplicationController
  before_action :set_body_classes

  skip_around_action :set_locale, if: -> { request.format == :json }
-  skip_before_action :require_functional!

  def show
    respond_to do |format|
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@ -33,9 +33,9 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
  def scope_for_collection
    case params[:id]
    when 'featured'
-      return Status.none if @account.blocking?(signed_request_account)
-
-      @account.pinned_statuses
+      @account.statuses.permitted_for(@account, signed_request_account).tap do |scope|
+        scope.merge!(@account.pinned_statuses)
+      end
    else
      raise ActiveRecord::RecordNotFound
    end
--- a/app/controllers/admin/relays_controller.rb
+++ b/app/controllers/admin/relays_controller.rb
@ -3,7 +3,6 @@
 module Admin
  class RelaysController < BaseController
    before_action :set_relay, except: [:index, :new, :create]
-    before_action :require_signatures_enabled!, only: [:new, :create, :enable]

    def index
      authorize :relay, :update?
@ -12,7 +11,7 @@ module Admin

    def new
      authorize :relay, :update?
-      @relay = Relay.new
+      @relay = Relay.new(inbox_url: Relay::PRESET_RELAY)
    end

    def create
@ -55,9 +54,5 @@ module Admin
    def resource_params
      params.require(:relay).permit(:inbox_url)
    end
-
-    def require_signatures_enabled!
-      redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
-    end
  end
 end
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@ -57,8 +57,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
  end

  def pinned_scope
-    return Status.none if @account.blocking?(current_account)
-
    @account.pinned_statuses
  end

--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@ -33,7 +33,7 @@ class Api::V1::AccountsController < Api::BaseController
  def follow
    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs))

-    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
+    options = @account.locked? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }

    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
  end
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@ -22,7 +22,7 @@ class Api::V2::SearchController < Api::BaseController
      params[:q],
      current_account,
      limit_param(RESULTS_LIMIT),
-      search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
+      search_params.merge(resolve: truthy_param?(:resolve))
    )
  end

--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@ -2,7 +2,6 @@

 class CustomCssController < ApplicationController
  skip_before_action :store_current_location
-  skip_before_action :require_functional!

  before_action :set_cache_headers

--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@ -9,8 +9,6 @@ class DirectoriesController < ApplicationController
  before_action :set_tag, only: :show
  before_action :set_accounts

-  skip_before_action :require_functional!
-
  def index
    render :index
  end
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@ -8,7 +8,6 @@ class FollowerAccountsController < ApplicationController
  before_action :set_cache_headers

  skip_around_action :set_locale, if: -> { request.format == :json }
-  skip_before_action :require_functional!

  def index
    respond_to do |format|
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@ -8,7 +8,6 @@ class FollowingAccountsController < ApplicationController
  before_action :set_cache_headers

  skip_around_action :set_locale, if: -> { request.format == :json }
-  skip_before_action :require_functional!

  def index
    respond_to do |format|
--- a/app/controllers/manifests_controller.rb
+++ b/app/controllers/manifests_controller.rb
@ -2,7 +2,6 @@

 class ManifestsController < ApplicationController
  skip_before_action :store_current_location
-  skip_before_action :require_functional!

  def show
    expires_in 3.minutes, public: true
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@ -4,7 +4,6 @@ class MediaController < ApplicationController
  include Authorization

  skip_before_action :store_current_location
-  skip_before_action :require_functional!

  before_action :authenticate_user!, if: :whitelist_mode?
  before_action :set_media_attachment
--- a/app/controllers/media_proxy_controller.rb
+++ b/app/controllers/media_proxy_controller.rb
@ -4,7 +4,6 @@ class MediaProxyController < ApplicationController
  include RoutingHelper

  skip_before_action :store_current_location
-  skip_before_action :require_functional!

  before_action :authenticate_user!, if: :whitelist_mode?

--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@ -7,8 +7,6 @@ class RemoteFollowController < ApplicationController

  before_action :set_body_classes

-  skip_before_action :require_functional!
-
  def new
    @remote_follow = RemoteFollow.new(session_params)
  end
--- a/app/controllers/remote_interaction_controller.rb
+++ b/app/controllers/remote_interaction_controller.rb
@ -10,8 +10,6 @@ class RemoteInteractionController < ApplicationController
  before_action :set_status
  before_action :set_body_classes

-  skip_before_action :require_functional!
-
  def new
    @remote_follow = RemoteFollow.new(session_params)
  end
--- a/app/controllers/settings/migration/redirects_controller.rb
+++ b/app/controllers/settings/migration/redirects_controller.rb
@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class Settings::Migration::RedirectsController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
-  before_action :require_not_suspended!
-
-  skip_before_action :require_functional!
-
-  def new
-    @redirect = Form::Redirect.new
-  end
-
-  def create
-    @redirect = Form::Redirect.new(resource_params.merge(account: current_account))
-
-    if @redirect.valid_with_challenge?(current_user)
-      current_account.update!(moved_to_account: @redirect.target_account)
-      ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
-      redirect_to settings_migration_path, notice: I18n.t('migrations.moved_msg', acct: current_account.moved_to_account.acct)
-    else
-      render :new
-    end
-  end
-
-  def destroy
-    if current_account.moved_to_account_id.present?
-      current_account.update!(moved_to_account: nil)
-      ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
-    end
-
-    redirect_to settings_migration_path, notice: I18n.t('migrations.cancelled_msg')
-  end
-
-  private
-
-  def resource_params
-    params.require(:form_redirect).permit(:acct, :current_password, :current_username)
-  end
-
-  def require_not_suspended!
-    forbidden if current_account.suspended?
-  end
-end
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@ -18,13 +18,24 @@ class Settings::MigrationsController < Settings::BaseController
    @migration = current_account.migrations.build(resource_params)

    if @migration.save_with_challenge(current_user)
-      MoveService.new.call(@migration)
+      current_account.update!(moved_to_account: @migration.target_account)
+      ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
+      ActivityPub::MoveDistributionWorker.perform_async(@migration.id)
      redirect_to settings_migration_path, notice: I18n.t('migrations.moved_msg', acct: current_account.moved_to_account.acct)
    else
      render :show
    end
  end

+  def cancel
+    if current_account.moved_to_account_id.present?
+      current_account.update!(moved_to_account: nil)
+      ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
+    end
+
+    redirect_to settings_migration_path, notice: I18n.t('migrations.cancelled_msg')
+  end
+
  helper_method :on_cooldown?

  private
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@ -19,7 +19,6 @@ class StatusesController < ApplicationController
  before_action :set_autoplay, only: :embed

  skip_around_action :set_locale, if: -> { request.format == :json }
-  skip_before_action :require_functional!, only: [:show, :embed]

  content_security_policy only: :embed do |p|
    p.frame_ancestors(false)
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@ -13,8 +13,6 @@ class TagsController < ApplicationController
  before_action :set_body_classes
  before_action :set_instance_presenter

-  skip_before_action :require_functional!
-
  def show
    respond_to do |format|
      format.html do
--- a/app/controllers/well_known/nodeinfo_controller.rb
+++ b/app/controllers/well_known/nodeinfo_controller.rb
@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module WellKnown
-  class NodeInfoController < ActionController::Base
-    include CacheConcern
-
-    before_action { response.headers['Vary'] = 'Accept' }
-
-    def index
-      expires_in 3.days, public: true
-      render_with_cache json: {}, serializer: NodeInfo::DiscoverySerializer, adapter: NodeInfo::Adapter, expires_in: 3.days, root: 'nodeinfo'
-    end
-
-    def show
-      expires_in 30.minutes, public: true
-      render_with_cache json: {}, serializer: NodeInfo::Serializer, adapter: NodeInfo::Adapter, expires_in: 30.minutes, root: 'nodeinfo'
-    end
-  end
-end
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@ -1,7 +1,6 @@
 import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
-import { openModal } from './modal';

 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
@ -11,8 +10,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';

-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
  return (dispatch, getState) => {
    dispatch(fetchBlocksRequest());
@ -86,14 +83,3 @@ export function expandBlocksFail(error) {
    error,
  };
 };
-
-export function initBlockModal(account) {
-  return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal('BLOCK'));
-  };
-}
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -234,7 +234,7 @@ export function uploadCompose(files) {
            progress[i] = loaded;
            dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
          },
-        }).then(({ data }) => dispatch(uploadComposeSuccess(data, f)));
+        }).then(({ data }) => dispatch(uploadComposeSuccess(data)));
      }).catch(error => dispatch(uploadComposeFail(error)));
    };
  };
@ -289,11 +289,10 @@ export function uploadComposeProgress(loaded, total) {
  };
 };

-export function uploadComposeSuccess(media, file) {
+export function uploadComposeSuccess(media) {
  return {
    type: COMPOSE_UPLOAD_SUCCESS,
    media: media,
-    file: file,
    skipLoading: true,
  };
 };
@ -369,7 +368,6 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
      q: token.slice(1),
      resolve: false,
      limit: 4,
-      exclude_unreviewed: true,
    },
  }).then(({ data }) => {
    dispatch(readyComposeSuggestionsTags(token, data.hashtags));
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@ -14,7 +14,6 @@ import Icon from 'mastodon/components/icon';

 const messages = defineMessages({
  closed: { id: 'poll.closed', defaultMessage: 'Closed' },
-  voted: { id: 'poll.voted', defaultMessage: 'You voted for this answer', description: 'Tooltip of the "voted" checkmark in polls' },
 });

 const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
@ -101,12 +100,11 @@ class Poll extends ImmutablePureComponent {
  };

  renderOption (option, optionIndex, showResults) {
-    const { poll, disabled, intl } = this.props;
-    const pollVotesCount  = poll.get('voters_count') || poll.get('votes_count');
-    const percent         = pollVotesCount === 0 ? 0 : (option.get('votes_count') / pollVotesCount) * 100;
-    const leading         = poll.get('options').filterNot(other => other.get('title') === option.get('title')).every(other => option.get('votes_count') >= other.get('votes_count'));
-    const active          = !!this.state.selected[`${optionIndex}`];
-    const voted           = option.get('voted') || (poll.get('own_votes') && poll.get('own_votes').includes(optionIndex));
+    const { poll, disabled } = this.props;
+    const percent            = poll.get('votes_count') === 0 ? 0 : (option.get('votes_count') / poll.get('votes_count')) * 100;
+    const leading            = poll.get('options').filterNot(other => other.get('title') === option.get('title')).every(other => option.get('votes_count') > other.get('votes_count'));
+    const active             = !!this.state.selected[`${optionIndex}`];
+    const voted              = option.get('voted') || (poll.get('own_votes') && poll.get('own_votes').includes(optionIndex));

    let titleEmojified = option.get('title_emojified');
    if (!titleEmojified) {
@ -136,7 +134,7 @@ class Poll extends ImmutablePureComponent {

          {!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
          {showResults && <span className='poll__number'>
-            {!!voted && <Icon id='check' className='poll__vote__mark' title={intl.formatMessage(messages.voted)} />}
+            {!!voted && <Icon id='check' className='poll__vote__mark' />}
            {Math.round(percent)}%
          </span>}

@ -158,14 +156,6 @@ class Poll extends ImmutablePureComponent {
    const showResults   = poll.get('voted') || expired;
    const disabled      = this.props.disabled || Object.entries(this.state.selected).every(item => !item);

-    let votesCount = null;
-
-    if (poll.get('voters_count') !== null && poll.get('voters_count') !== undefined) {
-      votesCount = <FormattedMessage id='poll.total_people' defaultMessage='{count, plural, one {# person} other {# people}}' values={{ count: poll.get('voters_count') }} />;
-    } else {
-      votesCount = <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />;
-    }
-
    return (
      <div className='poll'>
        <ul>
@ -175,7 +165,7 @@ class Poll extends ImmutablePureComponent {
        <div className='poll__footer'>
          {!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
          {showResults && !this.props.disabled && <span><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </span>}
-          {votesCount}
+          <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />
          {poll.get('expires_at') && <span> · {timeRemaining}</span>}
        </div>
      </div>
--- a/app/javascript/mastodon/containers/media_container.js
+++ b/app/javascript/mastodon/containers/media_container.js
@ -2,17 +2,17 @@ import React, { PureComponent, Fragment } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import { IntlProvider, addLocaleData } from 'react-intl';
-import { List as ImmutableList, fromJS } from 'immutable';
-import { getLocale } from 'mastodon/locales';
-import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
-import MediaGallery from 'mastodon/components/media_gallery';
+import { getLocale } from '../locales';
+import MediaGallery from '../components/media_gallery';
+import Video from '../features/video';
+import Card from '../features/status/components/card';
 import Poll from 'mastodon/components/poll';
 import Hashtag from 'mastodon/components/hashtag';
-import ModalRoot from 'mastodon/components/modal_root';
-import MediaModal from 'mastodon/features/ui/components/media_modal';
-import Video from 'mastodon/features/video';
-import Card from 'mastodon/features/status/components/card';
 import Audio from 'mastodon/features/audio';
+import ModalRoot from '../components/modal_root';
+import { getScrollbarWidth } from '../features/ui/components/modal_root';
+import MediaModal from '../features/ui/components/media_modal';
+import { List as ImmutableList, fromJS } from 'immutable';

 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@ -1,3 +1,4 @@
+import React from 'react';
 import { connect } from 'react-redux';
 import Status from '../components/status';
 import { makeGetStatus } from '../selectors';
@ -14,6 +15,7 @@ import {
  pin,
  unpin,
 } from '../actions/interactions';
+import { blockAccount } from '../actions/accounts';
 import {
  muteStatus,
  unmuteStatus,
@ -22,10 +24,9 @@ import {
  revealStatus,
 } from '../actions/statuses';
 import { initMuteModal } from '../actions/mutes';
-import { initBlockModal } from '../actions/blocks';
 import { initReport } from '../actions/reports';
 import { openModal } from '../actions/modal';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { boostModal, deleteModal } from '../initial_state';
 import { showAlertForError } from '../actions/alerts';

@ -34,8 +35,10 @@ const messages = defineMessages({
  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
+  blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
 });

 const makeMapStateToProps = () => {
@ -135,7 +138,16 @@ const mapDispatchToProps = (dispatch, { intl }) => ({

  onBlock (status) {
    const account = status.get('account');
-    dispatch(initBlockModal(account));
+    dispatch(openModal('CONFIRM', {
+      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      confirm: intl.formatMessage(messages.blockConfirm),
+      onConfirm: () => dispatch(blockAccount(account.get('id'))),
+      secondary: intl.formatMessage(messages.blockAndReport),
+      onSecondary: () => {
+        dispatch(blockAccount(account.get('id')));
+        dispatch(initReport(account, status));
+      },
+    }));
  },

  onReport (status) {
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@ -5,6 +5,7 @@ import Header from '../components/header';
 import {
  followAccount,
  unfollowAccount,
+  blockAccount,
  unblockAccount,
  unmuteAccount,
  pinAccount,
@ -15,7 +16,6 @@ import {
  directCompose,
 } from '../../../actions/compose';
 import { initMuteModal } from '../../../actions/mutes';
-import { initBlockModal } from '../../../actions/blocks';
 import { initReport } from '../../../actions/reports';
 import { openModal } from '../../../actions/modal';
 import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
@ -25,7 +25,9 @@ import { List as ImmutableList } from 'immutable';

 const messages = defineMessages({
  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
+  blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
+  blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
 });

 const makeMapStateToProps = () => {
@ -62,7 +64,16 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    if (account.getIn(['relationship', 'blocking'])) {
      dispatch(unblockAccount(account.get('id')));
    } else {
-      dispatch(initBlockModal(account));
+      dispatch(openModal('CONFIRM', {
+        message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+        confirm: intl.formatMessage(messages.blockConfirm),
+        onConfirm: () => dispatch(blockAccount(account.get('id'))),
+        secondary: intl.formatMessage(messages.blockAndReport),
+        onSecondary: () => {
+          dispatch(blockAccount(account.get('id')));
+          dispatch(initReport(account));
+        },
+      }));
    }
  },

--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@ -27,9 +27,7 @@ class Favourites extends ImmutablePureComponent {
  };

  componentWillMount () {
-    if (!this.props.accountIds) {
-      this.props.dispatch(fetchFavourites(this.props.params.statusId));
-    }
+    this.props.dispatch(fetchFavourites(this.props.params.statusId));
  }

  componentWillReceiveProps (nextProps) {
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@ -40,10 +40,8 @@ class Followers extends ImmutablePureComponent {
  };

  componentWillMount () {
-    if (!this.props.accountIds) {
-      this.props.dispatch(fetchAccount(this.props.params.accountId));
-      this.props.dispatch(fetchFollowers(this.props.params.accountId));
-    }
+    this.props.dispatch(fetchAccount(this.props.params.accountId));
+    this.props.dispatch(fetchFollowers(this.props.params.accountId));
  }

  componentWillReceiveProps (nextProps) {
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@ -40,10 +40,8 @@ class Following extends ImmutablePureComponent {
  };

  componentWillMount () {
-    if (!this.props.accountIds) {
-      this.props.dispatch(fetchAccount(this.props.params.accountId));
-      this.props.dispatch(fetchFollowing(this.props.params.accountId));
-    }
+    this.props.dispatch(fetchAccount(this.props.params.accountId));
+    this.props.dispatch(fetchFollowing(this.props.params.accountId));
  }

  componentWillReceiveProps (nextProps) {
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@ -77,14 +77,16 @@ class GettingStarted extends ImmutablePureComponent {
  };

  componentDidMount () {
-    const { fetchFollowRequests, multiColumn } = this.props;
+    const { myAccount, fetchFollowRequests, multiColumn } = this.props;

    if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
      this.context.router.history.replace('/timelines/home');
      return;
    }

-    fetchFollowRequests();
+    if (myAccount.get('locked')) {
+      fetchFollowRequests();
+    }
  }

  render () {
@ -132,7 +134,7 @@ class GettingStarted extends ImmutablePureComponent {

    height += 48*3;

-    if (myAccount.get('locked') || unreadFollowRequests > 0) {
+    if (myAccount.get('locked')) {
      navItems.push(<ColumnLink key={i++} icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
      height += 48;
    }
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.js
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.js
@ -64,7 +64,7 @@ class FilterBar extends React.PureComponent {
          onClick={this.onClick('mention')}
          title={intl.formatMessage(tooltips.mentions)}
        >
-          <Icon id='reply-all' fixedWidth />
+          <Icon id='at' fixedWidth />
        </button>
        <button
          className={selectedFilter === 'favourite' ? 'active' : ''}
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@ -27,9 +27,7 @@ class Reblogs extends ImmutablePureComponent {
  };

  componentWillMount () {
-    if (!this.props.accountIds) {
-      this.props.dispatch(fetchReblogs(this.props.params.statusId));
-    }
+    this.props.dispatch(fetchReblogs(this.props.params.statusId));
  }

  componentWillReceiveProps(nextProps) {
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@ -1,3 +1,4 @@
+import React from 'react';
 import { connect } from 'react-redux';
 import DetailedStatus from '../components/detailed_status';
 import { makeGetStatus } from '../../../selectors';
@ -14,6 +15,7 @@ import {
  pin,
  unpin,
 } from '../../../actions/interactions';
+import { blockAccount } from '../../../actions/accounts';
 import {
  muteStatus,
  unmuteStatus,
@ -22,10 +24,9 @@ import {
  revealStatus,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
-import { initBlockModal } from '../../../actions/blocks';
 import { initReport } from '../../../actions/reports';
 import { openModal } from '../../../actions/modal';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { boostModal, deleteModal } from '../../../initial_state';
 import { showAlertForError } from '../../../actions/alerts';

@ -34,8 +35,10 @@ const messages = defineMessages({
  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
+  blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
 });

 const makeMapStateToProps = () => {
@ -135,7 +138,16 @@ const mapDispatchToProps = (dispatch, { intl }) => ({

  onBlock (status) {
    const account = status.get('account');
-    dispatch(initBlockModal(account));
+    dispatch(openModal('CONFIRM', {
+      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      confirm: intl.formatMessage(messages.blockConfirm),
+      onConfirm: () => dispatch(blockAccount(account.get('id'))),
+      secondary: intl.formatMessage(messages.blockAndReport),
+      onSecondary: () => {
+        dispatch(blockAccount(account.get('id')));
+        dispatch(initReport(account, status));
+      },
+    }));
  },

  onReport (status) {
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@ -23,6 +23,7 @@ import {
  mentionCompose,
  directCompose,
 } from '../../actions/compose';
+import { blockAccount } from '../../actions/accounts';
 import {
  muteStatus,
  unmuteStatus,
@ -31,7 +32,6 @@ import {
  revealStatus,
 } from '../../actions/statuses';
 import { initMuteModal } from '../../actions/mutes';
-import { initBlockModal } from '../../actions/blocks';
 import { initReport } from '../../actions/reports';
 import { makeGetStatus } from '../../selectors';
 import { ScrollContainer } from 'react-router-scroll-4';
@ -39,7 +39,7 @@ import ColumnBackButton from '../../components/column_back_button';
 import ColumnHeader from '../../components/column_header';
 import StatusContainer from '../../containers/status_container';
 import { openModal } from '../../actions/modal';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 import { boostModal, deleteModal } from '../../initial_state';
@ -52,11 +52,13 @@ const messages = defineMessages({
  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
+  blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
  revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
  hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
  detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+  blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
 });

 const makeMapStateToProps = () => {
@ -294,9 +296,19 @@ class Status extends ImmutablePureComponent {
  }

  handleBlockClick = (status) => {
-    const { dispatch } = this.props;
+    const { dispatch, intl } = this.props;
    const account = status.get('account');
-    dispatch(initBlockModal(account));
+
+    dispatch(openModal('CONFIRM', {
+      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      confirm: intl.formatMessage(messages.blockConfirm),
+      onConfirm: () => dispatch(blockAccount(account.get('id'))),
+      secondary: intl.formatMessage(messages.blockAndReport),
+      onSecondary: () => {
+        dispatch(blockAccount(account.get('id')));
+        dispatch(initReport(account, status));
+      },
+    }));
  }

  handleReport = (status) => {
--- a/app/javascript/mastodon/features/ui/components/block_modal.js
+++ b/app/javascript/mastodon/features/ui/components/block_modal.js
@ -1,103 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import { injectIntl, FormattedMessage } from 'react-intl';
-import { makeGetAccount } from '../../../selectors';
-import Button from '../../../components/button';
-import { closeModal } from '../../../actions/modal';
-import { blockAccount } from '../../../actions/accounts';
-import { initReport } from '../../../actions/reports';
-
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
-
-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
-
-    onClose() {
-      dispatch(closeModal());
-    },
-  };
-};
-
-export default @connect(makeMapStateToProps, mapDispatchToProps)
-@injectIntl
-class BlockModal extends React.PureComponent {
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  componentDidMount() {
-    this.button.focus();
-  }
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  }
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  }
-
-  handleCancel = () => {
-    this.props.onClose();
-  }
-
-  setRef = (c) => {
-    this.button = c;
-  }
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-        </div>
-
-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
-            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} ref={this.setRef}>
-            <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-}
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
@ -173,17 +173,7 @@ class FocalPointModal extends ImmutablePureComponent {
        langPath: `${assetHost}/ocr/lang-data`,
      });

-      let media_url = media.get('file');
-
-      if (window.URL && URL.createObjectURL) {
-        try {
-          media_url = URL.createObjectURL(media.get('file'));
-        } catch (error) {
-          console.error(error);
-        }
-      }
-
-      worker.recognize(media_url)
+      worker.recognize(media.get('url'))
        .progress(({ progress }) => this.setState({ progress }))
        .finally(() => worker.terminate())
        .then(({ text }) => this.setState({ description: removeExtraLineBreaks(text), dirty: true, detecting: false }))
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
-import Base from 'mastodon/components/modal_root';
+import Base from '../../../components/modal_root';
 import BundleContainer from '../containers/bundle_container';
 import BundleModalError from './bundle_modal_error';
 import ModalLoading from './modal_loading';
@ -13,7 +12,6 @@ import ConfirmationModal from './confirmation_modal';
 import FocalPointModal from './focal_point_modal';
 import {
  MuteModal,
-  BlockModal,
  ReportModal,
  EmbedModal,
  ListEditor,
@ -26,7 +24,6 @@ const MODAL_COMPONENTS = {
  'BOOST': () => Promise.resolve({ default: BoostModal }),
  'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
  'MUTE': MuteModal,
-  'BLOCK': BlockModal,
  'REPORT': ReportModal,
  'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
  'EMBED': EmbedModal,
@ -35,6 +32,28 @@ const MODAL_COMPONENTS = {
  'LIST_ADDER':ListAdder,
 };

+let cachedScrollbarWidth = null;
+
+export const getScrollbarWidth = () => {
+  if (cachedScrollbarWidth !== null) {
+    return cachedScrollbarWidth;
+  }
+
+  const outer = document.createElement('div');
+  outer.style.visibility = 'hidden';
+  outer.style.overflow = 'scroll';
+  document.body.appendChild(outer);
+
+  const inner = document.createElement('div');
+  outer.appendChild(inner);
+
+  const scrollbarWidth = outer.offsetWidth - inner.offsetWidth;
+  cachedScrollbarWidth = scrollbarWidth;
+  outer.parentNode.removeChild(outer);
+
+  return scrollbarWidth;
+};
+
 export default class ModalRoot extends React.PureComponent {

  static propTypes = {
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@ -11,6 +11,7 @@ import { toggleHideNotifications } from '../../../actions/mutes';

 const mapStateToProps = state => {
  return {
+    isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
    account: state.getIn(['mutes', 'new', 'account']),
    notifications: state.getIn(['mutes', 'new', 'notifications']),
  };
@ -37,6 +38,7 @@ export default @connect(mapStateToProps, mapDispatchToProps)
 class MuteModal extends React.PureComponent {

  static propTypes = {
+    isSubmitting: PropTypes.bool.isRequired,
    account: PropTypes.object.isRequired,
    notifications: PropTypes.bool.isRequired,
    onClose: PropTypes.func.isRequired,
@ -79,16 +81,11 @@ class MuteModal extends React.PureComponent {
              values={{ name: <strong>@{account.get('acct')}</strong> }}
            />
          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
+          <div>
+            <label htmlFor='mute-modal__hide-notifications-checkbox'>
              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
+              {' '}
+              <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
            </label>
          </div>
        </div>
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@ -106,10 +106,6 @@ export function MuteModal () {
  return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal');
 }

-export function BlockModal () {
-  return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
-}
-
 export function ReportModal () {
  return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -7,7 +7,7 @@
  "account.cancel_follow_request": "إلغاء طلب المتابَعة",
  "account.direct": "رسالة خاصة إلى @{name}",
  "account.domain_blocked": "النطاق مخفي",
-  "account.edit_profile": "تعديل الملف التعريفي",
+  "account.edit_profile": "تعديل الملف الشخصي",
  "account.endorse": "أوصِ به على صفحتك",
  "account.follow": "تابِع",
  "account.followers": "متابعون",
@ -30,11 +30,11 @@
  "account.posts_with_replies": "التبويقات و الردود",
  "account.report": "ابلِغ عن @{name}",
  "account.requested": "في انتظار الموافقة. اضْغَطْ/ي لإلغاء طلب المتابعة",
-  "account.share": "شارك ملف تعريف @{name}",
+  "account.share": "مشاركة حساب @{name}",
  "account.show_reblogs": "اعرض ترقيات @{name}",
  "account.unblock": "إلغاء الحظر عن @{name}",
  "account.unblock_domain": "فك الخْفى عن {domain}",
-  "account.unendorse": "أزل ترويجه مِن الملف التعريفي",
+  "account.unendorse": "أزل ترويجه مِن الملف الشخصي",
  "account.unfollow": "إلغاء المتابعة",
  "account.unmute": "إلغاء الكتم عن @{name}",
  "account.unmute_notifications": "إلغاء كتم إخطارات @{name}",
@ -53,7 +53,7 @@
  "column.blocks": "الحسابات المحجوبة",
  "column.community": "الخيط العام المحلي",
  "column.direct": "الرسائل المباشرة",
-  "column.directory": "استعرض الملفات التعريفية",
+  "column.directory": "Browse profiles",
  "column.domain_blocks": "النطاقات المخفية",
  "column.favourites": "المفضلة",
  "column.follow_requests": "طلبات المتابعة",
@ -63,7 +63,7 @@
  "column.notifications": "الإخطارات",
  "column.pins": "التبويقات المثبتة",
  "column.public": "الخيط العام الموحد",
-  "column.status": "تبويق",
+  "column.status": "Toot",
  "column_back_button.label": "العودة",
  "column_header.hide_settings": "إخفاء الإعدادات",
  "column_header.moveLeft_settings": "نقل القائمة إلى اليسار",
@ -111,10 +111,10 @@
  "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟",
  "confirmations.unfollow.confirm": "إلغاء المتابعة",
  "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
-  "conversation.delete": "احذف المحادثة",
-  "conversation.mark_as_read": "اعتبرها كمقروءة",
-  "conversation.open": "اعرض المحادثة",
-  "conversation.with": "بـ {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "From known fediverse",
  "directory.local": "From {domain} only",
  "directory.new_arrivals": "الوافدون الجُدد",
@ -136,7 +136,7 @@
  "emoji_button.symbols": "رموز",
  "emoji_button.travel": "الأماكن والسفر",
  "empty_column.account_timeline": "ليس هناك تبويقات!",
-  "empty_column.account_unavailable": "الملف التعريفي غير متوفر",
+  "empty_column.account_unavailable": "الملف الشخصي غير متوفر",
  "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
  "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
  "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
@ -155,7 +155,7 @@
  "follow_request.authorize": "ترخيص",
  "follow_request.reject": "رفض",
  "getting_started.developers": "المُطوِّرون",
-  "getting_started.directory": "دليل الصفحات التعريفية",
+  "getting_started.directory": "دليل المستخدِمين والمستخدِمات",
  "getting_started.documentation": "الدليل",
  "getting_started.heading": "استعدّ للبدء",
  "getting_started.invite": "دعوة أشخاص",
@ -194,7 +194,7 @@
  "introduction.interactions.reply.text": "يمكنكم الرد على تبويقاتكم و تبويقات الآخرين على شكل سلسلة محادثة.",
  "introduction.welcome.action": "هيا بنا!",
  "introduction.welcome.headline": "الخطوات الأولى",
-  "introduction.welcome.text": "مرحبا بكم على الفديفرس! بعد لحظات قليلة ، سيكون بمقدوركم بث رسائل والتحدث إلى أصدقائكم عبر تشكيلة واسعة من الخوادم المختلفة. هذا الخادم ، {domain} ، يستضيف صفحتكم التعريفية ، لذا يجب تذكر اسمه جيدا.",
+  "introduction.welcome.text": "مرحبا بكم على الفديفرس! بعد لحظات قليلة ، سيكون بمقدوركم بث رسائل والتحدث إلى أصدقائكم عبر تشكيلة واسعة من الخوادم المختلفة. هذا الخادم ، {domain} ، يستضيف ملفكم الشخصي ، لذا يجب تذكر اسمه جيدا.",
  "keyboard_shortcuts.back": "للعودة",
  "keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
  "keyboard_shortcuts.boost": "للترقية",
@ -214,10 +214,10 @@
  "keyboard_shortcuts.local": "لفتح الخيط العام المحلي",
  "keyboard_shortcuts.mention": "لذِكر الناشر",
  "keyboard_shortcuts.muted": "لفتح قائمة المستخدِمين المكتومين",
-  "keyboard_shortcuts.my_profile": "لفتح ملفك التعريفي",
+  "keyboard_shortcuts.my_profile": "لفتح ملفك الشخصي",
  "keyboard_shortcuts.notifications": "لفتح عمود الإشعارات",
  "keyboard_shortcuts.pinned": "لفتح قائمة التبويقات المدبسة",
-  "keyboard_shortcuts.profile": "لفتح الملف التعريفي للناشر",
+  "keyboard_shortcuts.profile": "لفتح رابط الناشر",
  "keyboard_shortcuts.reply": "للردّ",
  "keyboard_shortcuts.requests": "لفتح قائمة طلبات المتابعة",
  "keyboard_shortcuts.search": "للتركيز على البحث",
@ -253,7 +253,7 @@
  "navigation_bar.direct": "الرسائل المباشِرة",
  "navigation_bar.discover": "اكتشف",
  "navigation_bar.domain_blocks": "النطاقات المخفية",
-  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
+  "navigation_bar.edit_profile": "تعديل الملف الشخصي",
  "navigation_bar.favourites": "المفضلة",
  "navigation_bar.filters": "الكلمات المكتومة",
  "navigation_bar.follow_requests": "طلبات المتابعة",
@ -299,7 +299,6 @@
  "poll.refresh": "تحديث",
  "poll.total_votes": "{count, plural, one {# صوت} other {# أصوات}}",
  "poll.vote": "صَوّت",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "إضافة استطلاع للرأي",
  "poll_button.remove_poll": "إزالة استطلاع الرأي",
  "privacy.change": "اضبط خصوصية المنشور",
@ -356,7 +355,7 @@
  "status.mute": "أكتم @{name}",
  "status.mute_conversation": "كتم المحادثة",
  "status.open": "وسع هذه المشاركة",
-  "status.pin": "دبّسه على الصفحة التعريفية",
+  "status.pin": "تدبيس على الملف الشخصي",
  "status.pinned": "تبويق مثبَّت",
  "status.read_more": "اقرأ المزيد",
  "status.reblog": "رَقِّي",
@ -376,7 +375,7 @@
  "status.show_thread": "الكشف عن المحادثة",
  "status.uncached_media_warning": "غير متوفر",
  "status.unmute_conversation": "فك الكتم عن المحادثة",
-  "status.unpin": "فك التدبيس من الصفحة التعريفية",
+  "status.unpin": "فك التدبيس من الملف الشخصي",
  "suggestions.dismiss": "إلغاء الاقتراح",
  "suggestions.header": "يمكن أن يهمك…",
  "tabs_bar.federated_timeline": "الموحَّد",
@ -405,7 +404,7 @@
  "upload_modal.detect_text": "Detect text from picture",
  "upload_modal.edit_media": "تعديل الوسائط",
  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preview_label": "معاينة ({ratio})",
+  "upload_modal.preview_label": "Preview ({ratio})",
  "upload_progress.label": "يرفع...",
  "video.close": "إغلاق الفيديو",
  "video.exit_fullscreen": "الخروج من وضع الشاشة المليئة",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -299,7 +299,6 @@
  "poll.refresh": "বদলেছে কিনা দেখতে",
  "poll.total_votes": "{count, plural, one {# ভোট} other {# ভোট}}",
  "poll.vote": "ভোট",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
  "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
  "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -299,7 +299,6 @@
  "poll.refresh": "Actualitza",
  "poll.total_votes": "{count, plural, one {# vot} other {# vots}}",
  "poll.vote": "Vota",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Afegeix una enquesta",
  "poll_button.remove_poll": "Elimina l'enquesta",
  "privacy.change": "Ajusta l'estat de privacitat",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -111,10 +111,10 @@
  "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
  "confirmations.unfollow.confirm": "Disabbunassi",
  "confirmations.unfollow.message": "Site sicuru·a ch'ùn vulete più siguità @{name}?",
-  "conversation.delete": "Sguassà a cunversazione",
-  "conversation.mark_as_read": "Marcà cum'è lettu",
-  "conversation.open": "Vede a cunversazione",
-  "conversation.with": "Cù {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "Da u fediverse cunisciutu",
  "directory.local": "Solu da {domain}",
  "directory.new_arrivals": "Ultimi arrivi",
@ -299,7 +299,6 @@
  "poll.refresh": "Attualizà",
  "poll.total_votes": "{count, plural, one {# votu} other {# voti}}",
  "poll.vote": "Vutà",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Aghjunghje",
  "poll_button.remove_poll": "Toglie u scandagliu",
  "privacy.change": "Mudificà a cunfidenzialità di u statutu",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -299,7 +299,6 @@
  "poll.refresh": "Obnovit",
  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasu} other {# hlasů}}",
  "poll.vote": "Hlasovat",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Přidat anketu",
  "poll_button.remove_poll": "Odstranit anketu",
  "privacy.change": "Změnit soukromí tootu",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -4,7 +4,7 @@
  "account.block": "Blocio @{name}",
  "account.block_domain": "Cuddio popeth rhag {domain}",
  "account.blocked": "Blociwyd",
-  "account.cancel_follow_request": "Canslo cais dilyn",
+  "account.cancel_follow_request": "Cancel follow request",
  "account.direct": "Neges breifat @{name}",
  "account.domain_blocked": "Parth wedi ei guddio",
  "account.edit_profile": "Golygu proffil",
@ -16,7 +16,7 @@
  "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
  "account.follows_you": "Yn eich dilyn chi",
  "account.hide_reblogs": "Cuddio bwstiau o @{name}",
-  "account.last_status": "Gweithredol olaf",
+  "account.last_status": "Last active",
  "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
  "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i gloi. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
  "account.media": "Cyfryngau",
@ -38,11 +38,11 @@
  "account.unfollow": "Dad-ddilyn",
  "account.unmute": "Dad-dawelu @{name}",
  "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
-  "alert.rate_limited.message": "Ceisiwch eto ar ôl {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Cyfradd gyfyngedig",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
  "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
  "alert.unexpected.title": "Wps!",
-  "autosuggest_hashtag.per_week": "{count} yr wythnos",
+  "autosuggest_hashtag.per_week": "{count} per week",
  "boost_modal.combo": "Mae modd gwasgu {combo} er mwyn sgipio hyn tro nesa",
  "bundle_column_error.body": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
  "bundle_column_error.retry": "Ceisiwch eto",
@ -53,7 +53,7 @@
  "column.blocks": "Defnyddwyr a flociwyd",
  "column.community": "Ffrwd lleol",
  "column.direct": "Negeseuon preifat",
-  "column.directory": "Pori proffiliau",
+  "column.directory": "Browse profiles",
  "column.domain_blocks": "Parthau cuddiedig",
  "column.favourites": "Ffefrynnau",
  "column.follow_requests": "Ceisiadau dilyn",
@ -102,7 +102,7 @@
  "confirmations.domain_block.confirm": "Cuddio parth cyfan",
  "confirmations.domain_block.message": "A ydych yn hollol, hollol sicr eich bod am flocio y {domain} cyfan? Yn y nifer helaeth o achosion mae blocio neu tawelu ambell gyfrif yn ddigonol ac yn well. Ni fyddwch yn gweld cynnwys o'r parth hwnnw mewn unrhyw ffrydiau cyhoeddus na chwaith yn eich hysbysiadau. Bydd hyn yn cael gwared o'ch dilynwyr o'r parth hwnnw.",
  "confirmations.logout.confirm": "Allgofnodi",
-  "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
+  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Tawelu",
  "confirmations.mute.message": "Ydych chi'n sicr eich bod am ddistewi {name}?",
  "confirmations.redraft.confirm": "Dileu & ailddrafftio",
@ -111,14 +111,14 @@
  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n sicr yr ydych am barhau?",
  "confirmations.unfollow.confirm": "Dad-ddilynwch",
  "confirmations.unfollow.message": "Ydych chi'n sicr eich bod am ddad-ddilyn {name}?",
-  "conversation.delete": "Dileu sgwrs",
+  "conversation.delete": "Delete conversation",
  "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
-  "conversation.open": "Gweld sgwrs",
-  "conversation.with": "Gyda {names}",
-  "directory.federated": "O ffedysawd hysbys",
-  "directory.local": "O {domain} yn unig",
-  "directory.new_arrivals": "Newydd-ddyfodiaid",
-  "directory.recently_active": "Yn weithredol yn ddiweddar",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
  "embed.instructions": "Mewnblannwch y tŵt hwn ar eich gwefan drwy gopïo'r côd isod.",
  "embed.preview": "Dyma sut olwg fydd arno:",
  "emoji_button.activity": "Gweithgarwch",
@ -174,7 +174,7 @@
  "home.column_settings.basic": "Syml",
  "home.column_settings.show_reblogs": "Dangos bŵstiau",
  "home.column_settings.show_replies": "Dangos ymatebion",
-  "home.column_settings.update_live": "Diweddariad mewn amser real",
+  "home.column_settings.update_live": "Update in real-time",
  "intervals.full.days": "{number, plural, one {# ddydd} other {# o ddyddiau}}",
  "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
  "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
@ -240,7 +240,7 @@
  "lists.new.title_placeholder": "Teitl rhestr newydd",
  "lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
  "lists.subheading": "Eich rhestrau",
-  "load_pending": "{count, plural, one {# eitem newydd} other {# eitemau newydd}}",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
  "loading_indicator.label": "Llwytho...",
  "media_gallery.toggle_visible": "Toglo gwelededd",
  "missing_indicator.label": "Heb ei ganfod",
@ -268,7 +268,7 @@
  "navigation_bar.preferences": "Dewisiadau",
  "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
  "navigation_bar.security": "Diogelwch",
-  "notification.and_n_others": "a {count, plural, one {# arall} other {# eraill}}",
+  "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
  "notification.favourite": "hoffodd {name} eich tŵt",
  "notification.follow": "dilynodd {name} chi",
  "notification.mention": "Soniodd {name} amdanoch chi",
@ -299,7 +299,6 @@
  "poll.refresh": "Adnewyddu",
  "poll.total_votes": "{count, plural, one {# bleidlais} other {# o bleidleisiau}}",
  "poll.vote": "Pleidleisio",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Ychwanegu pleidlais",
  "poll_button.remove_poll": "Tynnu pleidlais",
  "privacy.change": "Addasu preifatrwdd y tŵt",
@ -335,7 +334,7 @@
  "search_results.accounts": "Pobl",
  "search_results.hashtags": "Hanshnodau",
  "search_results.statuses": "Tŵtiau",
-  "search_results.statuses_fts_disabled": "Nid yw chwilio Tŵtiau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
  "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
  "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio",
@ -374,7 +373,7 @@
  "status.show_more": "Dangos mwy",
  "status.show_more_all": "Dangos mwy i bawb",
  "status.show_thread": "Dangos edefyn",
-  "status.uncached_media_warning": "Dim ar gael",
+  "status.uncached_media_warning": "Not available",
  "status.unmute_conversation": "Dad-dawelu sgwrs",
  "status.unpin": "Dadbinio o'r proffil",
  "suggestions.dismiss": "Diswyddo",
@ -390,7 +389,7 @@
  "time_remaining.moments": "Munudau ar ôl",
  "time_remaining.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} ar ôl",
  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} yn siarad",
-  "trends.trending_now": "Yn tueddu nawr",
+  "trends.trending_now": "Trending now",
  "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
  "upload_area.title": "Llusgwch & gollwing i uwchlwytho",
  "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
@ -399,13 +398,13 @@
  "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
  "upload_form.edit": "Golygu",
  "upload_form.undo": "Dileu",
-  "upload_modal.analyzing_picture": "Dadansoddi llun…",
-  "upload_modal.apply": "Gweithredu",
-  "upload_modal.description_placeholder": "Mae ei phen bach llawn jocs, 'run peth a fy nghot golff, rhai dyddiau",
-  "upload_modal.detect_text": "Canfod testun o'r llun",
-  "upload_modal.edit_media": "Golygu cyfryngau",
-  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob mân-lunau.",
-  "upload_modal.preview_label": "Rhagolwg ({ratio})",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preview_label": "Preview ({ratio})",
  "upload_progress.label": "Uwchlwytho...",
  "video.close": "Cau fideo",
  "video.exit_fullscreen": "Gadael sgrîn llawn",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -299,7 +299,6 @@
  "poll.refresh": "Opdatér",
  "poll.total_votes": "{count, plural, one {# stemme} other {# stemmer}}",
  "poll.vote": "Stem",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Tilføj en afstemning",
  "poll_button.remove_poll": "Fjern afstemning",
  "privacy.change": "Skift status visningsindstillinger",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -299,7 +299,6 @@
  "poll.refresh": "Aktualisieren",
  "poll.total_votes": "{count, plural, one {# Stimme} other {# Stimmen}}",
  "poll.vote": "Abstimmen",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Eine Umfrage erstellen",
  "poll_button.remove_poll": "Umfrage entfernen",
  "privacy.change": "Sichtbarkeit des Beitrags anpassen",
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -233,11 +233,6 @@
        "defaultMessage": "Closed",
        "id": "poll.closed"
      },
-      {
-        "defaultMessage": "You voted for this answer",
-        "description": "Tooltip of the \"voted\" checkmark in polls",
-        "id": "poll.voted"
-      },
      {
        "defaultMessage": "Vote",
        "id": "poll.vote"
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -1,7 +1,7 @@
 {
  "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
  "account.badges.bot": "Μποτ",
-  "account.block": "Αποκλεισμός @{name}",
+  "account.block": "Αποκλισμός @{name}",
  "account.block_domain": "Απόκρυψε τα πάντα από το {domain}",
  "account.blocked": "Αποκλεισμένος/η",
  "account.cancel_follow_request": "Ακύρωση αιτήματος παρακολούθησης",
@ -111,10 +111,10 @@
  "confirmations.reply.message": "Απαντώντας τώρα θα αντικαταστήσεις το κείμενο που ήδη γράφεις. Σίγουρα θέλεις να συνεχίσεις;",
  "confirmations.unfollow.confirm": "Διακοπή παρακολούθησης",
  "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
-  "conversation.delete": "Διαγραφή συζήτησης",
-  "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
-  "conversation.open": "Προβολή συνομιλίας",
-  "conversation.with": "Με {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "Από το γνωστό fediverse",
  "directory.local": "Μόνο από {domain}",
  "directory.new_arrivals": "Νέες αφίξεις",
@ -131,7 +131,7 @@
  "emoji_button.objects": "Αντικείμενα",
  "emoji_button.people": "Άνθρωποι",
  "emoji_button.recent": "Δημοφιλή",
-  "emoji_button.search": "Αναζήτηση...",
+  "emoji_button.search": "Αναζήτηση…",
  "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
  "emoji_button.symbols": "Σύμβολα",
  "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
@ -299,7 +299,6 @@
  "poll.refresh": "Ανανέωση",
  "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
  "poll.vote": "Ψήφισε",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
  "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
  "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης",
@ -393,7 +392,7 @@
  "trends.trending_now": "Δημοφιλή τώρα",
  "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
  "upload_area.title": "Drag & drop για να ανεβάσεις",
-  "upload_button.label": "Πρόσθεσε πολυμέσα ({formats})",
+  "upload_button.label": "Πρόσθεσε πολυμέσα (JPEG, PNG, GIF, WebM, MP4, MOV)",
  "upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
  "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
  "upload_form.description": "Περιέγραψε για όσους & όσες έχουν προβλήματα όρασης",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -299,7 +299,6 @@
  "poll.refresh": "Aktualigi",
  "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
  "poll.vote": "Voĉdoni",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Aldoni balotenketon",
  "poll_button.remove_poll": "Forigi balotenketon",
  "privacy.change": "Agordi mesaĝan privatecon",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -1,419 +0,0 @@
-{
-  "account.add_or_remove_from_list": "Agregar o quitar de las listas",
-  "account.badges.bot": "Bot",
-  "account.block": "Bloquear a @{name}",
-  "account.block_domain": "Ocultar todo de {domain}",
-  "account.blocked": "Bloqueado",
-  "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
-  "account.direct": "Mensaje directo a @{name}",
-  "account.domain_blocked": "Dominio oculto",
-  "account.edit_profile": "Editar perfil",
-  "account.endorse": "Destacar en el perfil",
-  "account.follow": "Seguir",
-  "account.followers": "Seguidores",
-  "account.followers.empty": "Todavía nadie sigue a este usuario.",
-  "account.follows": "Sigue",
-  "account.follows.empty": "Todavía este usuario no sigue a nadie.",
-  "account.follows_you": "Te sigue",
-  "account.hide_reblogs": "Ocultar retoots de @{name}",
-  "account.last_status": "Última actividad",
-  "account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
-  "account.locked_info": "El estado de privacidad de esta cuenta está establecido como bloqueado. El propietario manualmente revisa quién puede seguirle.",
-  "account.media": "Medios",
-  "account.mention": "Mencionar a @{name}",
-  "account.moved_to": "{name} se ha muó a:",
-  "account.mute": "Silenciar a @{name}",
-  "account.mute_notifications": "Silenciar notificaciones de @{name}",
-  "account.muted": "Silenciado",
-  "account.never_active": "Nunca",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots con respuestas",
-  "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento.",
-  "account.share": "Compartir el perfil de @{name}",
-  "account.show_reblogs": "Mostrar retoots de @{name}",
-  "account.unblock": "Desbloquear a @{name}",
-  "account.unblock_domain": "Mostrar {domain}",
-  "account.unendorse": "No destacar en el perfil",
-  "account.unfollow": "Dejar de seguir",
-  "account.unmute": "Dejar de silenciar a @{name}",
-  "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
-  "alert.rate_limited.message": "Por favor, reintentá después de las {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tarifa limitada",
-  "alert.unexpected.message": "Ocurrió un error inesperado.",
-  "alert.unexpected.title": "¡Epa!",
-  "autosuggest_hashtag.per_week": "{count} por semana",
-  "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
-  "bundle_column_error.body": "Algo salió mal al cargar este componente.",
-  "bundle_column_error.retry": "Intentá de nuevo",
-  "bundle_column_error.title": "Error de red",
-  "bundle_modal_error.close": "Cerrar",
-  "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
-  "bundle_modal_error.retry": "Intentá de nuevo",
-  "column.blocks": "Usuarios bloqueados",
-  "column.community": "Línea temporal local",
-  "column.direct": "Mensajes directos",
-  "column.directory": "Explorar perfiles",
-  "column.domain_blocks": "Dominios ocultos",
-  "column.favourites": "Favoritos",
-  "column.follow_requests": "Solicitudes de seguimiento",
-  "column.home": "Principal",
-  "column.lists": "Listas",
-  "column.mutes": "Usuarios silenciados",
-  "column.notifications": "Notificaciones",
-  "column.pins": "Toots fijados",
-  "column.public": "Línea temporal federada",
-  "column.status": "Toot",
-  "column_back_button.label": "Volver",
-  "column_header.hide_settings": "Ocultar configuración",
-  "column_header.moveLeft_settings": "Mover columna a la izquierda",
-  "column_header.moveRight_settings": "Mover columna a la derecha",
-  "column_header.pin": "Fijar",
-  "column_header.show_settings": "Mostrar configuración",
-  "column_header.unpin": "Dejar de fijar",
-  "column_subheading.settings": "Configuración",
-  "community.column_settings.media_only": "Sólo medios",
-  "compose_form.direct_message_warning": "Este toot sólo será enviado a los usuarios mencionados.",
-  "compose_form.direct_message_warning_learn_more": "Aprendé más",
-  "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
-  "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus toots marcados como \"sólo para seguidores\".",
-  "compose_form.lock_disclaimer.lock": "bloqueada",
-  "compose_form.placeholder": "¿Qué onda?",
-  "compose_form.poll.add_option": "Agregá una opción",
-  "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitá esta opción",
-  "compose_form.publish": "Tootear",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "El medio se marcó como sensible",
-  "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
-  "compose_form.spoiler.marked": "El texto está oculto detrás de la advertencia",
-  "compose_form.spoiler.unmarked": "El texto no está oculto",
-  "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
-  "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y denunciar",
-  "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
-  "confirmations.delete.confirm": "Eliminar",
-  "confirmations.delete.message": "¿Estás seguro que querés eliminar este estado?",
-  "confirmations.delete_list.confirm": "Eliminar",
-  "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
-  "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
-  "confirmations.logout.confirm": "Cerrar sesión",
-  "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
-  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
-  "confirmations.redraft.confirm": "Eliminar toot original y editarlo",
-  "confirmations.redraft.message": "¿Estás seguro que querés eliminar este estado y volverlo a editarlo? Se perderán las veces marcadas como favoritos y los retoots, y las respuestas a la publicación original quedarán huérfanas.",
-  "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
-  "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
-  "conversation.delete": "Eliminar conversación",
-  "conversation.mark_as_read": "Marcar como leído",
-  "conversation.open": "Ver conversación",
-  "conversation.with": "Con {names}",
-  "directory.federated": "Desde fediverso conocido",
-  "directory.local": "Sólo de {domain}",
-  "directory.new_arrivals": "Recién llegados",
-  "directory.recently_active": "Recientemente activo",
-  "embed.instructions": "Insertá este toot a tu sitio web copiando el código de abajo.",
-  "embed.preview": "Así es cómo se verá:",
-  "emoji_button.activity": "Actividad",
-  "emoji_button.custom": "Personalizado",
-  "emoji_button.flags": "Banderas",
-  "emoji_button.food": "Comida y bebida",
-  "emoji_button.label": "Insertar emoji",
-  "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "¡¡No emojos!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "Objetos",
-  "emoji_button.people": "Gente",
-  "emoji_button.recent": "Usados frecuentemente",
-  "emoji_button.search": "Buscar…",
-  "emoji_button.search_results": "Resultados de búsqueda",
-  "emoji_button.symbols": "Símbolos",
-  "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_timeline": "¡No hay toots aquí!",
-  "empty_column.account_unavailable": "Perfil no disponible",
-  "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
-  "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
-  "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
-  "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
-  "empty_column.favourited_statuses": "Todavía no tenés toots favoritos. Cuando marqués uno como favorito, se mostrará acá.",
-  "empty_column.favourites": "Todavía nadie marcó este toot como favorito. Cuando alguien lo haga, se mostrará acá.",
-  "empty_column.follow_requests": "Todavía no tenés ninguna solicitud de seguimiento. Cuando recibás una, se mostrará acá.",
-  "empty_column.hashtag": "Todavía no hay nada con esta etiqueta.",
-  "empty_column.home": "¡Tu línea temporal principal está vacía! Visitá {public} o usá la búsqueda para comenzar y encontrar a otros usuarios.",
-  "empty_column.home.public_timeline": "la línea temporal pública",
-  "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos toots, se mostrarán acá.",
-  "empty_column.lists": "Todavía no tienes ninguna lista. Cuando creés una, se mostrará acá.",
-  "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
-  "empty_column.notifications": "Todavía no tenés ninguna notificación. Interactuá con otros para iniciar la conversación.",
-  "empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal.",
-  "follow_request.authorize": "Autorizar",
-  "follow_request.reject": "Rechazar",
-  "getting_started.developers": "Desarrolladores",
-  "getting_started.directory": "Directorio de perfiles",
-  "getting_started.documentation": "Documentación",
-  "getting_started.heading": "Introducción",
-  "getting_started.invite": "Invitar usuarios",
-  "getting_started.open_source_notice": "Mastodon es software libre. Podés contribuir o informar errores en {github}.",
-  "getting_started.security": "Seguridad",
-  "getting_started.terms": "Términos del servicio",
-  "hashtag.column_header.tag_mode.all": "y {additional}",
-  "hashtag.column_header.tag_mode.any": "o {additional}",
-  "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "hashtag.column_settings.select.no_options_message": "No se encontraron sugerencias",
-  "hashtag.column_settings.select.placeholder": "Introducí etiquetas…",
-  "hashtag.column_settings.tag_mode.all": "Todas estas",
-  "hashtag.column_settings.tag_mode.any": "Cualquiera de estas",
-  "hashtag.column_settings.tag_mode.none": "Ninguna de estas",
-  "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales para esta columna",
-  "home.column_settings.basic": "Básico",
-  "home.column_settings.show_reblogs": "Mostrar retoots",
-  "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.column_settings.update_live": "Actualizar en tiempo real",
-  "intervals.full.days": "{number, plural, one {# día} other {# días}}",
-  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
-  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
-  "introduction.federation.action": "Siguiente",
-  "introduction.federation.federated.headline": "Federado",
-  "introduction.federation.federated.text": "Los toots públicos de otros servidores del fediverso aparecerán en la línea temporal federada.",
-  "introduction.federation.home.headline": "Principal",
-  "introduction.federation.home.text": "Los toots de las personas que seguíss aparecerán en tu línea temporal principal. ¡Podés seguir a cualquiera en cualquier servidor!",
-  "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Los toots públicos de las personas en el mismo servidor aparecerán en la línea temporal local.",
-  "introduction.interactions.action": "¡Terminar tutorial!",
-  "introduction.interactions.favourite.headline": "Favorito",
-  "introduction.interactions.favourite.text": "Podés guardar un toot para más tarde, y hacerle saber al autor que te gustó, marcándolo como favorito.",
-  "introduction.interactions.reblog.headline": "Retootear",
-  "introduction.interactions.reblog.text": "Podés compartir los toots de otras personas con tus seguidores retooteando los mismos.",
-  "introduction.interactions.reply.headline": "Responder",
-  "introduction.interactions.reply.text": "Podés responder a tus propios toots y los de otras personas, que se encadenarán juntos en una conversación.",
-  "introduction.welcome.action": "¡Dale!",
-  "introduction.welcome.headline": "Primeros pasos",
-  "introduction.welcome.text": "¡Bienvenido al fediverso! En unos pocos minutos, vas a poder transmitir mensajes y hablar con tus amigos a través de una amplia variedad de servidores. Pero este servidor, {domain}, es especial: aloja tu perfil, así que acordate de su nombre.",
-  "keyboard_shortcuts.back": "para volver",
-  "keyboard_shortcuts.blocked": "para abrir la lista de usuarios bloqueados",
-  "keyboard_shortcuts.boost": "para retootear",
-  "keyboard_shortcuts.column": "para enfocar un estado en una de las columnas",
-  "keyboard_shortcuts.compose": "para enfocar el área de texto de redacción",
-  "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "para abrir columna de mensajes directos",
-  "keyboard_shortcuts.down": "para bajar en la lista",
-  "keyboard_shortcuts.enter": "para abrir el estado",
-  "keyboard_shortcuts.favourite": "para marcar como favorito",
-  "keyboard_shortcuts.favourites": "para abrir la lista de favoritos",
-  "keyboard_shortcuts.federated": "para abrir la línea temporal federada",
-  "keyboard_shortcuts.heading": "Atajos de teclado",
-  "keyboard_shortcuts.home": "para abrir la línea temporal principal",
-  "keyboard_shortcuts.hotkey": "Combinación",
-  "keyboard_shortcuts.legend": "para mostrar este texto",
-  "keyboard_shortcuts.local": "para abrir la línea temporal local",
-  "keyboard_shortcuts.mention": "para mencionar al autor",
-  "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados",
-  "keyboard_shortcuts.my_profile": "para abrir tu perfil",
-  "keyboard_shortcuts.notifications": "para abrir la columna de notificaciones",
-  "keyboard_shortcuts.pinned": "para abrir lista de toots fijados",
-  "keyboard_shortcuts.profile": "para abrir el perfil del autor",
-  "keyboard_shortcuts.reply": "para responder",
-  "keyboard_shortcuts.requests": "para abrir la lista de solicitudes de seguimiento",
-  "keyboard_shortcuts.search": "para enfocar la búsqueda",
-  "keyboard_shortcuts.start": "para abrir la columna \"Introducción\"",
-  "keyboard_shortcuts.toggle_hidden": "para mostrar/ocultar el texto detrás de la advertencia de contenido",
-  "keyboard_shortcuts.toggle_sensitivity": "para mostrar/ocultar los medios",
-  "keyboard_shortcuts.toot": "para comenzar un toot nuevo",
-  "keyboard_shortcuts.unfocus": "para quitar el enfoque del área de texto de redacción o de búsqueda",
-  "keyboard_shortcuts.up": "para subir en la lista",
-  "lightbox.close": "Cerrar",
-  "lightbox.next": "Siguiente",
-  "lightbox.previous": "Anterior",
-  "lightbox.view_context": "Ver contexto",
-  "lists.account.add": "Agregar a lista",
-  "lists.account.remove": "Quitar de lista",
-  "lists.delete": "Eliminar lista",
-  "lists.edit": "Editar lista",
-  "lists.edit.submit": "Cambiar título",
-  "lists.new.create": "Agregar lista",
-  "lists.new.title_placeholder": "Nuevo título de lista",
-  "lists.search": "Buscar entre la gente que seguís",
-  "lists.subheading": "Tus listas",
-  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
-  "loading_indicator.label": "Cargando…",
-  "media_gallery.toggle_visible": "Cambiar visibilidad",
-  "missing_indicator.label": "No se encontró",
-  "missing_indicator.sublabel": "No se encontró este recurso",
-  "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
-  "navigation_bar.apps": "Aplicaciones móviles",
-  "navigation_bar.blocks": "Usuarios bloqueados",
-  "navigation_bar.community_timeline": "Línea temporal local",
-  "navigation_bar.compose": "Redactar un nuevo toot",
-  "navigation_bar.direct": "Mensajes directos",
-  "navigation_bar.discover": "Descubrir",
-  "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
-  "navigation_bar.favourites": "Favoritos",
-  "navigation_bar.filters": "Palabras silenciadas",
-  "navigation_bar.follow_requests": "Solicitudes de seguimiento",
-  "navigation_bar.follows_and_followers": "Personas seguidas y seguidores",
-  "navigation_bar.info": "Acerca de este servidor",
-  "navigation_bar.keyboard_shortcuts": "Atajos",
-  "navigation_bar.lists": "Listas",
-  "navigation_bar.logout": "Cerrar sesión",
-  "navigation_bar.mutes": "Usuarios silenciados",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Toots fijados",
-  "navigation_bar.preferences": "Configuración",
-  "navigation_bar.public_timeline": "Línea temporal federada",
-  "navigation_bar.security": "Seguridad",
-  "notification.and_n_others": "y {count, plural, one {# otro} other {# otros}}",
-  "notification.favourite": "{name} marcó tu estado como favorito",
-  "notification.follow": "{name} te empezó a seguir",
-  "notification.mention": "{name} te mencionó",
-  "notification.poll": "Finalizó una encuesta en la que votaste",
-  "notification.reblog": "{name} retooteó tu estado",
-  "notifications.clear": "Limpiar notificaciones",
-  "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
-  "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
-  "notifications.column_settings.follow": "Nuevos seguidores:",
-  "notifications.column_settings.mention": "Menciones:",
-  "notifications.column_settings.poll": "Resultados de la encuesta:",
-  "notifications.column_settings.push": "Notificaciones push",
-  "notifications.column_settings.reblog": "Retoots:",
-  "notifications.column_settings.show": "Mostrar en columna",
-  "notifications.column_settings.sound": "Reproducir sonido",
-  "notifications.filter.all": "Todas",
-  "notifications.filter.boosts": "Retoots",
-  "notifications.filter.favourites": "Favoritos",
-  "notifications.filter.follows": "Seguidores",
-  "notifications.filter.mentions": "Menciones",
-  "notifications.filter.polls": "Resultados de la encuesta",
-  "notifications.group": "{count} notificaciones",
-  "poll.closed": "Cerrada",
-  "poll.refresh": "Refrescar",
-  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
-  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
-  "privacy.unlisted.short": "Unlisted",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "reply_indicator.cancel": "Cancel",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
-  "report.target": "Report {target}",
-  "search.placeholder": "Search",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Copy link to status",
-  "status.delete": "Delete",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
-  "status.filtered": "Filtered",
-  "status.load_more": "Load more",
-  "status.media_hidden": "Media hidden",
-  "status.mention": "Mention @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.reply": "Reply",
-  "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
-  "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
-  "status.show_less": "Show less",
-  "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media ({formats})",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.undo": "Delete",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading...",
-  "video.close": "Close video",
-  "video.exit_fullscreen": "Exit full screen",
-  "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
-}
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -299,7 +299,6 @@
  "poll.refresh": "Actualizar",
  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Añadir una encuesta",
  "poll_button.remove_poll": "Eliminar encuesta",
  "privacy.change": "Ajustar privacidad",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -299,7 +299,6 @@
  "poll.refresh": "Värskenda",
  "poll.total_votes": "{count, plural, one {# hääl} other {# hääli}}",
  "poll.vote": "Hääleta",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Lisa küsitlus",
  "poll_button.remove_poll": "Eemalda küsitlus",
  "privacy.change": "Muuda staatuse privaatsust",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -299,7 +299,6 @@
  "poll.refresh": "Berritu",
  "poll.total_votes": "{count, plural, one {boto #} other {# boto}}",
  "poll.vote": "Bozkatu",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Gehitu inkesta bat",
  "poll_button.remove_poll": "Kendu inkesta",
  "privacy.change": "Doitu mezuaren pribatutasuna",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -299,7 +299,6 @@
  "poll.refresh": "به‌روزرسانی",
  "poll.total_votes": "{count, plural, one {# رأی} other {# رأی}}",
  "poll.vote": "رأی",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "افزودن نظرسنجی",
  "poll_button.remove_poll": "حذف نظرسنجی",
  "privacy.change": "تنظیم حریم خصوصی نوشته‌ها",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Säädä tuuttauksen näkyvyyttä",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -39,7 +39,7 @@
  "account.unmute": "Ne plus masquer @{name}",
  "account.unmute_notifications": "Réactiver les notifications de @{name}",
  "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Débit limité",
+  "alert.rate_limited.title": "Taux limité",
  "alert.unexpected.message": "Une erreur inattendue s’est produite.",
  "alert.unexpected.title": "Oups !",
  "autosuggest_hashtag.per_week": "{count} par semaine",
@ -70,12 +70,12 @@
  "column_header.moveRight_settings": "Déplacer la colonne vers la droite",
  "column_header.pin": "Épingler",
  "column_header.show_settings": "Afficher les paramètres",
-  "column_header.unpin": "Désépingler",
+  "column_header.unpin": "Retirer",
  "column_subheading.settings": "Paramètres",
  "community.column_settings.media_only": "Média uniquement",
  "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
-  "compose_form.direct_message_warning_learn_more": "Plus d'informations",
-  "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par mot-clé car sa visibilité est réglée sur \"non listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par mot-clé.",
+  "compose_form.direct_message_warning_learn_more": "En savoir plus",
+  "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur \"non listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par hashtag.",
  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.",
  "compose_form.lock_disclaimer.lock": "verrouillé",
  "compose_form.placeholder": "Qu’avez-vous en tête ?",
@ -87,7 +87,7 @@
  "compose_form.publish_loud": "{publish} !",
  "compose_form.sensitive.hide": "Marquer le média comme sensible",
  "compose_form.sensitive.marked": "Média marqué comme sensible",
-  "compose_form.sensitive.unmarked": "Le média n'est pas marqué comme sensible",
+  "compose_form.sensitive.unmarked": "Média non marqué comme sensible",
  "compose_form.spoiler.marked": "Le texte est caché derrière un avertissement",
  "compose_form.spoiler.unmarked": "Le texte n’est pas caché",
  "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
@ -104,7 +104,7 @@
  "confirmations.logout.confirm": "Déconnexion",
  "confirmations.logout.message": "Êtes-vous sûr de vouloir vous déconnecter ?",
  "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.message": "Êtes-vous sûr·e de vouloir masquer {name} ?",
+  "confirmations.mute.message": "Confirmez-vous le masquage de {name} ?",
  "confirmations.redraft.confirm": "Effacer et ré-écrire",
  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
  "confirmations.reply.confirm": "Répondre",
@ -151,7 +151,7 @@
  "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
  "empty_column.mutes": "Vous n’avez pas encore mis d'utilisateur·rice·s en silence.",
  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
-  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour le remplir",
+  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour remplir le fil public",
  "follow_request.authorize": "Accepter",
  "follow_request.reject": "Rejeter",
  "getting_started.developers": "Développeur·euse·s",
@ -166,12 +166,12 @@
  "hashtag.column_header.tag_mode.any": "ou {additional}",
  "hashtag.column_header.tag_mode.none": "sans {additional}",
  "hashtag.column_settings.select.no_options_message": "Aucune suggestion trouvée",
-  "hashtag.column_settings.select.placeholder": "Ajouter des mots-clés…",
+  "hashtag.column_settings.select.placeholder": "Ajouter des hashtags…",
  "hashtag.column_settings.tag_mode.all": "Tous ces éléments",
  "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
  "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
-  "hashtag.column_settings.tag_toggle": "Inclure des mots-clés additionnels dans cette colonne",
-  "home.column_settings.basic": "Base",
+  "hashtag.column_settings.tag_toggle": "Inclure des tags additionnels dans cette colonne",
+  "home.column_settings.basic": "Basique",
  "home.column_settings.show_reblogs": "Afficher les partages",
  "home.column_settings.show_replies": "Afficher les réponses",
  "home.column_settings.update_live": "Mettre à jour en temps réel",
@ -199,7 +199,7 @@
  "keyboard_shortcuts.blocked": "pour ouvrir une liste d’utilisateur·rice·s bloqué·e·s",
  "keyboard_shortcuts.boost": "pour partager",
  "keyboard_shortcuts.column": "pour focaliser un statut dans l’une des colonnes",
-  "keyboard_shortcuts.compose": "pour focaliser la zone de rédaction",
+  "keyboard_shortcuts.compose": "pour centrer la zone de rédaction",
  "keyboard_shortcuts.description": "Description",
  "keyboard_shortcuts.direct": "pour ouvrir une colonne des messages directs",
  "keyboard_shortcuts.down": "pour descendre dans la liste",
@ -299,7 +299,6 @@
  "poll.refresh": "Actualiser",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Voter",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Ajouter un sondage",
  "poll_button.remove_poll": "Supprimer le sondage",
  "privacy.change": "Ajuster la confidentialité du message",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -299,7 +299,6 @@
  "poll.refresh": "Actualizar",
  "poll.total_votes": "{count, plural, one {# voto} outros {# votos}}",
  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Engadir sondaxe",
  "poll_button.remove_poll": "Eliminar sondaxe",
  "privacy.change": "Axustar a intimidade do estado",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "שינוי פרטיות ההודעה",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Podesi status privatnosti",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -4,7 +4,7 @@
  "account.block": "@{name} letiltása",
  "account.block_domain": "Minden elrejtése innen: {domain}",
  "account.blocked": "Letiltva",
-  "account.cancel_follow_request": "Követési kérelem törlése",
+  "account.cancel_follow_request": "Cancel follow request",
  "account.direct": "Közvetlen üzenet @{name} számára",
  "account.domain_blocked": "Rejtett domain",
  "account.edit_profile": "Profil szerkesztése",
@ -16,7 +16,7 @@
  "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
  "account.follows_you": "Követ téged",
  "account.hide_reblogs": "@{name} megtolásainak némítása",
-  "account.last_status": "Utoljára aktív",
+  "account.last_status": "Last active",
  "account.link_verified_on": "A linket ellenőriztük: {date}",
  "account.locked_info": "Ez a fiók zárt. A tulaj engedélyezi, ki követheti őt.",
  "account.media": "Média",
@ -25,7 +25,7 @@
  "account.mute": "@{name} némítása",
  "account.mute_notifications": "@{name} értesítéseinek némítása",
  "account.muted": "Némítva",
-  "account.never_active": "Soha",
+  "account.never_active": "Never",
  "account.posts": "Tülkölés",
  "account.posts_with_replies": "Tülkölés válaszokkal",
  "account.report": "@{name} jelentése",
@ -38,11 +38,11 @@
  "account.unfollow": "Követés vége",
  "account.unmute": "@{name} némítás feloldása",
  "account.unmute_notifications": "@{name} némított értesítéseinek feloldása",
-  "alert.rate_limited.message": "Kérlek, próbáld újra {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Forgalomkorlátozás",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
  "alert.unexpected.message": "Váratlan hiba történt.",
  "alert.unexpected.title": "Hoppá!",
-  "autosuggest_hashtag.per_week": "{count}/hét",
+  "autosuggest_hashtag.per_week": "{count} per week",
  "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
  "bundle_column_error.body": "Hiba történt a komponens betöltése közben.",
  "bundle_column_error.retry": "Próbáld újra",
@ -53,7 +53,7 @@
  "column.blocks": "Letiltott felhasználók",
  "column.community": "Helyi idővonal",
  "column.direct": "Közvetlen üzenetek",
-  "column.directory": "Profilok böngészése",
+  "column.directory": "Browse profiles",
  "column.domain_blocks": "Rejtett domainek",
  "column.favourites": "Kedvencek",
  "column.follow_requests": "Követési kérelmek",
@ -63,7 +63,7 @@
  "column.notifications": "Értesítések",
  "column.pins": "Kitűzött tülkök",
  "column.public": "Nyilvános idővonal",
-  "column.status": "Tülk",
+  "column.status": "Toot",
  "column_back_button.label": "Vissza",
  "column_header.hide_settings": "Beállítások elrejtése",
  "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
@ -101,8 +101,8 @@
  "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
  "confirmations.domain_block.confirm": "Teljes domain elrejtése",
  "confirmations.domain_block.message": "Egészen biztos, hogy le szeretnéd tiltani a teljes {domain}-t? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se idővonalakon, se értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
-  "confirmations.logout.confirm": "Kijelentkezés",
-  "confirmations.logout.message": "Biztosan ki akar jelentkezni?",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Némítás",
  "confirmations.mute.message": "Biztos, hogy némítani szeretnéd {name}?",
  "confirmations.redraft.confirm": "Törlés és újraírás",
@ -111,14 +111,14 @@
  "confirmations.reply.message": "Ha most válaszolsz, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
  "confirmations.unfollow.confirm": "Követés visszavonása",
  "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
-  "conversation.delete": "Beszélgetés törlése",
-  "conversation.mark_as_read": "Megjelölés olvasottként",
-  "conversation.open": "Beszélgetés megtekintése",
-  "conversation.with": "{names}-el/al",
-  "directory.federated": "Az ismert fediverzumból",
-  "directory.local": "Csak {domain}-ból/ből",
-  "directory.new_arrivals": "Új csatlakozók",
-  "directory.recently_active": "Nemrég aktív",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
  "embed.instructions": "Ágyazd be ezt a tülköt a weboldaladba az alábbi kód kimásolásával.",
  "embed.preview": "Így fog kinézni:",
  "emoji_button.activity": "Aktivitás",
@ -174,7 +174,7 @@
  "home.column_settings.basic": "Alapértelmezések",
  "home.column_settings.show_reblogs": "Megtolások mutatása",
  "home.column_settings.show_replies": "Válaszok mutatása",
-  "home.column_settings.update_live": "Frissítés valós időben",
+  "home.column_settings.update_live": "Update in real-time",
  "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
  "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
  "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",
@ -268,7 +268,7 @@
  "navigation_bar.preferences": "Beállítások",
  "navigation_bar.public_timeline": "Föderációs idővonal",
  "navigation_bar.security": "Biztonság",
-  "notification.and_n_others": "és {count, plural, one {# másik} other {# másik}}",
+  "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
  "notification.favourite": "{name} kedvencnek jelölte egy tülködet",
  "notification.follow": "{name} követ téged",
  "notification.mention": "{name} megemlített",
@ -299,7 +299,6 @@
  "poll.refresh": "Frissítés",
  "poll.total_votes": "{count, plural, one {# szavazat} other {# szavazat}}",
  "poll.vote": "Szavazás",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Új szavazás",
  "poll_button.remove_poll": "Szavazás törlése",
  "privacy.change": "Tülk láthatóságának módosítása",
@ -374,7 +373,7 @@
  "status.show_more": "Többet",
  "status.show_more_all": "Többet mindenhol",
  "status.show_thread": "Szál mutatása",
-  "status.uncached_media_warning": "Nem elérhető",
+  "status.uncached_media_warning": "Not available",
  "status.unmute_conversation": "Beszélgetés némításának kikapcsolása",
  "status.unpin": "Kitűzés eltávolítása a profilodról",
  "suggestions.dismiss": "Javaslat elvetése",
@ -390,22 +389,22 @@
  "time_remaining.moments": "Pillanatok vannak hátra",
  "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
  "trends.count_by_accounts": "{count} {rawCount, plural, one {résztvevő} other {résztvevő}} beszélget",
-  "trends.trending_now": "Most trendi",
+  "trends.trending_now": "Trending now",
  "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodon-t.",
  "upload_area.title": "Húzd ide a feltöltéshez",
  "upload_button.label": "Média hozzáadása (JPEG, PNG, GIF, WebM, MP4, MOV)",
  "upload_error.limit": "Túllépted a fájl feltöltési limitet.",
  "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
  "upload_form.description": "Leírás látáskorlátozottak számára",
-  "upload_form.edit": "Szerkesztés",
+  "upload_form.edit": "Edit",
  "upload_form.undo": "Mégsem",
-  "upload_modal.analyzing_picture": "Kép elemzése…",
-  "upload_modal.apply": "Alkalmazás",
-  "upload_modal.description_placeholder": "A gyors, barna róka átugrik a lusta kutya fölött",
-  "upload_modal.detect_text": "Szöveg felismerése a képről",
-  "upload_modal.edit_media": "Média szerkesztése",
-  "upload_modal.hint": "Kattints vagy húzd a kört az előnézetben arra a fókuszpontra, mely minden megjelenített bélyegképen látható kell, legyen.",
-  "upload_modal.preview_label": "Előnézet ({ratio})",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preview_label": "Preview ({ratio})",
  "upload_progress.label": "Feltöltés...",
  "video.close": "Videó bezárása",
  "video.exit_fullscreen": "Kilépés teljes képernyőből",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Կարգավորել թթի գաղտնիությունը",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Tentukan privasi status",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Aranjar privateso di mesaji",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -16,7 +16,7 @@
  "account.follows.empty": "Questo utente non segue ancora nessuno.",
  "account.follows_you": "Ti segue",
  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
-  "account.last_status": "Ultima attività",
+  "account.last_status": "Last active",
  "account.link_verified_on": "La proprietà di questo link è stata controllata il {date}",
  "account.locked_info": "Il livello di privacy di questo account è impostato a \"bloccato\". Il proprietario esamina manualmente le richieste di seguirlo.",
  "account.media": "Media",
@ -25,7 +25,7 @@
  "account.mute": "Silenzia @{name}",
  "account.mute_notifications": "Silenzia notifiche da @{name}",
  "account.muted": "Silenziato",
-  "account.never_active": "Mai",
+  "account.never_active": "Never",
  "account.posts": "Toot",
  "account.posts_with_replies": "Toot e risposte",
  "account.report": "Segnala @{name}",
@ -53,7 +53,7 @@
  "column.blocks": "Utenti bloccati",
  "column.community": "Timeline locale",
  "column.direct": "Messaggi diretti",
-  "column.directory": "Sfoglia profili",
+  "column.directory": "Browse profiles",
  "column.domain_blocks": "Domini nascosti",
  "column.favourites": "Apprezzati",
  "column.follow_requests": "Richieste di amicizia",
@ -101,8 +101,8 @@
  "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?",
  "confirmations.domain_block.confirm": "Nascondi intero dominio",
  "confirmations.domain_block.message": "Sei davvero sicuro che vuoi bloccare l'intero {domain}? Nella maggior parte dei casi, pochi blocchi o silenziamenti mirati sono sufficienti e preferibili. Non vedrai nessun contenuto di quel dominio né nelle timeline pubbliche né nelle notifiche. I tuoi seguaci di quel dominio saranno eliminati.",
-  "confirmations.logout.confirm": "Esci",
-  "confirmations.logout.message": "Sei sicuro di voler uscire?",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Silenzia",
  "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
  "confirmations.redraft.confirm": "Cancella e riscrivi",
@ -111,14 +111,14 @@
  "confirmations.reply.message": "Se rispondi ora, il messaggio che stai componendo sarà sovrascritto. Sei sicuro di voler continuare?",
  "confirmations.unfollow.confirm": "Smetti di seguire",
  "confirmations.unfollow.message": "Sei sicuro che non vuoi più seguire {name}?",
-  "conversation.delete": "Elimina conversazione",
-  "conversation.mark_as_read": "Segna come letto",
-  "conversation.open": "Visualizza conversazione",
-  "conversation.with": "Con {names}",
-  "directory.federated": "Da un fediverso noto",
-  "directory.local": "Solo da {domain}",
-  "directory.new_arrivals": "Nuovi arrivi",
-  "directory.recently_active": "Attivo di recente",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
  "embed.instructions": "Inserisci questo status nel tuo sito copiando il codice qui sotto.",
  "embed.preview": "Ecco come apparirà:",
  "emoji_button.activity": "Attività",
@ -174,7 +174,7 @@
  "home.column_settings.basic": "Semplice",
  "home.column_settings.show_reblogs": "Mostra post condivisi",
  "home.column_settings.show_replies": "Mostra risposte",
-  "home.column_settings.update_live": "Aggiorna in tempo reale",
+  "home.column_settings.update_live": "Update in real-time",
  "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
  "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
@ -268,7 +268,7 @@
  "navigation_bar.preferences": "Impostazioni",
  "navigation_bar.public_timeline": "Timeline federata",
  "navigation_bar.security": "Sicurezza",
-  "notification.and_n_others": "e {count, plural, one {# other} other {# others}}",
+  "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
  "notification.favourite": "{name} ha apprezzato il tuo post",
  "notification.follow": "{name} ha iniziato a seguirti",
  "notification.mention": "{name} ti ha menzionato",
@ -299,7 +299,6 @@
  "poll.refresh": "Aggiorna",
  "poll.total_votes": "{count, plural, one {# voto} other {# voti}}",
  "poll.vote": "Vota",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Aggiungi un sondaggio",
  "poll_button.remove_poll": "Rimuovi sondaggio",
  "privacy.change": "Modifica privacy del post",
@ -374,7 +373,7 @@
  "status.show_more": "Mostra di più",
  "status.show_more_all": "Mostra di più per tutti",
  "status.show_thread": "Mostra thread",
-  "status.uncached_media_warning": "Non disponibile",
+  "status.uncached_media_warning": "Not available",
  "status.unmute_conversation": "Annulla silenzia conversazione",
  "status.unpin": "Non fissare in cima al profilo",
  "suggestions.dismiss": "Elimina suggerimento",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -53,7 +53,7 @@
  "column.blocks": "ブロックしたユーザー",
  "column.community": "ローカルタイムライン",
  "column.direct": "ダイレクトメッセージ",
-  "column.directory": "ディレクトリ",
+  "column.directory": "プロフィールを見る",
  "column.domain_blocks": "非表示にしたドメイン",
  "column.favourites": "お気に入り",
  "column.follow_requests": "フォローリクエスト",
@ -113,8 +113,8 @@
  "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
  "conversation.delete": "このやりとりを削除",
  "conversation.mark_as_read": "既読にする",
-  "conversation.open": "会話を表示",
-  "conversation.with": "{names}",
+  "conversation.open": "会話を表示する",
+  "conversation.with": "{names} を付ける",
  "directory.federated": "既知の連合より",
  "directory.local": "{domain} のみ",
  "directory.new_arrivals": "新着順",
@ -268,7 +268,7 @@
  "navigation_bar.preferences": "ユーザー設定",
  "navigation_bar.public_timeline": "連合タイムライン",
  "navigation_bar.security": "セキュリティ",
-  "notification.and_n_others": "と、他 {count} 件",
+  "notification.and_n_others": "と、その他 {count, plural, one {#} other {#}}",
  "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
  "notification.follow": "{name}さんにフォローされました",
  "notification.mention": "{name}さんがあなたに返信しました",
@ -299,7 +299,6 @@
  "poll.refresh": "更新",
  "poll.total_votes": "{count}票",
  "poll.vote": "投票",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "アンケートを追加",
  "poll_button.remove_poll": "アンケートを削除",
  "privacy.change": "公開範囲を変更",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@ -299,7 +299,6 @@
  "poll.refresh": "Жаңарту",
  "poll.total_votes": "{count, plural, one {# дауыс} other {# дауыс}}",
  "poll.vote": "Дауыс беру",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Сауалнама қосу",
  "poll_button.remove_poll": "Сауалнаманы өшіру",
  "privacy.change": "Құпиялылықты реттеу",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -299,7 +299,6 @@
  "poll.refresh": "새로고침",
  "poll.total_votes": "{count} 표",
  "poll.vote": "투표",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "투표 추가",
  "poll_button.remove_poll": "투표 삭제",
  "privacy.change": "포스트의 프라이버시 설정을 변경",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -111,10 +111,10 @@
  "confirmations.reply.message": "Door nu te reageren overschrijf je de toot die je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
  "confirmations.unfollow.confirm": "Ontvolgen",
  "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
-  "conversation.delete": "Gesprek verwijderen",
-  "conversation.mark_as_read": "Als gelezen markeren",
-  "conversation.open": "Gesprek tonen",
-  "conversation.with": "Met {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "Fediverse (wat bekend is)",
  "directory.local": "Alleen {domain}",
  "directory.new_arrivals": "Nieuwe accounts",
@ -299,7 +299,6 @@
  "poll.refresh": "Vernieuwen",
  "poll.total_votes": "{count, plural, one {# stem} other {# stemmen}}",
  "poll.vote": "Stemmen",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Poll toevoegen",
  "poll_button.remove_poll": "Poll verwijderen",
  "privacy.change": "Zichtbaarheid toot aanpassen",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Justér synlighet",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -299,7 +299,6 @@
  "poll.refresh": "Actualizar",
  "poll.total_votes": "{count, plural, one {# vòte} other {# vòtes}}",
  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Ajustar un sondatge",
  "poll_button.remove_poll": "Levar lo sondatge",
  "privacy.change": "Ajustar la confidencialitat del messatge",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -101,8 +101,8 @@
  "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
  "confirmations.domain_block.confirm": "Ukryj wszysyko z domeny",
  "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
-  "confirmations.logout.confirm": "Wyloguj",
-  "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Wycisz",
  "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
  "confirmations.redraft.confirm": "Usuń i przeredaguj",
@ -111,10 +111,10 @@
  "confirmations.reply.message": "W ten sposób utracisz wpis który obecnie tworzysz. Czy na pewno chcesz to zrobić?",
  "confirmations.unfollow.confirm": "Przestań śledzić",
  "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać śledzić {name}?",
-  "conversation.delete": "Usuń rozmowę",
-  "conversation.mark_as_read": "Oznacz jako przeczytane",
-  "conversation.open": "Zobacz rozmowę",
-  "conversation.with": "Z {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "From known fediverse",
  "directory.local": "From {domain} only",
  "directory.new_arrivals": "New arrivals",
@ -299,7 +299,6 @@
  "poll.refresh": "Odśwież",
  "poll.total_votes": "{count, plural, one {# głos} few {# głosy} many {# głosów} other {# głosów}}",
  "poll.vote": "Zagłosuj",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Dodaj głosowanie",
  "poll_button.remove_poll": "Usuń głosowanie",
  "privacy.change": "Dostosuj widoczność wpisów",
@ -397,7 +396,7 @@
  "upload_error.limit": "Przekroczono limit plików do wysłania.",
  "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
  "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
-  "upload_form.edit": "Edytuj",
+  "upload_form.edit": "Edit",
  "upload_form.undo": "Usuń",
  "upload_modal.analyzing_picture": "Analyzing picture…",
  "upload_modal.apply": "Zastosuj",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -16,7 +16,7 @@
  "account.follows.empty": "Esse usuário não segue ninguém no momento.",
  "account.follows_you": "Segue você",
  "account.hide_reblogs": "Esconder compartilhamentos de @{name}",
-  "account.last_status": "Última atividade",
+  "account.last_status": "Last active",
  "account.link_verified_on": "A posse desse link foi verificada em {date}",
  "account.locked_info": "Essa conta está trancada. Se você a seguir sua solicitação será revisada manualmente.",
  "account.media": "Mídia",
@ -53,7 +53,7 @@
  "column.blocks": "Usuários bloqueados",
  "column.community": "Local",
  "column.direct": "Mensagens diretas",
-  "column.directory": "Explorar perfis",
+  "column.directory": "Browse profiles",
  "column.domain_blocks": "Domínios escondidos",
  "column.favourites": "Favoritos",
  "column.follow_requests": "Seguidores pendentes",
@ -63,7 +63,7 @@
  "column.notifications": "Notificações",
  "column.pins": "Postagens fixadas",
  "column.public": "Global",
-  "column.status": "Publicar",
+  "column.status": "Toot",
  "column_back_button.label": "Voltar",
  "column_header.hide_settings": "Esconder configurações",
  "column_header.moveLeft_settings": "Mover coluna para a esquerda",
@ -101,8 +101,8 @@
  "confirmations.delete_list.message": "Você tem certeza que quer deletar permanentemente a lista?",
  "confirmations.domain_block.confirm": "Esconder o domínio inteiro",
  "confirmations.domain_block.message": "Você quer mesmo bloquear {domain} inteiro? Na maioria dos casos, silenciar ou bloquear alguns usuários é o suficiente e o recomendado. Você não vai ver conteúdo desse domínio em nenhuma das timelines públicas ou nas suas notificações. Seus seguidores desse domínio serão removidos.",
-  "confirmations.logout.confirm": "Sair",
-  "confirmations.logout.message": "Tem certeza que deseja encerrar a sessão?",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
  "confirmations.mute.confirm": "Silenciar",
  "confirmations.mute.message": "Você tem certeza de que quer silenciar {name}?",
  "confirmations.redraft.confirm": "Apagar & usar como rascunho",
@ -113,11 +113,11 @@
  "confirmations.unfollow.message": "Você tem certeza de que quer deixar de seguir {name}?",
  "conversation.delete": "Excluir conversa",
  "conversation.mark_as_read": "Marcar como lida",
-  "conversation.open": "Ver conversa",
-  "conversation.with": "Com {names}",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "De fediverso conhecido",
  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "Acabaram de chegar",
+  "directory.new_arrivals": "New arrivals",
  "directory.recently_active": "Reverta esta propriedade para seu valor padrão",
  "embed.instructions": "Incorpore esta postagem em seu site copiando o código abaixo.",
  "embed.preview": "Aqui está uma previsão de como ficará:",
@ -174,7 +174,7 @@
  "home.column_settings.basic": "Básico",
  "home.column_settings.show_reblogs": "Mostrar compartilhamentos",
  "home.column_settings.show_replies": "Mostrar as respostas",
-  "home.column_settings.update_live": "Atualizar em tempo real",
+  "home.column_settings.update_live": "Update in real-time",
  "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@ -240,7 +240,7 @@
  "lists.new.title_placeholder": "Novo título da lista",
  "lists.search": "Procurar entre as pessoas que você segue",
  "lists.subheading": "Suas listas",
-  "load_pending": "{count, plural, one {# novo item} other {# novos items}}",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
  "loading_indicator.label": "Carregando...",
  "media_gallery.toggle_visible": "Esconder/Mostrar",
  "missing_indicator.label": "Não encontrado",
@ -268,7 +268,7 @@
  "navigation_bar.preferences": "Preferências",
  "navigation_bar.public_timeline": "Global",
  "navigation_bar.security": "Segurança",
-  "notification.and_n_others": "and {count, plural, one {# outro} other {# outros}}",
+  "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
  "notification.favourite": "{name} adicionou a sua postagem aos favoritos",
  "notification.follow": "{name} te seguiu",
  "notification.mention": "{name} te mencionou",
@ -299,7 +299,6 @@
  "poll.refresh": "Atualizar",
  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Adicionar uma enquete",
  "poll_button.remove_poll": "Remover enquete",
  "privacy.change": "Ajustar a privacidade da mensagem",
@ -335,7 +334,7 @@
  "search_results.accounts": "Pessoas",
  "search_results.hashtags": "Hashtags",
  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Pesquisar toots por seu conteúdo não está habilitado neste servidor Mastodon.",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
  "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
  "status.admin_account": "Abrir interface de moderação para @{name}",
  "status.admin_status": "Abrir esse status na interface de moderação",
@ -390,18 +389,18 @@
  "time_remaining.moments": "Momentos restantes",
  "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
  "trends.count_by_accounts": "{count} {rawCount, plural, one {pessoa} other {pessoas}} falando sobre",
-  "trends.trending_now": "Em alta no momento",
+  "trends.trending_now": "Trending now",
  "ui.beforeunload": "Seu rascunho será perdido se você sair do Mastodon.",
  "upload_area.title": "Arraste e solte para enviar",
  "upload_button.label": "Adicionar mídia (JPEG, PNG, GIF, WebM, MP4, MOV)",
  "upload_error.limit": "Limite de envio de arquivos excedido.",
  "upload_error.poll": "Envio de arquivos não é permitido com enquetes.",
  "upload_form.description": "Descreva a imagem para deficientes visuais",
-  "upload_form.edit": "Editar",
+  "upload_form.edit": "Edit",
  "upload_form.undo": "Remover",
  "upload_modal.analyzing_picture": "Analisando imagem…",
-  "upload_modal.apply": "Aplicar",
-  "upload_modal.description_placeholder": "Grave e cabisbaixo, o filho justo zelava pela querida mãe doente",
+  "upload_modal.apply": "Apply",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
  "upload_modal.detect_text": "Detectar texto da imagem",
  "upload_modal.edit_media": "Edit media",
  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -299,7 +299,6 @@
  "poll.refresh": "Recarregar",
  "poll.total_votes": "{contar, plural, um {# vote} outro {# votes}}",
  "poll.vote": "Votar",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Adicionar votação",
  "poll_button.remove_poll": "Remover votação",
  "privacy.change": "Ajustar a privacidade da mensagem",
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Cine vede asta",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -299,7 +299,6 @@
  "poll.refresh": "Обновить",
  "poll.total_votes": "{count, plural, one {# голос} few {# голоса} many {# голосов} other {# голосов}}",
  "poll.vote": "Голосовать",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Добавить опрос",
  "poll_button.remove_poll": "Удалить опрос",
  "privacy.change": "Изменить видимость статуса",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -111,10 +111,10 @@
  "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
  "confirmations.unfollow.confirm": "Nesleduj",
  "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
-  "conversation.delete": "Vymaž konverzáciu",
-  "conversation.mark_as_read": "Označ za prečítané",
-  "conversation.open": "Ukáž konverzáciu",
-  "conversation.with": "S {names}",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
  "directory.federated": "Zo známého fedivesmíru",
  "directory.local": "Iba z {domain}",
  "directory.new_arrivals": "Nové príchody",
@ -299,7 +299,6 @@
  "poll.refresh": "Obnov",
  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasov}}",
  "poll.vote": "Hlasuj",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Pridaj anketu",
  "poll_button.remove_poll": "Odstráň anketu",
  "privacy.change": "Uprav súkromie príspevku",
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@ -299,7 +299,6 @@
  "poll.refresh": "Osveži",
  "poll.total_votes": "{count, plural,one {# glas} other {# glasov}}",
  "poll.vote": "Glasuj",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Dodaj anketo",
  "poll_button.remove_poll": "Odstrani anketo",
  "privacy.change": "Prilagodi zasebnost statusa",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Rregulloni privatësi gjendje",
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Podesi status privatnosti",
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@ -299,7 +299,6 @@
  "poll.refresh": "Refresh",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Подеси статус приватности",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -299,7 +299,6 @@
  "poll.refresh": "Ladda om",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "Rösta",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Justera sekretess",
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@ -299,7 +299,6 @@
  "poll.refresh": "பத்துயிர்ப்ப?ட்டு",
  "poll.total_votes": "{count, plural, one {# vote} மற்ற {# votes}}",
  "poll.vote": "வாக்களி",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
  "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
  "privacy.change": "நிலை தனியுரிமை",
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@ -299,7 +299,6 @@
  "poll.refresh": "నవీకరించు",
  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
  "poll.vote": "ఎన్నుకోండి",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
  "poll_button.remove_poll": "ఎన్నికను తొలగించు",
  "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -63,7 +63,7 @@
  "column.notifications": "การแจ้งเตือน",
  "column.pins": "โพสต์ที่ปักหมุด",
  "column.public": "เส้นเวลาที่ติดต่อกับภายนอก",
-  "column.status": "โพสต์",
+  "column.status": "Toot",
  "column_back_button.label": "ย้อนกลับ",
  "column_header.hide_settings": "ซ่อนการตั้งค่า",
  "column_header.moveLeft_settings": "ย้ายคอลัมน์ไปทางซ้าย",
@ -111,12 +111,12 @@
  "confirmations.reply.message": "การตอบกลับตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
  "confirmations.unfollow.confirm": "เลิกติดตาม",
  "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
-  "conversation.delete": "ลบการสนทนา",
-  "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
-  "conversation.open": "ดูการสนทนา",
-  "conversation.with": "กับ {names}",
-  "directory.federated": "จากเฟดิเวิร์สที่รู้จัก",
-  "directory.local": "จาก {domain} เท่านั้น",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
  "directory.new_arrivals": "New arrivals",
  "directory.recently_active": "Recently active",
  "embed.instructions": "ฝังสถานะนี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
@ -174,7 +174,7 @@
  "home.column_settings.basic": "พื้นฐาน",
  "home.column_settings.show_reblogs": "แสดงการดัน",
  "home.column_settings.show_replies": "แสดงการตอบกลับ",
-  "home.column_settings.update_live": "อัปเดตตามเวลาจริง",
+  "home.column_settings.update_live": "Update in real-time",
  "intervals.full.days": "{number, plural, other {# วัน}}",
  "intervals.full.hours": "{number, plural, other {# ชั่วโมง}}",
  "intervals.full.minutes": "{number, plural, other {# นาที}}",
@ -299,7 +299,6 @@
  "poll.refresh": "รีเฟรช",
  "poll.total_votes": "{count, plural, other {# การลงคะแนน}}",
  "poll.vote": "ลงคะแนน",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "เพิ่มโพล",
  "poll_button.remove_poll": "เอาโพลออก",
  "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของสถานะ",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -299,7 +299,6 @@
  "poll.refresh": "Yenile",
  "poll.total_votes": "{count, plural, one {# oy} other {# oy}}",
  "poll.vote": "Oy ver",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Bir anket ekleyin",
  "poll_button.remove_poll": "Anket kaldır",
  "privacy.change": "Gönderi gizliliğini ayarla",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -299,7 +299,6 @@
  "poll.refresh": "Оновити",
  "poll.total_votes": "{count, plural, one {# голос} few {# голоси} many {# голосів} other {# голосів}}",
  "poll.vote": "Проголосувати",
-  "poll.voted": "You voted for this answer",
  "poll_button.add_poll": "Додати опитування",
  "poll_button.remove_poll": "Видалити опитування",
  "privacy.change": "Змінити видимість допису",
--- a/app/javascript/mastodon/locales/whitelist_es-AR.json
+++ b/app/javascript/mastodon/locales/whitelist_es-AR.json
@ -1,2 +0,0 @@
-[
-]
--- a/Show More
+++ b/Show More