Merge branch 'master' into glitch-soc/master

Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-09 17:43:30 +02:00 · 2018-05-09 17:43:30 +02:00 · 1c9c0167b7
parent 143878d9da ac788ad47e
commit 1c9c0167b7
145 changed files with 3052 additions and 803 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -11,6 +11,7 @@ aliases:
          RAILS_ENV: test
          PARALLEL_TEST_PROCESSORS: 4
          ALLOW_NOPAM: true
+          DISABLE_SIMPLECOV: true
    working_directory: ~/projects/mastodon/

  - &attach_workspace
@ -90,7 +91,7 @@ aliases:
            command: ./bin/rails parallel:create parallel:load_schema parallel:prepare
        - run:
            name: Run Tests
-            command: bundle exec parallel_test ./spec/ --group-by filesize --type rspec
+            command: ./bin/retry bundle exec parallel_test ./spec/ --group-by filesize --type rspec

 jobs:
  install:
@ -150,7 +151,7 @@ jobs:
      - image: circleci/node:8.11.1-stretch
    steps:
      - *attach_workspace
-      - run: yarn test:jest
+      - run: ./bin/retry yarn test:jest

  check-i18n:
    <<: *defaults
--- a/.env.production.sample
+++ b/.env.production.sample
@ -113,6 +113,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # For Keystone V3, the value for SWIFT_TENANT should be the project name
 # SWIFT_TENANT=
 # SWIFT_PASSWORD=
+# Some OpenStack V3 providers require PROJECT_ID (optional)
+# SWIFT_PROJECT_ID=
 # Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
 # issues with token rate-limiting during high load.
 # SWIFT_AUTH_URL=
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,3 +1,9 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+
+---
+
 [Issue text goes here].

 * * * *
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+
+---
+
+[Issue text goes here].
+
+* * * *
+
+- [ ] I searched or browsed the repo’s other issues to ensure this is not a duplicate.
--- a/1
+++ b/1
@ -113,7 +113,6 @@ group :test do
  gem 'microformats', '~> 4.0'
  gem 'rails-controller-testing', '~> 1.0'
  gem 'rspec-sidekiq', '~> 3.0'
-  gem 'rspec-retry', '~> 0.5', require: false
  gem 'simplecov', '~> 0.16', require: false
  gem 'webmock', '~> 3.3'
  gem 'parallel_tests', '~> 2.21'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -503,8 +503,6 @@ GEM
      rspec-expectations (~> 3.7.0)
      rspec-mocks (~> 3.7.0)
      rspec-support (~> 3.7.0)
-    rspec-retry (0.5.7)
-      rspec-core (> 3.3)
    rspec-sidekiq (3.0.3)
      rspec-core (~> 3.0, >= 3.0.0)
      sidekiq (>= 2.4.0)
@ -729,7 +727,6 @@ DEPENDENCIES
  redis-rails (~> 5.0)
  rqrcode (~> 0.10)
  rspec-rails (~> 3.7)
-  rspec-retry (~> 0.5)
  rspec-sidekiq (~> 3.0)
  rubocop (~> 0.55)
  ruby-progressbar (~> 1.4)
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@ -3,6 +3,7 @@
 module Admin
  class ConfirmationsController < BaseController
    before_action :set_user
+    before_action :check_confirmation, only: [:resend]

    def create
      authorize @user, :confirm?
@ -11,10 +12,28 @@ module Admin
      redirect_to admin_accounts_path
    end

+    def resend
+      authorize @user, :confirm?
+
+      @user.resend_confirmation_instructions
+
+      log_action :confirm, @user
+
+      flash[:notice] = I18n.t('admin.accounts.resend_confirmation.success')
+      redirect_to admin_accounts_path
+    end
+
    private

    def set_user
      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
    end
+
+    def check_confirmation
+      if @user.confirmed?
+        flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
+        redirect_to admin_accounts_path
+      end
+    end
  end
 end
--- a/app/controllers/admin/reported_statuses_controller.rb
+++ b/app/controllers/admin/reported_statuses_controller.rb
@ -3,7 +3,6 @@
 module Admin
  class ReportedStatusesController < BaseController
    before_action :set_report
-    before_action :set_status, only: [:update, :destroy]

    def create
      authorize :status, :update?
@ -14,20 +13,6 @@ module Admin
      redirect_to admin_report_path(@report)
    end

-    def update
-      authorize @status, :update?
-      @status.update!(status_params)
-      log_action :update, @status
-      redirect_to admin_report_path(@report)
-    end
-
-    def destroy
-      authorize @status, :destroy?
-      RemovalWorker.perform_async(@status.id)
-      log_action :destroy, @status
-      render json: @status
-    end
-
    private

    def status_params
@ -51,9 +36,5 @@ module Admin
    def set_report
      @report = Report.find(params[:report_id])
    end
-
-    def set_status
-      @status = @report.statuses.find(params[:id])
-    end
  end
 end
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@ -5,7 +5,6 @@ module Admin
    helper_method :current_params

    before_action :set_account
-    before_action :set_status, only: [:update, :destroy]

    PER_PAGE = 20

@ -26,40 +25,18 @@ module Admin
    def create
      authorize :status, :update?

-      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account))
+      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button))
      flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save

      redirect_to admin_account_statuses_path(@account.id, current_params)
    end

-    def update
-      authorize @status, :update?
-      @status.update!(status_params)
-      log_action :update, @status
-      redirect_to admin_account_statuses_path(@account.id, current_params)
-    end
-
-    def destroy
-      authorize @status, :destroy?
-      RemovalWorker.perform_async(@status.id)
-      log_action :destroy, @status
-      render json: @status
-    end
-
    private

-    def status_params
-      params.require(:status).permit(:sensitive)
-    end
-
    def form_status_batch_params
      params.require(:form_status_batch).permit(:action, status_ids: [])
    end

-    def set_status
-      @status = @account.statuses.find(params[:id])
-    end
-
    def set_account
      @account = Account.find(params[:account_id])
    end
@ -72,5 +49,15 @@ module Admin
        page: page > 1 && page,
      }.select { |_, value| value.present? }
    end
+
+    def action_from_button
+      if params[:nsfw_on]
+        'nsfw_on'
+      elsif params[:nsfw_off]
+        'nsfw_off'
+      elsif params[:delete]
+        'delete'
+      end
+    end
  end
 end
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@ -21,7 +21,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
  private

  def account_params
-    params.permit(:display_name, :note, :avatar, :header, :locked, fields_attributes: [:name, :value])
+    params.permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
  end

  def user_settings_params
--- a/app/controllers/api/v1/statuses/pins_controller.rb
+++ b/app/controllers/api/v1/statuses/pins_controller.rb
@ -39,7 +39,7 @@ class Api::V1::Statuses::PinsController < Api::BaseController
      adapter: ActivityPub::Adapter
    ).as_json

-    ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account)
+    ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account.id)
  end

  def distribute_remove_activity!
@ -49,6 +49,6 @@ class Api::V1::Statuses::PinsController < Api::BaseController
      adapter: ActivityPub::Adapter
    ).as_json

-    ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account)
+    ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account.id)
  end
 end
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@ -24,7 +24,7 @@ class Settings::ProfilesController < Settings::BaseController
  private

  def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
  end

  def set_account
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@ -6,6 +6,7 @@ module SettingsHelper
    ar: 'العربية',
    bg: 'Български',
    ca: 'Català',
+    co: 'Corsu',
    de: 'Deutsch',
    el: 'Ελληνικά',
    eo: 'Esperanto',
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@ -4,8 +4,8 @@ module StreamEntriesHelper
  EMBEDDED_CONTROLLER = 'statuses'
  EMBEDDED_ACTION = 'embed'

-  def display_name(account)
-    account.display_name.presence || account.username
+  def display_name(account, **options)
+    Formatter.instance.format_display_name(account, options)
  end

  def account_description(account)
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@ -1,20 +1,29 @@
 import escapeTextContentForBrowser from 'escape-html';
 import emojify from '../../features/emoji/emoji';
+import { unescapeHTML } from '../../utils/html';

 const domParser = new DOMParser();

+const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
+  obj[`:${emoji.shortcode}:`] = emoji;
+  return obj;
+}, {});
+
 export function normalizeAccount(account) {
  account = { ...account };

+  const emojiMap = makeEmojiMap(account);
  const displayName = account.display_name.length === 0 ? account.username : account.display_name;
-  account.display_name_html = emojify(escapeTextContentForBrowser(displayName));
-  account.note_emojified = emojify(account.note);
+
+  account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
+  account.note_emojified = emojify(account.note, emojiMap);

  if (account.fields) {
    account.fields = account.fields.map(pair => ({
      ...pair,
      name_emojified: emojify(escapeTextContentForBrowser(pair.name)),
-      value_emojified: emojify(pair.value),
+      value_emojified: emojify(pair.value, emojiMap),
+      value_plain: unescapeHTML(pair.value),
    }));
  }

@ -42,11 +51,7 @@ export function normalizeStatus(status, normalOldStatus) {
    normalStatus.hidden = normalOldStatus.get('hidden');
  } else {
    const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
-
-    const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
-      obj[`:${emoji.shortcode}:`] = emoji;
-      return obj;
-    }, {});
+    const emojiMap = makeEmojiMap(normalStatus);

    normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
    normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@ -8,6 +8,7 @@ import {
  importFetchedStatuses,
 } from './importer';
 import { defineMessages } from 'react-intl';
+import { unescapeHTML } from '../utils/html';

 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@ -31,13 +32,6 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
  }
 };

-const unescapeHTML = (html) => {
-  const wrapper = document.createElement('div');
-  html = html.replace(/<br \/>|<br>|\n/g, ' ');
-  wrapper.innerHTML = html;
-  return wrapper.textContent;
-};
-
 export function updateNotifications(notification, intlMessages, intlLocale) {
  return (dispatch, getState) => {
    const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@ -43,6 +43,7 @@ class DropdownMenu extends React.PureComponent {
  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus();
    this.setState({ mounted: true });
  }

@ -55,6 +56,46 @@ class DropdownMenu extends React.PureComponent {
    this.node = c;
  }

+  setFocusRef = c => {
+    this.focusedItem = c;
+  }
+
+  handleKeyDown = e => {
+    const items = Array.from(this.node.getElementsByTagName('a'));
+    const index = items.indexOf(e.currentTarget);
+    let element;
+
+    switch(e.key) {
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = items[index+1];
+      if (element) {
+        element.focus();
+      }
+      break;
+    case 'ArrowUp':
+      element = items[index-1];
+      if (element) {
+        element.focus();
+      }
+      break;
+    case 'Home':
+      element = items[0];
+      if (element) {
+        element.focus();
+      }
+      break;
+    case 'End':
+      element = items[items.length-1];
+      if (element) {
+        element.focus();
+      }
+      break;
+    }
+  }
+
  handleClick = e => {
    const i = Number(e.currentTarget.getAttribute('data-index'));
    const { action, to } = this.props.items[i];
@ -79,7 +120,7 @@ class DropdownMenu extends React.PureComponent {

    return (
      <li className='dropdown-menu__item' key={`${text}-${i}`}>
-        <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' autoFocus={i === 0} onClick={this.handleClick} data-index={i}>
+        <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyDown={this.handleKeyDown} data-index={i}>
          {text}
        </a>
      </li>
@ -156,9 +197,6 @@ export default class Dropdown extends React.PureComponent {

  handleKeyDown = e => {
    switch(e.key) {
-    case 'Enter':
-      this.handleClick(e);
-      break;
    case 'Escape':
      this.handleClose();
      break;
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@ -35,7 +35,6 @@ export default class ScrollableList extends PureComponent {

  state = {
    fullscreen: null,
-    mouseOver: false,
  };

  intersectionObserverWrapper = new IntersectionObserverWrapper();
@ -72,7 +71,7 @@ export default class ScrollableList extends PureComponent {
    const someItemInserted = React.Children.count(prevProps.children) > 0 &&
      React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
      this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
-    if (someItemInserted && this.node.scrollTop > 0 || (this.state.mouseOver && !prevProps.isLoading)) {
+    if (someItemInserted && this.node.scrollTop > 0) {
      return this.node.scrollHeight - this.node.scrollTop;
    } else {
      return null;
@ -140,14 +139,6 @@ export default class ScrollableList extends PureComponent {
    this.props.onLoadMore();
  }

-  handleMouseEnter = () => {
-    this.setState({ mouseOver: true });
-  }
-
-  handleMouseLeave = () => {
-    this.setState({ mouseOver: false });
-  }
-
  render () {
    const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage, onLoadMore } = this.props;
    const { fullscreen } = this.state;
@ -158,7 +149,7 @@ export default class ScrollableList extends PureComponent {

    if (isLoading || childrenCount > 0 || !emptyMessage) {
      scrollableArea = (
-        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
          <div role='feed' className='item-list'>
            {prepend}

--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@ -206,7 +206,7 @@ export default class Status extends ImmutablePureComponent {
        );
      } else {
        media = (
-          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} >
+          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
            {Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />}
          </Bundle>
        );
--- a/app/javascript/mastodon/containers/card_container.js
+++ b/app/javascript/mastodon/containers/card_container.js
@ -1,18 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Card from '../features/status/components/card';
-import { fromJS } from 'immutable';
-
-export default class CardContainer extends React.PureComponent {
-
-  static propTypes = {
-    locale: PropTypes.string,
-    card: PropTypes.array.isRequired,
-  };
-
-  render () {
-    const { card, ...props } = this.props;
-    return <Card card={fromJS(card)} {...props} />;
-  }
-
-}
--- a/app/javascript/mastodon/containers/cards_container.js
+++ b/app/javascript/mastodon/containers/cards_container.js
@ -0,0 +1,59 @@
+import React, { Fragment } from 'react';
+import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
+import { IntlProvider, addLocaleData } from 'react-intl';
+import { getLocale } from '../locales';
+import Card from '../features/status/components/card';
+import ModalRoot from '../components/modal_root';
+import MediaModal from '../features/ui/components/media_modal';
+import { fromJS } from 'immutable';
+
+const { localeData, messages } = getLocale();
+addLocaleData(localeData);
+
+export default class CardsContainer extends React.PureComponent {
+
+  static propTypes = {
+    locale: PropTypes.string,
+    cards: PropTypes.object.isRequired,
+  };
+
+  state = {
+    media: null,
+  };
+
+  handleOpenCard = (media) => {
+    document.body.classList.add('card-standalone__body');
+    this.setState({ media });
+  }
+
+  handleCloseCard = () => {
+    document.body.classList.remove('card-standalone__body');
+    this.setState({ media: null });
+  }
+
+  render () {
+    const { locale, cards } = this.props;
+
+    return (
+      <IntlProvider locale={locale} messages={messages}>
+        <Fragment>
+          {[].map.call(cards, container => {
+            const { card, ...props } = JSON.parse(container.getAttribute('data-props'));
+
+            return ReactDOM.createPortal(
+              <Card card={fromJS(card)} onOpenMedia={this.handleOpenCard} {...props} />,
+              container,
+            );
+          })}
+          <ModalRoot onClose={this.handleCloseCard}>
+            {this.state.media && (
+              <MediaModal media={this.state.media} index={0} onClose={this.handleCloseCard} />
+            )}
+          </ModalRoot>
+        </Fragment>
+      </IntlProvider>
+    );
+  }
+
+}
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@ -1,4 +1,5 @@
-import React from 'react';
+import React, { Fragment } from 'react';
+import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
@ -8,6 +9,7 @@ import { getLocale } from '../locales';
 import PublicTimeline from '../features/standalone/public_timeline';
 import CommunityTimeline from '../features/standalone/community_timeline';
 import HashtagTimeline from '../features/standalone/hashtag_timeline';
+import ModalContainer from '../features/ui/containers/modal_container';
 import initialState from '../initial_state';

 const { localeData, messages } = getLocale();
@ -47,7 +49,13 @@ export default class TimelineContainer extends React.PureComponent {
    return (
      <IntlProvider locale={locale} messages={messages}>
        <Provider store={store}>
-          {timeline}
+          <Fragment>
+            {timeline}
+            {ReactDOM.createPortal(
+              <ModalContainer />,
+              document.getElementById('modal-container'),
+            )}
+          </Fragment>
        </Provider>
      </IntlProvider>
    );
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -131,6 +131,7 @@ export default class Header extends ImmutablePureComponent {
    const content         = { __html: account.get('note_emojified') };
    const displayNameHtml = { __html: account.get('display_name_html') };
    const fields          = account.get('fields');
+    const badge           = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null;

    return (
      <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}>
@ -139,19 +140,20 @@ export default class Header extends ImmutablePureComponent {

          <span className='account__header__display-name' dangerouslySetInnerHTML={displayNameHtml} />
          <span className='account__header__username'>@{account.get('acct')} {lockedIcon}</span>
+
+          {badge}
+
          <div className='account__header__content' dangerouslySetInnerHTML={content} />

          {fields.size > 0 && (
-            <table className='account__header__fields'>
-              <tbody>
-                {fields.map((pair, i) => (
-                  <tr key={i}>
-                    <th dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} />
-                    <td dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} />
-                  </tr>
-                ))}
-              </tbody>
-            </table>
+            <div className='account__header__fields'>
+              {fields.map((pair, i) => (
+                <dl key={i}>
+                  <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
+                  <dd dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} title={pair.get('value_plain')} />
+                </dl>
+              ))}
+            </div>
          )}

          {info}
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@ -42,22 +42,65 @@ class PrivacyDropdownMenu extends React.PureComponent {
    }
  }

-  handleClick = e => {
-    if (e.key === 'Escape') {
-      this.props.onClose();
-    } else if (!e.key || e.key === 'Enter') {
-      const value = e.currentTarget.getAttribute('data-index');
-
-      e.preventDefault();
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element;

+    switch(e.key) {
+    case 'Escape':
      this.props.onClose();
-      this.props.onChange(value);
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1];
+      if (element) {
+        element.focus();
+        this.props.onChange(element.getAttribute('data-index'));
+      }
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1];
+      if (element) {
+        element.focus();
+        this.props.onChange(element.getAttribute('data-index'));
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      if (element) {
+        element.focus();
+        this.props.onChange(element.getAttribute('data-index'));
+      }
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      if (element) {
+        element.focus();
+        this.props.onChange(element.getAttribute('data-index'));
+      }
+      break;
    }
  }

+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  }
+
  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus();
    this.setState({ mounted: true });
  }

@ -70,6 +113,10 @@ class PrivacyDropdownMenu extends React.PureComponent {
    this.node = c;
  }

+  setFocusRef = c => {
+    this.focusedItem = c;
+  }
+
  render () {
    const { mounted } = this.state;
    const { style, items, value } = this.props;
@ -80,9 +127,9 @@ class PrivacyDropdownMenu extends React.PureComponent {
          // It should not be transformed when mounting because the resulting
          // size will be used to determine the coordinate of the menu by
          // react-overlays
-          <div className='privacy-dropdown__dropdown' style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}>
+          <div className='privacy-dropdown__dropdown' style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} role='listbox' ref={this.setRef}>
            {items.map(item => (
-              <div role='button' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleClick} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })}>
+              <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
                <div className='privacy-dropdown__option__icon'>
                  <i className={`fa fa-fw fa-${item.icon}`} />
                </div>
@ -147,9 +194,6 @@ export default class PrivacyDropdown extends React.PureComponent {

  handleKeyDown = e => {
    switch(e.key) {
-    case 'Enter':
-      this.handleToggle(e);
-      break;
    case 'Escape':
      this.handleClose();
      break;
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@ -43,11 +43,19 @@ export default class Compose extends React.PureComponent {
  };

  componentDidMount () {
-    this.props.dispatch(mountCompose());
+    const { isSearchPage } = this.props;
+
+    if (!isSearchPage) {
+      this.props.dispatch(mountCompose());
+    }
  }

  componentWillUnmount () {
-    this.props.dispatch(unmountCompose());
+    const { isSearchPage } = this.props;
+
+    if (!isSearchPage) {
+      this.props.dispatch(unmountCompose());
+    }
  }

  onFocus = () => {
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@ -40,6 +40,17 @@ export default class ModalRoot extends React.PureComponent {
    onClose: PropTypes.func.isRequired,
  };

+  getSnapshotBeforeUpdate () {
+    const visible = !!this.props.type;
+    return {
+      overflowY: visible ? 'hidden' : null,
+    };
+  }
+
+  componentDidUpdate (prevProps, prevState, { overflowY }) {
+    document.body.style.overflowY = overflowY;
+  }
+
  renderLoading = modalId => () => {
    return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
  }
--- a/app/javascript/mastodon/features/ui/components/report_modal.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@ -30,7 +30,7 @@ const makeMapStateToProps = () => {
      account: getAccount(state, accountId),
      comment: state.getIn(['reports', 'new', 'comment']),
      forward: state.getIn(['reports', 'new', 'forward']),
-      statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
+      statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
    };
  };

@ -64,12 +64,12 @@ export default class ReportModal extends ImmutablePureComponent {
  }

  componentDidMount () {
-    this.props.dispatch(expandAccountTimeline(this.props.account.get('id')));
+    this.props.dispatch(expandAccountTimeline(this.props.account.get('id'), { withReplies: true }));
  }

  componentWillReceiveProps (nextProps) {
    if (this.props.account !== nextProps.account && nextProps.account) {
-      this.props.dispatch(expandAccountTimeline(nextProps.account.get('id')));
+      this.props.dispatch(expandAccountTimeline(nextProps.account.get('id'), { withReplies: true }));
    }
  }

--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@ -21,6 +21,8 @@ const makeGetStatusIds = () => createSelector([
  }

  return statusIds.filter(id => {
+    if (id === null) return true;
+
    const statusForId = statuses.get(id);
    let showStatus    = true;

--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -258,7 +258,7 @@
  "status.pin": "تدبيس على الملف الشخصي",
  "status.pinned": "تبويق مثبَّت",
  "status.reblog": "رَقِّي",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "القيام بالترقية إلى الجمهور الأصلي",
  "status.reblogged_by": "{name} رقى",
  "status.reply": "ردّ",
  "status.replyAll": "رُد على الخيط",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -0,0 +1,296 @@
+{
+  "account.block": "Bluccà @{name}",
+  "account.block_domain": "Piattà tuttu da {domain}",
+  "account.blocked": "Bluccatu",
+  "account.direct": "Missaghju direttu @{name}",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.domain_blocked": "Duminiu piattatu",
+  "account.edit_profile": "Mudificà u prufile",
+  "account.follow": "Siguità",
+  "account.followers": "Abbunati",
+  "account.follows": "Abbunamenti",
+  "account.follows_you": "Vi seguita",
+  "account.hide_reblogs": "Piattà spartere da @{name}",
+  "account.media": "Media",
+  "account.mention": "Mintuvà @{name}",
+  "account.moved_to": "{name} hè partutu nant'à:",
+  "account.mute": "Piattà @{name}",
+  "account.mute_notifications": "Piattà nutificazione da @{name}",
+  "account.muted": "Piattatu",
+  "account.posts": "Statuti",
+  "account.posts_with_replies": "Statuti è risposte",
+  "account.report": "Palisà @{name}",
+  "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
+  "account.share": "Sparte u prufile di @{name}",
+  "account.show_reblogs": "Vede spartere da @{name}",
+  "account.unblock": "Sbluccà @{name}",
+  "account.unblock_domain": "Ùn piattà più {domain}",
+  "account.unfollow": "Ùn siguità più",
+  "account.unmute": "Ùn piattà più @{name}",
+  "account.unmute_notifications": "Ùn piattà più nutificazione da @{name}",
+  "account.view_full_profile": "View full profile",
+  "alert.unexpected.message": "Un prublemu inaspettatu hè accadutu.",
+  "alert.unexpected.title": "Uups!",
+  "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
+  "bundle_column_error.body": "C'hè statu un prublemu caricandu st'elementu.",
+  "bundle_column_error.retry": "Pruvà torna",
+  "bundle_column_error.title": "Errore di cunnessione",
+  "bundle_modal_error.close": "Chjudà",
+  "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.",
+  "bundle_modal_error.retry": "Pruvà torna",
+  "column.blocks": "Utilizatori bluccati",
+  "column.community": "Linea pubblica lucale",
+  "column.direct": "Missaghji diretti",
+  "column.domain_blocks": "Duminii piattati",
+  "column.favourites": "Favuriti",
+  "column.follow_requests": "Dumande d'abbunamentu",
+  "column.home": "Accolta",
+  "column.lists": "Liste",
+  "column.mutes": "Utilizatori piattati",
+  "column.notifications": "Nutificazione",
+  "column.pins": "Statuti puntarulati",
+  "column.public": "Linea pubblica glubale",
+  "column_back_button.label": "Ritornu",
+  "column_header.hide_settings": "Piattà i parametri",
+  "column_header.moveLeft_settings": "Spiazzà à manca",
+  "column_header.moveRight_settings": "Spiazzà à diritta",
+  "column_header.pin": "Puntarulà",
+  "column_header.show_settings": "Mustrà i parametri",
+  "column_header.unpin": "Spuntarulà",
+  "column_subheading.navigation": "Navigazione",
+  "column_subheading.settings": "Parametri",
+  "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
+  "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".",
+  "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
+  "compose_form.lock_disclaimer.lock": "privatu",
+  "compose_form.placeholder": "À chè pensate?",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media indicatu cum'è sensibile",
+  "compose_form.sensitive.unmarked": "Media micca indicatu cum'è sensibile",
+  "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
+  "compose_form.spoiler.unmarked": "Testu micca piattatu",
+  "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
+  "confirmation_modal.cancel": "Annullà",
+  "confirmations.block.confirm": "Bluccà",
+  "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
+  "confirmations.delete.confirm": "Toglie",
+  "confirmations.delete.message": "Site sicuru·a che vulete supprime stu statutu?",
+  "confirmations.delete_list.confirm": "Toglie",
+  "confirmations.delete_list.message": "Site sicuru·a che vulete supprime sta lista?",
+  "confirmations.domain_block.confirm": "Piattà tuttu u duminiu?",
+  "confirmations.domain_block.message": "Site sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà.",
+  "confirmations.mute.confirm": "Piattà",
+  "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
+  "confirmations.unfollow.confirm": "Disabbunassi",
+  "confirmations.unfollow.message": "Site sicuru·a ch'ùn vulete più siguità @{name}?",
+  "embed.instructions": "Integrà stu statutu à u vostru situ cù u codice quì sottu.",
+  "embed.preview": "Assumiglierà à qualcosa cusì:",
+  "emoji_button.activity": "Attività",
+  "emoji_button.custom": "Persunalizati",
+  "emoji_button.flags": "Bandere",
+  "emoji_button.food": "Manghjusca è Bienda",
+  "emoji_button.label": "Mette un'emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Ùn c'hè nunda! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.objects": "Oggetti",
+  "emoji_button.people": "Parsunaghji",
+  "emoji_button.recent": "Assai utilizati",
+  "emoji_button.search": "Cercà...",
+  "emoji_button.search_results": "Risultati di a cerca",
+  "emoji_button.symbols": "Simbuli",
+  "emoji_button.travel": "Lochi è Viaghju",
+  "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
+  "empty_column.direct": "Ùn avete ancu nisun missaghju direttu. S'è voi mandate o ricevete unu, u vidarete quì.",
+  "empty_column.hashtag": "Ùn c'hè ancu nunda quì.",
+  "empty_column.home": "A vostr'accolta hè viota! Pudete andà nant'à {public} o pruvà a ricerca per truvà parsone da siguità.",
+  "empty_column.home.public_timeline": "a linea pubblica",
+  "empty_column.list": "Ùn c'hè ancu nunda quì. Quandu membri di sta lista manderanu novi statuti, i vidarete quì.",
+  "empty_column.notifications": "Ùn avete ancu nisuna nutificazione. Interact with others to start the conversation.",
+  "empty_column.public": "Ùn c'hè nunda quì! Scrivete qualcosa in pubblicu o seguitate utilizatori d'altre istanze per empie a linea pubblica.",
+  "follow_request.authorize": "Auturizà",
+  "follow_request.reject": "Righjittà",
+  "getting_started.appsshort": "Applicazione",
+  "getting_started.faq": "FAQ",
+  "getting_started.heading": "Per principià",
+  "getting_started.open_source_notice": "Mastodon ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un bug, nant'à GitHub: {github}",
+  "getting_started.userguide": "Guida d'utilizazione",
+  "home.column_settings.advanced": "Avanzati",
+  "home.column_settings.basic": "Bàsichi",
+  "home.column_settings.filter_regex": "Filtrà cù spressione regulare (regex)",
+  "home.column_settings.show_reblogs": "Vede e spartere",
+  "home.column_settings.show_replies": "Vede e risposte",
+  "home.settings": "Parametri di a colonna",
+  "keyboard_shortcuts.back": "rivultà",
+  "keyboard_shortcuts.boost": "sparte",
+  "keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
+  "keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
+  "keyboard_shortcuts.description": "Descrizzione",
+  "keyboard_shortcuts.down": "falà indè a lista",
+  "keyboard_shortcuts.enter": "apre u statutu",
+  "keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
+  "keyboard_shortcuts.heading": "Accorte cù a tastera",
+  "keyboard_shortcuts.hotkey": "Accorta",
+  "keyboard_shortcuts.legend": "vede a legenda",
+  "keyboard_shortcuts.mention": "mintuvà l'autore",
+  "keyboard_shortcuts.reply": "risponde",
+  "keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
+  "keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
+  "keyboard_shortcuts.toot": "scrive un novu statutu",
+  "keyboard_shortcuts.unfocus": "ùn fucalizà più l'area di testu",
+  "keyboard_shortcuts.up": "cullà indè a lista",
+  "lightbox.close": "Chjudà",
+  "lightbox.next": "Siguente",
+  "lightbox.previous": "Pricidente",
+  "lists.account.add": "Aghjunghje à a lista",
+  "lists.account.remove": "Toglie di a lista",
+  "lists.delete": "Supprime a lista",
+  "lists.edit": "Mudificà a lista",
+  "lists.new.create": "Aghjustà una lista",
+  "lists.new.title_placeholder": "Titulu di a lista",
+  "lists.search": "Circà indè i vostr'abbunamenti",
+  "lists.subheading": "E vo liste",
+  "loading_indicator.label": "Caricamentu...",
+  "media_gallery.toggle_visible": "Cambià a visibilità",
+  "missing_indicator.label": "Micca trovu",
+  "missing_indicator.sublabel": "Ùn era micca pussivule di truvà sta risorsa",
+  "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
+  "navigation_bar.blocks": "Utilizatori bluccati",
+  "navigation_bar.community_timeline": "Linea pubblica lucale",
+  "navigation_bar.direct": "Missaghji diretti",
+  "navigation_bar.domain_blocks": "Duminii piattati",
+  "navigation_bar.edit_profile": "Mudificà u prufile",
+  "navigation_bar.favourites": "Favuriti",
+  "navigation_bar.follow_requests": "Dumande d'abbunamentu",
+  "navigation_bar.info": "À prupositu di l'istanza",
+  "navigation_bar.keyboard_shortcuts": "Accorte cù a tastera",
+  "navigation_bar.lists": "Liste",
+  "navigation_bar.logout": "Scunnettassi",
+  "navigation_bar.mutes": "Utilizatori piattati",
+  "navigation_bar.pins": "Statuti puntarulati",
+  "navigation_bar.preferences": "Preferenze",
+  "navigation_bar.public_timeline": "Linea pubblica glubale",
+  "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
+  "notification.follow": "{name} v'hà seguitatu",
+  "notification.mention": "{name} v'hà mintuvatu",
+  "notification.reblog": "{name} hà spartutu u vostru statutu",
+  "notifications.clear": "Purgà e nutificazione",
+  "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
+  "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
+  "notifications.column_settings.favourite": "Favuriti:",
+  "notifications.column_settings.follow": "Abbunati novi:",
+  "notifications.column_settings.mention": "Minzione:",
+  "notifications.column_settings.push": "Nutificazione Push",
+  "notifications.column_settings.push_meta": "Quess'apparechju",
+  "notifications.column_settings.reblog": "Spartere:",
+  "notifications.column_settings.show": "Mustrà indè a colonna",
+  "notifications.column_settings.sound": "Sunà",
+  "onboarding.done": "Fatta",
+  "onboarding.next": "Siguente",
+  "onboarding.page_five.public_timelines": "A linea pubblica lucale mostra statuti pubblichi da tuttu u mondu nant'à {domain}. A linea pubblica glubale mostra ancu quelli di a ghjente seguitata da l'utilizatori di {domain}. Quesse sò una bona manera d'incuntrà nove parsone.",
+  "onboarding.page_four.home": "A linea d'accolta mostra i statuti di i vostr'abbunamenti.",
+  "onboarding.page_four.notifications": "A colonna di nutificazione mostra l'interazzione ch'altre parsone anu cù u vostru contu.",
+  "onboarding.page_one.federation": "Mastodon ghjè una rete di servori independenti, chjamati istanze, uniti indè una sola rete suciale.",
+  "onboarding.page_one.full_handle": "U vostru identificatore cumplettu",
+  "onboarding.page_one.handle_hint": "Quessu ghjè cio chì direte à i vostri amichi per circavi.",
+  "onboarding.page_one.welcome": "Benvenuti/a nant'à Mastodon!",
+  "onboarding.page_six.admin": "L'amministratore di a vostr'istanza hè {admin}.",
+  "onboarding.page_six.almost_done": "Quasgi finitu...",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
+  "onboarding.page_six.apps_available": "Ci sò {apps} dispunibule per iOS, Android è altre piattaforme.",
+  "onboarding.page_six.github": "Mastodon ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un prublemu, nant'à {github}.",
+  "onboarding.page_six.guidelines": "regule di a cumunità",
+  "onboarding.page_six.read_guidelines": "Ùn vi scurdate di leghje e {guidelines} di {domain}",
+  "onboarding.page_six.various_app": "applicazione pè u telefuninu",
+  "onboarding.page_three.profile": "Pudete mudificà u prufile per cambia u ritrattu, a descrizzione è u nome affissatu. Ci sò ancu alcun'altre preferenze.",
+  "onboarding.page_three.search": "Fate usu di l'area di ricerca per truvà altre persone è vede hashtag cum'è {illustration} o {introductions}. Per vede qualcunu ch'ùn hè micca nant'à st'istanza, cercate u so identificatore complettu (pare un'email).",
+  "onboarding.page_two.compose": "I statuti è missaghji si scrivenu indè l'area di ridazzione. Pudete caricà imagine, cambià i parametri di pubblicazione, è mette avertimenti di cuntenuti cù i buttoni quì sottu.",
+  "onboarding.skip": "Passà",
+  "privacy.change": "Mudificà a cunfidenzialità di u statutu",
+  "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
+  "privacy.direct.short": "Direttu",
+  "privacy.private.long": "Mustrà solu à l'abbunati",
+  "privacy.private.short": "Privatu",
+  "privacy.public.long": "Mustrà à tuttu u mondu nant'a linea pubblica",
+  "privacy.public.short": "Pubblicu",
+  "privacy.unlisted.long": "Ùn mette micca nant'a linea pubblica (ma tutt'u mondu pò vede u statutu nant'à u vostru prufile)",
+  "privacy.unlisted.short": "Micca listatu",
+  "regeneration_indicator.label": "Caricamentu…",
+  "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "avà",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "Annullà",
+  "report.forward": "Trasferisce à {target}",
+  "report.forward_hint": "U contu hè nant'à un'altru servore. Vulete ancu mandà una copia anonima di u signalamentu quallà?",
+  "report.hint": "U signalamentu sarà mandatu à i muderatori di l'istanza. Pudete spiegà perchè avete palisatu stu contu quì sottu:",
+  "report.placeholder": "Altri cummenti",
+  "report.submit": "Mandà",
+  "report.target": "Signalamentu",
+  "search.placeholder": "Circà",
+  "search_popout.search_format": "Ricerca avanzata",
+  "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": "statutu",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "utilizatore",
+  "search_results.accounts": "Ghjente",
+  "search_results.hashtags": "Hashtags",
+  "search_results.statuses": "Statuti",
+  "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}",
+  "standalone.public_title": "Una vista di...",
+  "status.block": "Bluccà @{name}",
+  "status.cancel_reblog_private": "Ùn sparte più",
+  "status.cannot_reblog": "Stu statutu ùn pò micca esse spartutu",
+  "status.delete": "Toglie",
+  "status.direct": "Mandà un missaghju @{name}",
+  "status.embed": "Integrà",
+  "status.favourite": "Aghjunghje à i favuriti",
+  "status.load_more": "Vede di più",
+  "status.media_hidden": "Media piattata",
+  "status.mention": "Mintuvà @{name}",
+  "status.more": "Più",
+  "status.mute": "Piattà @{name}",
+  "status.mute_conversation": "Piattà a cunversazione",
+  "status.open": "Apre stu statutu",
+  "status.pin": "Puntarulà à u prufile",
+  "status.pinned": "Statutu puntarulatu",
+  "status.reblog": "Sparte",
+  "status.reblog_private": "Sparte à l'audienza uriginale",
+  "status.reblogged_by": "{name} hà spartutu",
+  "status.reply": "Risponde",
+  "status.replyAll": "Risponde à tutti",
+  "status.report": "Palisà @{name}",
+  "status.sensitive_toggle": "Cliccate per vede",
+  "status.sensitive_warning": "Cuntinutu sensibile",
+  "status.share": "Sparte",
+  "status.show_less": "Ripiegà",
+  "status.show_less_all": "Ripiegà tuttu",
+  "status.show_more": "Slibrà",
+  "status.show_more_all": "Slibrà tuttu",
+  "status.unmute_conversation": "Ùn piattà più a cunversazione",
+  "status.unpin": "Spuntarulà da u prufile",
+  "tabs_bar.federated_timeline": "Glubale",
+  "tabs_bar.home": "Accolta",
+  "tabs_bar.local_timeline": "Lucale",
+  "tabs_bar.notifications": "Nutificazione",
+  "tabs_bar.search": "Cercà",
+  "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
+  "upload_area.title": "Drag & drop per caricà un fugliale",
+  "upload_button.label": "Aghjunghje un media",
+  "upload_form.description": "Discrive per i malvistosi",
+  "upload_form.focus": "Riquatrà",
+  "upload_form.undo": "Annullà",
+  "upload_progress.label": "Caricamentu...",
+  "video.close": "Chjudà a video",
+  "video.exit_fullscreen": "Caccià u pienu screnu",
+  "video.expand": "Ingrandà a video",
+  "video.fullscreen": "Pienu screnu",
+  "video.hide": "Piattà a video",
+  "video.mute": "Surdina",
+  "video.pause": "Pausa",
+  "video.play": "Lettura",
+  "video.unmute": "Caccià a surdina"
+}
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -2,9 +2,9 @@
  "account.block": "Απόκλεισε τον/την @{name}",
  "account.block_domain": "Απόκρυψε τα πάντα από τον/την",
  "account.blocked": "Αποκλεισμένος/η",
-  "account.direct": "Απευθείας μήνυμα προς @{name}",
+  "account.direct": "Άμεσο μήνυμα προς @{name}",
  "account.disclaimer_full": "Οι παρακάτω πληροφορίες μπορει να μην αντανακλούν το προφίλ του χρήστη επαρκως.",
-  "account.domain_blocked": "Domain hidden",
+  "account.domain_blocked": "Κρυμμένος τομέας",
  "account.edit_profile": "Επεξεργάσου το προφίλ",
  "account.follow": "Ακολούθησε",
  "account.followers": "Ακόλουθοι",
@ -23,15 +23,15 @@
  "account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα ακολούθησης",
  "account.share": "Μοιράσου το προφίλ του/της @{name}",
  "account.show_reblogs": "Δείξε τις προωθήσεις του/της @{name}",
-  "account.unblock": "Unblock @{name}",
+  "account.unblock": "Ξεμπλόκαρε τον/την @{name}",
  "account.unblock_domain": "Αποκάλυψε το {domain}",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unfollow": "Διακοπή παρακολούθησης",
+  "account.unmute": "Διακοπή αποσιώπησης του/της @{name}",
+  "account.unmute_notifications": "Διακοπή αποσιώπησης ειδοποιήσεων του/της @{name}",
  "account.view_full_profile": "Δες το πλήρες προφίλ",
  "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
  "alert.unexpected.title": "Εεπ!",
-  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις αυτό την επόμενη φορά",
  "bundle_column_error.body": "Κάτι πήγε στραβά ενώ φορτωνόταν αυτό το στοιχείο.",
  "bundle_column_error.retry": "Δοκίμασε ξανά",
  "bundle_column_error.title": "Σφάλμα δικτύου",
@ -41,7 +41,7 @@
  "column.blocks": "Αποκλεισμένοι χρήστες",
  "column.community": "Τοπική ροή",
  "column.direct": "Απευθείας μηνύματα",
-  "column.domain_blocks": "Hidden domains",
+  "column.domain_blocks": "Κρυμμένοι τομείς",
  "column.favourites": "Αγαπημένα",
  "column.follow_requests": "Αιτήματα παρακολούθησης",
  "column.home": "Αρχική",
@ -60,7 +60,7 @@
  "column_subheading.navigation": "Πλοήγηση",
  "column_subheading.settings": "Ρυθμίσεις",
  "compose_form.direct_message_warning": "Αυτό το τουτ θα εμφανίζεται μόνο σε όλους τους αναφερόμενους χρήστες.",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από καμία ταμπέλα καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά ταμπέλα.",
  "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
  "compose_form.lock_disclaimer.lock": "κλειδωμένος",
  "compose_form.placeholder": "Τι σκέφτεσαι;",
@ -78,65 +78,65 @@
  "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή την κατάσταση;",
  "confirmations.delete_list.confirm": "Διέγραψε",
  "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
-  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "getting_started.appsshort": "Apps",
+  "confirmations.domain_block.confirm": "Απόκρυψη ολόκληρου του τομέα",
+  "confirmations.domain_block.message": "Σίγουρα θες να μπλοκάρεις ολόκληρο το {domain}; Συνήθως μερικά εστιασμένα μπλοκ ή αποσιωπήσεις επαρκούν και προτιμούνται.",
+  "confirmations.mute.confirm": "Αποσιώπηση",
+  "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις τον/την {name};",
+  "confirmations.unfollow.confirm": "Διακοπή παρακολούθησης",
+  "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
+  "embed.instructions": "Ενσωματώστε αυτή την κατάσταση στην ιστοσελίδα σας αντιγράφοντας τον παρακάτω κώδικα.",
+  "embed.preview": "Ορίστε πως θα φαίνεται:",
+  "emoji_button.activity": "Δραστηριότητα",
+  "emoji_button.custom": "Προσαρμοσμένα",
+  "emoji_button.flags": "Σημαίες",
+  "emoji_button.food": "Φαγητά & Ποτά",
+  "emoji_button.label": "Εισάγετε emoji",
+  "emoji_button.nature": "Φύση",
+  "emoji_button.not_found": "Ουδέν emojo!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.objects": "Αντικείμενα",
+  "emoji_button.people": "Άνθρωποι",
+  "emoji_button.recent": "Δημοφιλή",
+  "emoji_button.search": "Αναζήτηση…",
+  "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
+  "emoji_button.symbols": "Σύμβολα",
+  "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
+  "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
+  "empty_column.direct": "Δεν έχεις απευθείας μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
+  "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ταμπέλα.",
+  "empty_column.home": "Η τοπική σου ροή είναι κενή! Πήγαινε στο {public} ή κάνε αναζήτηση για να ξεκινήσεις και να γνωρίσεις άλλους χρήστες.",
+  "empty_column.home.public_timeline": "η δημόσια ροή",
+  "empty_column.list": "Δεν υπάρχει τίποτα σε αυτή τη λίστα ακόμα. Όταν τα μέλη της δημοσιεύσουν νέες καταστάσεις, θα εμφανιστούν εδώ",
+  "empty_column.notifications": "Δεν έχεις ειδοποιήσεις ακόμα. Αλληλεπίδρασε με άλλους χρήστες για να ξεκινήσεις την κουβέντα.",
+  "empty_column.public": "Δεν υπάρχει τίποτα εδώ! Γράψε κάτι δημόσιο, ή ακολούθησε χειροκίνητα χρήστες από άλλα instances για να το γεμίσεις",
+  "follow_request.authorize": "Ενέκρινε",
+  "follow_request.reject": "Απέρριψε",
+  "getting_started.appsshort": "Εφαρμογές",
  "getting_started.faq": "FAQ",
-  "getting_started.heading": "Getting started",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.userguide": "User Guide",
-  "home.column_settings.advanced": "Advanced",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.filter_regex": "Filter out by regular expressions",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "home.settings": "Column settings",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "getting_started.heading": "Ξεκινώντας",
+  "getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
+  "getting_started.userguide": "Οδηγός Χρηστών",
+  "home.column_settings.advanced": "Προχωρημένα",
+  "home.column_settings.basic": "Βασικά",
+  "home.column_settings.filter_regex": "Φιλτράρετε μέσω regular expressions",
+  "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
+  "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
+  "home.settings": "Ρυθμίσεις στηλών",
+  "keyboard_shortcuts.back": "για επιστροφή πίσω",
+  "keyboard_shortcuts.boost": "για προώθηση",
+  "keyboard_shortcuts.column": "για εστίαση μιας κατάστασης σε μια από τις στήλες",
+  "keyboard_shortcuts.compose": "για εστίαση στην περιοχή κειμένου συγγραφής",
  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.down": "για κίνηση προς τα κάτω στη λίστα",
  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourite": "για σημείωση αγαπημένου",
  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.hotkey": "Συντόμευση",
+  "keyboard_shortcuts.legend": "για να εμφανίσεις αυτόν τον οδηγό",
+  "keyboard_shortcuts.mention": "για να αναφέρεις το συγγραφέα",
+  "keyboard_shortcuts.reply": "για απάντηση",
+  "keyboard_shortcuts.search": "για εστίαση αναζήτησης",
+  "keyboard_shortcuts.toggle_hidden": "για εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση",
+  "keyboard_shortcuts.toot": "για δημιουργία ολοκαίνουριου τουτ",
  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
  "keyboard_shortcuts.up": "to move up in the list",
  "lightbox.close": "Close",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -2,7 +2,7 @@
  "account.block": "Bloki @{name}",
  "account.block_domain": "Kaŝi ĉion de {domain}",
  "account.blocked": "Blokita",
-  "account.direct": "Direct message @{name}",
+  "account.direct": "Rekte mesaĝi @{name}",
  "account.disclaimer_full": "Subaj informoj povas reflekti la profilon de la uzanto nekomplete.",
  "account.domain_blocked": "Domajno kaŝita",
  "account.edit_profile": "Redakti profilon",
@ -29,8 +29,8 @@
  "account.unmute": "Malsilentigi @{name}",
  "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
  "account.view_full_profile": "Vidi plenan profilon",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "alert.unexpected.message": "Neatendita eraro okazis.",
+  "alert.unexpected.title": "Ups!",
  "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
  "bundle_column_error.body": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
  "bundle_column_error.retry": "Bonvolu reprovi",
@ -40,8 +40,8 @@
  "bundle_modal_error.retry": "Bonvolu reprovi",
  "column.blocks": "Blokitaj uzantoj",
  "column.community": "Loka tempolinio",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "Hidden domains",
+  "column.direct": "Rektaj mesaĝoj",
+  "column.domain_blocks": "Kaŝitaj domajnoj",
  "column.favourites": "Stelumoj",
  "column.follow_requests": "Petoj de sekvado",
  "column.home": "Hejmo",
@ -59,7 +59,7 @@
  "column_header.unpin": "Depingli",
  "column_subheading.navigation": "Navigado",
  "column_subheading.settings": "Agordado",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "compose_form.direct_message_warning": "Tiu mesaĝo videblos nur por ĉiuj menciitaj uzantoj.",
  "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
  "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.",
  "compose_form.lock_disclaimer.lock": "ŝlosita",
@ -101,7 +101,7 @@
  "emoji_button.symbols": "Simboloj",
  "emoji_button.travel": "Vojaĝoj kaj lokoj",
  "empty_column.community": "La loka tempolinio estas malplena. Skribu ion por plenigi ĝin!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
  "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.",
  "empty_column.home": "Via hejma tempolinio estas malplena! Vizitu {public} aŭ uzu la serĉilon por renkonti aliajn uzantojn.",
  "empty_column.home.public_timeline": "la publikan tempolinion",
@ -135,7 +135,7 @@
  "keyboard_shortcuts.mention": "por mencii la aŭtoron",
  "keyboard_shortcuts.reply": "por respondi",
  "keyboard_shortcuts.search": "por fokusigi la serĉilon",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_hidden": "por montri/kaŝi tekston malantaŭ enhava averto",
  "keyboard_shortcuts.toot": "por komenci tute novan mesaĝon",
  "keyboard_shortcuts.unfocus": "por malfokusigi la tekstujon aŭ la serĉilon",
  "keyboard_shortcuts.up": "por iri supren en la listo",
@ -157,8 +157,8 @@
  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn el ĉi tiu uzanto?",
  "navigation_bar.blocks": "Blokitaj uzantoj",
  "navigation_bar.community_timeline": "Loka tempolinio",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.direct": "Rektaj mesaĝoj",
+  "navigation_bar.domain_blocks": "Kaŝitaj domajnoj",
  "navigation_bar.edit_profile": "Redakti profilon",
  "navigation_bar.favourites": "Stelumoj",
  "navigation_bar.follow_requests": "Petoj de sekvado",
@ -242,10 +242,10 @@
  "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezultoj}}",
  "standalone.public_title": "Enrigardo…",
  "status.block": "Bloki @{name}",
-  "status.cancel_reblog_private": "Unboost",
+  "status.cancel_reblog_private": "Eksdiskonigi",
  "status.cannot_reblog": "Ĉi tiu mesaĝo ne diskonigeblas",
  "status.delete": "Forigi",
-  "status.direct": "Direct message @{name}",
+  "status.direct": "Rekte mesaĝi @{name}",
  "status.embed": "Enkorpigi",
  "status.favourite": "Stelumi",
  "status.load_more": "Ŝargi pli",
@ -258,7 +258,7 @@
  "status.pin": "Alpingli profile",
  "status.pinned": "Alpinglita mesaĝo",
  "status.reblog": "Diskonigi",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Diskonigi al la originala atentaro",
  "status.reblogged_by": "{name} diskonigis",
  "status.reply": "Respondi",
  "status.replyAll": "Respondi al la fadeno",
@ -276,7 +276,7 @@
  "tabs_bar.home": "Hejmo",
  "tabs_bar.local_timeline": "Loka tempolinio",
  "tabs_bar.notifications": "Sciigoj",
-  "tabs_bar.search": "Search",
+  "tabs_bar.search": "Serĉi",
  "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",
  "upload_area.title": "Altreni kaj lasi por alŝuti",
  "upload_button.label": "Aldoni aŭdovidaĵon",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -13,7 +13,7 @@
  "account.hide_reblogs": "Masquer les partages de @{name}",
  "account.media": "Média",
  "account.mention": "Mentionner",
-  "account.moved_to": "{name} a déménagé vers :",
+  "account.moved_to": "{name} a déménagé vers :",
  "account.mute": "Masquer @{name}",
  "account.mute_notifications": "Ignorer les notifications de @{name}",
  "account.muted": "Silencé",
@ -30,7 +30,7 @@
  "account.unmute_notifications": "Réactiver les notifications de @{name}",
  "account.view_full_profile": "Afficher le profil complet",
  "alert.unexpected.message": "Une erreur non-attendue s'est produite.",
-  "alert.unexpected.title": "Oups !",
+  "alert.unexpected.title": "Oups !",
  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
  "bundle_column_error.body": "Une erreur s’est produite lors du chargement de ce composant.",
  "bundle_column_error.retry": "Réessayer",
@ -77,7 +77,7 @@
  "confirmations.delete.confirm": "Supprimer",
  "confirmations.delete.message": "Confirmez-vous la suppression de ce pouet ?",
  "confirmations.delete_list.confirm": "Supprimer",
-  "confirmations.delete_list.message": "Êtes-vous sûr de vouloir supprimer définitivement cette liste ?",
+  "confirmations.delete_list.message": "Êtes-vous sûr de vouloir supprimer définitivement cette liste ?",
  "confirmations.domain_block.confirm": "Masquer le domaine entier",
  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables.",
  "confirmations.mute.confirm": "Masquer",
@ -85,14 +85,14 @@
  "confirmations.unfollow.confirm": "Ne plus suivre",
  "confirmations.unfollow.message": "Voulez-vous arrêter de suivre {name} ?",
  "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.",
-  "embed.preview": "Il apparaîtra comme cela :",
+  "embed.preview": "Il apparaîtra comme cela :",
  "emoji_button.activity": "Activités",
  "emoji_button.custom": "Personnalisés",
  "emoji_button.flags": "Drapeaux",
  "emoji_button.food": "Nourriture & Boisson",
  "emoji_button.label": "Insérer un émoji",
  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "Pas d'emojis !! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Pas d'emojis !! (╯°□°）╯︵ ┻━┻",
  "emoji_button.objects": "Objets",
  "emoji_button.people": "Personnages",
  "emoji_button.recent": "Fréquemment utilisés",
@ -154,7 +154,7 @@
  "media_gallery.toggle_visible": "Modifier la visibilité",
  "missing_indicator.label": "Non trouvé",
  "missing_indicator.sublabel": "Ressource introuvable",
-  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
+  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
  "navigation_bar.blocks": "Comptes bloqués",
  "navigation_bar.community_timeline": "Fil public local",
  "navigation_bar.direct": "Messages directs",
@ -177,9 +177,9 @@
  "notifications.clear": "Nettoyer les notifications",
  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
  "notifications.column_settings.alert": "Notifications locales",
-  "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e·s :",
-  "notifications.column_settings.mention": "Mentions :",
+  "notifications.column_settings.favourite": "Favoris :",
+  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e·s :",
+  "notifications.column_settings.mention": "Mentions :",
  "notifications.column_settings.push": "Notifications push",
  "notifications.column_settings.push_meta": "Cet appareil",
  "notifications.column_settings.reblog": "Partages :",
@ -216,7 +216,7 @@
  "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
  "privacy.unlisted.short": "Non-listé",
  "regeneration_indicator.label": "Chargement…",
-  "regeneration_indicator.sublabel": "Le flux de votre page principale est en cours de préparation !",
+  "regeneration_indicator.sublabel": "Le flux de votre page principale est en cours de préparation !",
  "relative_time.days": "{number} j",
  "relative_time.hours": "{number} h",
  "relative_time.just_now": "à l’instant",
@ -224,8 +224,8 @@
  "relative_time.seconds": "{number} s",
  "reply_indicator.cancel": "Annuler",
  "report.forward": "Transférer à {target}",
-  "report.forward_hint": "Le compte provient d'un autre serveur. Envoyez également une copie anonyme du rapport ?",
-  "report.hint": "Le rapport sera envoyé aux modérateurs de votre instance. Vous pouvez expliquer pourquoi vous signalez ce compte ci-dessous :",
+  "report.forward_hint": "Le compte provient d'un autre serveur. Envoyez également une copie anonyme du rapport ?",
+  "report.hint": "Le rapport sera envoyé aux modérateurs de votre instance. Vous pouvez expliquer pourquoi vous signalez ce compte ci-dessous :",
  "report.placeholder": "Commentaires additionnels",
  "report.submit": "Envoyer",
  "report.target": "Signalement",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -110,7 +110,7 @@
  "empty_column.public": "I a pas res aquí ! Escrivètz quicòm de public, o seguètz de personas d’autras instàncias per garnir lo flux public",
  "follow_request.authorize": "Autorizar",
  "follow_request.reject": "Regetar",
-  "getting_started.appsshort": "Apps",
+  "getting_started.appsshort": "Aplicacions",
  "getting_started.faq": "FAQ",
  "getting_started.heading": "Per començar",
  "getting_started.open_source_notice": "Mastodon es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {github} sus GitHub.",
@ -158,7 +158,7 @@
  "navigation_bar.blocks": "Personas blocadas",
  "navigation_bar.community_timeline": "Flux public local",
  "navigation_bar.direct": "Messatges dirèctes",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "Domenis amagats",
  "navigation_bar.edit_profile": "Modificar lo perfil",
  "navigation_bar.favourites": "Favorits",
  "navigation_bar.follow_requests": "Demandas d’abonament",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -231,7 +231,7 @@
  "report.target": "Nahlásenie {target}",
  "search.placeholder": "Hľadaj",
  "search_popout.search_format": "Pokročilé vyhľadávanie",
-  "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.full_text": "Jednoduchý textový výpis statusov ktoré si napísal/a, ktoré si obľúbil/a, povýšil/a, alebo aj tých, v ktorých si bol/a spomenutý/á, a potom všetky zadaniu odpovedajúce prezívky, mená a haštagy.",
  "search_popout.tips.hashtag": "haštag",
  "search_popout.tips.status": "status",
  "search_popout.tips.text": "Jednoduchý text vráti zhodujúce sa mená, prezývky a hashtagy",
--- a/app/javascript/mastodon/locales/whitelist_co.json
+++ b/app/javascript/mastodon/locales/whitelist_co.json
@ -0,0 +1,2 @@
+[
+]
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@ -134,7 +134,7 @@ export default function timelines(state = initialState, action) {
      initialTimeline,
      map => map.update(
        'items',
-        items => items.first() ? items : items.unshift(null)
+        items => items.first() ? items.unshift(null) : items
      )
    );
  default:
--- a/app/javascript/mastodon/utils/html.js
+++ b/app/javascript/mastodon/utils/html.js
@ -0,0 +1,6 @@
+export const unescapeHTML = (html) => {
+  const wrapper = document.createElement('div');
+  html = html.replace(/<br \/>|<br>|\n/g, ' ');
+  wrapper.innerHTML = html;
+  return wrapper.textContent;
+};
--- a/app/javascript/mastodon/utils/resize_image.js
+++ b/app/javascript/mastodon/utils/resize_image.js
@ -1,3 +1,5 @@
+import EXIF from 'exif-js';
+
 const MAX_IMAGE_DIMENSION = 1280;

 const getImageUrl = inputFile => new Promise((resolve, reject) => {
@ -28,6 +30,84 @@ const loadImage = inputFile => new Promise((resolve, reject) => {
  }).catch(reject);
 });

+const getOrientation = (img, type = 'image/png') => new Promise(resolve => {
+  if (type !== 'image/jpeg') {
+    resolve(1);
+    return;
+  }
+
+  EXIF.getData(img, () => {
+    const orientation = EXIF.getTag(img, 'Orientation');
+    resolve(orientation);
+  });
+});
+
+const processImage = (img, { width, height, orientation, type = 'image/png' }) => new Promise(resolve => {
+  const canvas  = document.createElement('canvas');
+  [canvas.width, canvas.height] = orientation < 5 ? [width, height] : [height, width];
+
+  const context = canvas.getContext('2d');
+
+  switch (orientation) {
+  case 2:
+    context.translate(width, 0);
+    break;
+  case 3:
+    context.translate(width, height);
+    break;
+  case 4:
+    context.translate(0, height);
+    break;
+  case 5:
+    context.rotate(0.5 * Math.PI);
+    context.translate(1, -1);
+    break;
+  case 6:
+    context.rotate(0.5 * Math.PI);
+    context.translate(0, -height);
+    break;
+  case 7:
+    context.rotate(0.5, Math.PI);
+    context.translate(width, -height);
+    break;
+  case 8:
+    context.rotate(-0.5, Math.PI);
+    context.translate(-width, 0);
+    break;
+  }
+
+  context.drawImage(img, 0, 0, width, height);
+
+  canvas.toBlob(resolve, type);
+});
+
+const resizeImage = (img, type = 'image/png') => new Promise((resolve, reject) => {
+  const { width, height } = img;
+
+  let newWidth, newHeight;
+
+  if (width > height) {
+    newHeight = height * MAX_IMAGE_DIMENSION / width;
+    newWidth  = MAX_IMAGE_DIMENSION;
+  } else if (height > width) {
+    newWidth  = width * MAX_IMAGE_DIMENSION / height;
+    newHeight = MAX_IMAGE_DIMENSION;
+  } else {
+    newWidth  = MAX_IMAGE_DIMENSION;
+    newHeight = MAX_IMAGE_DIMENSION;
+  }
+
+  getOrientation(img, type)
+    .then(orientation => processImage(img, {
+      width: newWidth,
+      height: newHeight,
+      orientation,
+      type,
+    }))
+    .then(resolve)
+    .catch(reject);
+});
+
 export default inputFile => new Promise((resolve, reject) => {
  if (!inputFile.type.match(/image.*/) || inputFile.type === 'image/gif') {
    resolve(inputFile);
@ -35,32 +115,13 @@ export default inputFile => new Promise((resolve, reject) => {
  }

  loadImage(inputFile).then(img => {
-    const canvas = document.createElement('canvas');
-    const { width, height } = img;
-
-    let newWidth, newHeight;
-
-    if (width < MAX_IMAGE_DIMENSION && height < MAX_IMAGE_DIMENSION) {
+    if (img.width < MAX_IMAGE_DIMENSION && img.height < MAX_IMAGE_DIMENSION) {
      resolve(inputFile);
      return;
    }

-    if (width > height) {
-      newHeight = height * MAX_IMAGE_DIMENSION / width;
-      newWidth  = MAX_IMAGE_DIMENSION;
-    } else if (height > width) {
-      newWidth  = width * MAX_IMAGE_DIMENSION / height;
-      newHeight = MAX_IMAGE_DIMENSION;
-    } else {
-      newWidth  = MAX_IMAGE_DIMENSION;
-      newHeight = MAX_IMAGE_DIMENSION;
-    }
-
-    canvas.width  = newWidth;
-    canvas.height = newHeight;
-
-    canvas.getContext('2d').drawImage(img, 0, 0, newWidth, newHeight);
-
-    canvas.toBlob(resolve, inputFile.type);
+    resizeImage(img, inputFile.type)
+      .then(resolve)
+      .catch(() => resolve(inputFile));
  }).catch(reject);
 });
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@ -7,7 +7,6 @@ function main() {
  const { getLocale } = require('../mastodon/locales');
  const { localeData } = getLocale();
  const VideoContainer = require('../mastodon/containers/video_container').default;
-  const CardContainer = require('../mastodon/containers/card_container').default;
  const React = require('react');
  const ReactDOM = require('react-dom');

@ -57,10 +56,16 @@ function main() {
      ReactDOM.render(<VideoContainer locale={locale} {...props} />, content);
    });

-    [].forEach.call(document.querySelectorAll('[data-component="Card"]'), (content) => {
-      const props = JSON.parse(content.getAttribute('data-props'));
-      ReactDOM.render(<CardContainer locale={locale} {...props} />, content);
-    });
+    const cards = document.querySelectorAll('[data-component="Card"]');
+
+    if (cards.length > 0) {
+      import(/* webpackChunkName: "containers/cards_container" */ '../mastodon/containers/cards_container').then(({ default: CardsContainer }) => {
+        const content = document.createElement('div');
+
+        ReactDOM.render(<CardsContainer locale={locale} cards={cards} />, content);
+        document.body.appendChild(content);
+      }).catch(error => console.error(error));
+    }

    const mediaGalleries = document.querySelectorAll('[data-component="MediaGallery"]');

--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@ -565,36 +565,41 @@
 }

 .account__header__fields {
-  border-collapse: collapse;
  padding: 0;
  margin: 15px -15px -15px;
  border: 0 none;
  border-top: 1px solid lighten($ui-base-color, 4%);
  border-bottom: 1px solid lighten($ui-base-color, 4%);
+  font-size: 14px;
+  line-height: 20px;

-  th,
-  td {
-    padding: 15px;
-    padding-left: 15px;
-    border: 0 none;
+  dl {
+    display: flex;
    border-bottom: 1px solid lighten($ui-base-color, 4%);
-    vertical-align: middle;
  }

-  th {
-    padding-left: 15px;
-    font-weight: 500;
+  dt,
+  dd {
+    box-sizing: border-box;
+    padding: 14px;
    text-align: center;
-    width: 94px;
+    max-height: 48px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  dt {
+    font-weight: 500;
+    width: 120px;
+    flex: 0 0 auto;
    color: $secondary-text-color;
    background: rgba(darken($ui-base-color, 8%), 0.5);
  }

-  td {
+  dd {
+    flex: 1 1 auto;
    color: $darker-text-color;
-    text-align: center;
-    width: 100%;
-    padding-left: 0;
  }

  a {
@ -608,12 +613,7 @@
    }
  }

-  tr {
-    &:last-child {
-      th,
-      td {
-        border-bottom: 0;
-      }
-    }
+  dl:last-child {
+    border-bottom: 0;
  }
 }
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -336,7 +336,8 @@
  }
 }

-.simple_form.new_report_note {
+.simple_form.new_report_note,
+.simple_form.new_account_moderation_note {
  max-width: 100%;
 }

--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -4033,7 +4033,7 @@ a.status-card {
 .report-modal__statuses {
  flex: 1 1 auto;
  min-height: 20vh;
-  max-height: 40vh;
+  max-height: 80vh;
  overflow-y: auto;
  overflow-x: hidden;

@ -5159,38 +5159,45 @@ noscript {
  }
 }

+.account__header .roles {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  padding: 0 15px;
+}
+
 .account__header .account__header__fields {
  font-size: 14px;
  line-height: 20px;
  overflow: hidden;
-  border-collapse: collapse;
  margin: 20px -10px -20px;
  border-bottom: 0;

-  tr {
+  dl {
    border-top: 1px solid lighten($ui-base-color, 8%);
-    text-align: center;
+    display: flex;
  }

-  th,
-  td {
+  dt,
+  dd {
+    box-sizing: border-box;
    padding: 14px 20px;
-    vertical-align: middle;
-    max-height: 40px;
+    text-align: center;
+    max-height: 48px;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
  }

-  th {
+  dt {
    color: $darker-text-color;
    background: darken($ui-base-color, 4%);
-    max-width: 120px;
+    width: 120px;
+    flex: 0 0 auto;
    font-weight: 500;
  }

-  td {
-    flex: auto;
+  dd {
+    flex: 1 1 auto;
    color: $primary-text-color;
    background: $ui-base-color;
  }
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@ -60,6 +60,7 @@
  }
 }

+.card-standalone__body,
 .media-gallery-standalone__body {
  overflow: hidden;
 }
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -87,6 +87,10 @@ code {
      align-items: flex-start;
    }

+    &.file .label_input {
+      flex-wrap: nowrap;
+    }
+
    &.select .label_input {
      align-items: initial;
    }
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@ -86,6 +86,8 @@ class ActivityPub::TagManager
  end

  def local_uri?(uri)
+    return false if uri.nil?
+
    uri  = Addressable::URI.parse(uri)
    host = uri.normalized_host
    host = "#{host}:#{uri.port}" if uri.port
@ -99,6 +101,8 @@ class ActivityPub::TagManager
  end

  def uri_to_resource(uri, klass)
+    return if uri.nil?
+
    if local_uri?(uri)
      case klass.name
      when 'Account'
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -67,9 +67,17 @@ class Formatter
    html.html_safe # rubocop:disable Rails/OutputSafety
  end

-  def format_field(account, str)
+  def format_display_name(account, **options)
+    html = encode(account.display_name.presence || account.username)
+    html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
+    html.html_safe # rubocop:disable Rails/OutputSafety
+  end
+
+  def format_field(account, str, **options)
    return reformat(str).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
-    encode_and_link_urls(str, me: true).html_safe # rubocop:disable Rails/OutputSafety
+    html = encode_and_link_urls(str, me: true)
+    html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
+    html.html_safe # rubocop:disable Rails/OutputSafety
  end

  def linkify(text)
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@ -46,7 +46,8 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
        visibility: visibility_scope,
        conversation: find_or_create_conversation,
        thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil,
-        media_attachment_ids: media_attachments.map(&:id)
+        media_attachment_ids: media_attachments.map(&:id),
+        sensitive: sensitive?
      )

      save_mentions(status)
@ -105,6 +106,11 @@ class OStatus::Activity::Creation < OStatus::Activity::Base

  private

+  def sensitive?
+    # OStatus-specific convention (not standard)
+    @xml.xpath('./xmlns:category', xmlns: OStatus::TagManager::XMLNS).any? { |category| category['term'] == 'nsfw' }
+  end
+
  def find_or_create_conversation
    uri = @xml.at_xpath('./ostatus:conversation', ostatus: OStatus::TagManager::OS_XMLNS)&.attribute('ref')&.content
    return if uri.nil?
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@ -368,6 +368,7 @@ class OStatus::AtomSerializer
      append_element(entry, 'link', nil, rel: :enclosure, type: media.file_content_type, length: media.file_file_size, href: full_asset_url(media.file.url(:original, false)))
    end

+    append_element(entry, 'category', nil, term: 'nsfw') if status.sensitive? && status.media_attachments.any?
    append_element(entry, 'mastodon:scope', status.visibility)

    status.emojis.each do |emoji|
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@ -51,7 +51,7 @@ class Request
  end

  def headers
-    (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
+    (@account ? @headers.merge('Signature' => signature) : @headers).reverse_merge('Accept-Encoding' => 'gzip').without(REQUEST_TARGET)
  end

  private
@ -100,7 +100,7 @@ class Request
  end

  def http_client
-    @http_client ||= HTTP.timeout(:per_operation, timeout).follow(max_hops: 2)
+    @http_client ||= HTTP.use(:auto_inflate).timeout(:per_operation, timeout).follow(max_hops: 2)
  end

  def use_proxy?
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -45,6 +45,7 @@
 #  moved_to_account_id     :bigint(8)
 #  featured_collection_url :string
 #  fields                  :jsonb
+#  actor_type              :string
 #

 class Account < ApplicationRecord
@ -76,6 +77,7 @@ class Account < ApplicationRecord
  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
  validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
  validate :note_length_does_not_exceed_length_limit, if: -> { local? && will_save_change_to_note? }
+  validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }

  # Timelines
  has_many :stream_entries, inverse_of: :account, dependent: :destroy
@ -151,6 +153,16 @@ class Account < ApplicationRecord
    moved_to_account_id.present?
  end

+  def bot?
+    %w(Application Service).include? actor_type
+  end
+
+  alias bot bot?
+
+  def bot=(val)
+    self.actor_type = ActiveModel::Type::Boolean.new.cast(val) ? 'Service' : 'Person'
+  end
+
  def acct
    local? ? username : "#{username}@#{domain}"
  end
@ -201,9 +213,11 @@ class Account < ApplicationRecord
  def fields_attributes=(attributes)
    fields = []

-    attributes.each_value do |attr|
-      next if attr[:name].blank?
-      fields << attr
+    if attributes.is_a?(Hash)
+      attributes.each_value do |attr|
+        next if attr[:name].blank?
+        fields << attr
+      end
    end

    self[:fields] = fields
@ -272,8 +286,8 @@ class Account < ApplicationRecord

    def initialize(account, attr)
      @account = account
-      @name    = attr['name']
-      @value   = attr['value']
+      @name    = attr['name'].strip[0, 255]
+      @value   = attr['value'].strip[0, 255]
      @errors  = {}
    end

@ -398,7 +412,7 @@ class Account < ApplicationRecord
  end

  def emojis
-    @emojis ||= CustomEmoji.from_text(note, domain)
+    @emojis ||= CustomEmoji.from_text(emojifiable_text, domain)
  end

  before_create :generate_keys
@ -441,4 +455,8 @@ class Account < ApplicationRecord

    self.domain = TagManager.instance.normalize_domain(domain)
  end
+
+  def emojifiable_text
+    [note, display_name, fields.map(&:value)].join(' ')
+  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -41,7 +41,7 @@ class User < ApplicationRecord
  include Settings::Extend
  include Omniauthable

-  ACTIVE_DURATION = 14.days
+  ACTIVE_DURATION = 7.days

  devise :two_factor_authenticatable,
         otp_secret_encryption_key: Rails.configuration.x.otp_secret
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@ -37,7 +37,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
  end

  def type
-    'Person'
+    object.bot? ? 'Service' : 'Person'
  end

  def following
--- a/app/serializers/activitypub/block_serializer.rb
+++ b/app/serializers/activitypub/block_serializer.rb
@ -5,7 +5,7 @@ class ActivityPub::BlockSerializer < ActiveModel::Serializer
  attribute :virtual_object, key: :object

  def id
-    [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id].join
+    ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id].join
  end

  def type
--- a/app/serializers/activitypub/follow_serializer.rb
+++ b/app/serializers/activitypub/follow_serializer.rb
@ -5,7 +5,7 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer
  attribute :virtual_object, key: :object

  def id
-    ActivityPub::TagManager.instance.uri_for(object)
+    ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join
  end

  def type
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@ -3,11 +3,12 @@
 class REST::AccountSerializer < ActiveModel::Serializer
  include RoutingHelper

-  attributes :id, :username, :acct, :display_name, :locked, :created_at,
+  attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at,
             :note, :url, :avatar, :avatar_static, :header, :header_static,
             :followers_count, :following_count, :statuses_count

  has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
+  has_many :emojis, serializer: REST::CustomEmojiSerializer

  class FieldSerializer < ActiveModel::Serializer
    attributes :name, :value
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@ -34,6 +34,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
  end

  def trustworthy_attribution?(uri, attributed_to)
+    return false if uri.nil? || attributed_to.nil?
    Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
  end

--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@ -71,6 +71,7 @@ class ActivityPub::ProcessAccountService < BaseService
    @account.note                    = @json['summary'] || ''
    @account.locked                  = @json['manuallyApprovesFollowers'] || false
    @account.fields                  = property_values || {}
+    @account.actor_type              = actor_type
  end

  def set_fetchable_attributes!
@ -95,6 +96,14 @@ class ActivityPub::ProcessAccountService < BaseService
    ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id)
  end

+  def actor_type
+    if @json['type'].is_a?(Array)
+      @json['type'].find { |type| ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(type) }
+    else
+      @json['type']
+    end
+  end
+
  def image_url(key)
    value = first_of_value(@json[key])

--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@ -45,5 +45,8 @@ class ActivityPub::ProcessCollectionService < BaseService

  def verify_account!
    @account = ActivityPub::LinkedDataSignature.new(@json).verify_account!
+  rescue JSON::LD::JsonLdError => e
+    Rails.logger.debug "Could not verify LD-Signature for #{value_or_id(@json['actor'])}: #{e.message}"
+    nil
  end
 end
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@ -37,7 +37,7 @@ class FanOutOnWriteService < BaseService
  def deliver_to_followers(status)
    Rails.logger.debug "Delivering status #{status.id} to followers"

-    status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_in_batches do |followers|
+    status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).select(:id).reorder(nil).find_in_batches do |followers|
      FeedInsertWorker.push_bulk(followers) do |follower|
        [status.id, follower.id, :home]
      end
@ -47,7 +47,7 @@ class FanOutOnWriteService < BaseService
  def deliver_to_lists(status)
    Rails.logger.debug "Delivering status #{status.id} to lists"

-    status.account.lists.joins(account: :user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_in_batches do |lists|
+    status.account.lists.joins(account: :user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).select(:id).reorder(nil).find_in_batches do |lists|
      FeedInsertWorker.push_bulk(lists) do |list|
        [status.id, list.id, :list]
      end
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@ -27,7 +27,7 @@ class FetchLinkCardService < BaseService
    end

    attach_card if @card&.persisted?
-  rescue HTTP::Error, Addressable::URI::InvalidURIError => e
+  rescue HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::LengthValidationError => e
    Rails.logger.debug "Error fetching link #{@url}: #{e}"
    nil
  end
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@ -31,12 +31,12 @@ class PostStatusService < BaseService
                                        sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]),
                                        spoiler_text: options[:spoiler_text] || '',
                                        visibility: options[:visibility] || account.user&.setting_default_privacy,
-                                        language: LanguageDetector.instance.detect(text, account),
+                                        language: language_from_option(options[:language]) || LanguageDetector.instance.detect(text, account),
                                        application: options[:application])
    end

-    process_mentions_service.call(status)
    process_hashtags_service.call(status)
+    process_mentions_service.call(status)

    LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
    DistributionWorker.perform_async(status.id)
@ -68,6 +68,10 @@ class PostStatusService < BaseService
    media
  end

+  def language_from_option(str)
+    ISO_639.find(str)&.alpha2
+  end
+
  def process_mentions_service
    ProcessMentionsService.new
  end
--- a/app/views/about/_administration.html.haml
+++ b/app/views/about/_administration.html.haml
@ -6,7 +6,7 @@
          .account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" }
        %span.display-name
          %bdi
-            %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account)
+            %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account, custom_emojify: true)
          %span.display-name__account @#{@instance_presenter.contact_account.acct}
    - else
      .account__display-name
--- a/app/views/about/_contact.html.haml
+++ b/app/views/about/_contact.html.haml
@ -12,7 +12,7 @@
        .avatar= image_tag contact.contact_account.avatar.url
        .name
          = link_to TagManager.instance.url_for(contact.contact_account) do
-            %span.display_name.emojify= display_name(contact.contact_account)
+            %span.display_name.emojify= display_name(contact.contact_account, custom_emojify: true)
            %span.username @#{contact.contact_account.acct}
    - else
      .owner
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@ -141,3 +141,5 @@
            %p
              = link_to t('about.source_code'), @instance_presenter.source_url
              = " (#{@instance_presenter.version_number})"
+
+#modal-container
--- a/app/views/accounts/_grid_card.html.haml
+++ b/app/views/accounts/_grid_card.html.haml
@ -5,7 +5,7 @@
    .avatar= image_tag account.avatar.url(:original)
  .name
    = link_to TagManager.instance.url_for(account) do
-      %span.display_name.emojify= display_name(account)
+      %span.display_name.emojify= display_name(account, custom_emojify: true)
      %span.username
        @#{account.local? ? account.local_username_and_domain : account.acct}
        = fa_icon('lock') if account.locked?
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@ -6,11 +6,16 @@

  .card__bio
    %h1.name
-      %span.p-name.emojify= display_name(account)
+      %span.p-name.emojify= display_name(account, custom_emojify: true)
      %small<
        %span>< @#{account.local_username_and_domain}
        = fa_icon('lock') if account.locked?
-    - if Setting.show_staff_badge
+
+    - if account.bot?
+      .roles
+        .account-role.bot
+          = t 'accounts.roles.bot'
+    - elsif Setting.show_staff_badge
      - if account.user_admin?
        .roles
          .account-role.admin
@ -21,19 +26,19 @@
            = t 'accounts.roles.moderator'
    .bio
      .account__header__content.p-note.emojify!=processed_bio[:text]
+
      - if !account.fields.empty?
-        %table.account__header__fields
-          %tbody
-            - account.fields.each do |field|
-              %tr
-                %th.emojify= field.name
-                %td.emojify= Formatter.instance.format_field(account, field.value)
+        .account__header__fields
+          - account.fields.each do |field|
+            %dl
+              %dt.emojify{ title: field.name }= field.name
+              %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true)
      - elsif processed_bio[:metadata].length > 0
-        %table.account__header__fields<
+        .account__header__fields
          - processed_bio[:metadata].each do |i|
-            %tr
-              %th.emojify>!=i[0]
-              %td.emojify>!=i[1]
+            %dl
+              %dt.emojify{ title: i[0] }= i[0]
+              %dd.emojify{ title: i[1] }= i[1]

    .details-counters
      .counter{ class: active_nav_class(short_account_url(account)) }
--- a/app/views/accounts/_moved_strip.html.haml
+++ b/app/views/accounts/_moved_strip.html.haml
@ -3,7 +3,7 @@
 .moved-strip
  .moved-strip__message
    = fa_icon 'suitcase'
-    = t('accounts.moved_html', name: content_tag(:strong, display_name(account), class: :emojify), new_profile_link: link_to(content_tag(:strong, safe_join(['@', content_tag(:span, moved_to_account.acct)])), TagManager.instance.url_for(moved_to_account), class: 'mention'))
+    = t('accounts.moved_html', name: content_tag(:strong, display_name(account, custom_emojify: true), class: :emojify), new_profile_link: link_to(content_tag(:strong, safe_join(['@', content_tag(:span, moved_to_account.acct)])), TagManager.instance.url_for(moved_to_account), class: 'mention'))

  .moved-strip__card
    = link_to TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
@ -13,5 +13,5 @@
          .account__avatar-overlay-overlay{ style: "background-image: url('#{account.avatar.url(:original)}')" }

      %span.display-name
-        %strong.emojify= display_name(moved_to_account)
+        %strong.emojify= display_name(moved_to_account, custom_emojify: true)
        %span @#{moved_to_account.acct}
--- a/app/views/admin/account_moderation_notes/_account_moderation_note.html.haml
+++ b/app/views/admin/account_moderation_notes/_account_moderation_note.html.haml
@ -1,10 +1,7 @@
-%tr
-  %td
+.speech-bubble
+  .speech-bubble__bubble
    = simple_format(h(account_moderation_note.content))
-  %td
-    = account_moderation_note.account.acct
-  %td
-    %time.formatted{ datetime: account_moderation_note.created_at.iso8601, title: l(account_moderation_note.created_at) }
-      = l account_moderation_note.created_at
-  %td
-    = link_to t('admin.account_moderation_notes.delete'), admin_account_moderation_note_path(account_moderation_note), method: :delete if can?(:destroy, account_moderation_note)
+  .speech-bubble__owner
+    = admin_account_link_to account_moderation_note.account
+    %time.formatted{ datetime: account_moderation_note.created_at.iso8601 }= l account_moderation_note.created_at
+    = table_link_to 'trash', t('admin.account_moderation_notes.delete'), admin_account_moderation_note_path(account_moderation_note), method: :delete if can?(:destroy, account_moderation_note)
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@ -2,7 +2,7 @@
  = @account.acct

 .table-wrapper
-  %table.table
+  %table.table.inline-table
    %tbody
      %tr
        %th= t('admin.accounts.username')
@ -36,13 +36,19 @@
          %th= t('admin.accounts.email')
          %td
            = @account.user_email
-            - if @account.user_confirmed?
-              = fa_icon('check')
            = table_link_to 'edit', t('admin.accounts.change_email.label'), admin_account_change_email_path(@account.id) if can?(:change_email, @account.user)
        - if @account.user_unconfirmed_email.present?
          %th= t('admin.accounts.unconfirmed_email')
          %td
            = @account.user_unconfirmed_email
+        %tr
+          %th= t('admin.accounts.email_status')
+          %td
+            - if @account.user&.confirmed?
+              = t('admin.accounts.confirmed')
+            - else
+              = t('admin.accounts.confirming')
+              = table_link_to 'refresh', t('admin.accounts.resend_confirmation.send'), resend_admin_account_confirmation_path(@account.id), method: :post if can?(:confirm, @account.user)
        %tr
          %th= t('admin.accounts.login_status')
          %td
@ -73,17 +79,17 @@

      %tr
        %th= t('admin.accounts.follows')
-        %td= @account.following_count
+        %td= number_to_human @account.following_count
      %tr
        %th= t('admin.accounts.followers')
-        %td= @account.followers_count
+        %td= number_to_human @account.followers_count
      %tr
        %th= t('admin.accounts.statuses')
-        %td= link_to @account.statuses_count, admin_account_statuses_path(@account.id)
+        %td= link_to number_to_human(@account.statuses_count), admin_account_statuses_path(@account.id)
      %tr
        %th= t('admin.accounts.media_attachments')
        %td
-          = link_to @account.media_attachments.count, admin_account_statuses_path(@account.id, { media: true })
+          = link_to number_to_human(@account.media_attachments.count), admin_account_statuses_path(@account.id, { media: true })
          = surround '(', ')' do
            = number_to_human_size @account.media_attachments.sum('file_file_size')
      %tr
@ -120,11 +126,12 @@
      = link_to t('admin.accounts.perform_full_suspension'), admin_account_suspension_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:suspend, @account)

 - if !@account.local? && @account.hub_url.present?
-  %hr
+  %hr.spacer/
+
  %h3 OStatus

  .table-wrapper
-    %table.table
+    %table.table.inline-table
      %tbody
        %tr
          %th= t('admin.accounts.feed_url')
@ -148,11 +155,12 @@
        = link_to t('admin.accounts.unsubscribe'), unsubscribe_admin_account_path(@account.id), method: :post, class: 'button negative' if can?(:unsubscribe, @account)

 - if !@account.local? && @account.inbox_url.present?
-  %hr
+  %hr.spacer/
+
  %h3 ActivityPub

  .table-wrapper
-    %table.table
+    %table.table.inline-table
      %tbody
        %tr
          %th= t('admin.accounts.inbox_url')
@ -167,24 +175,15 @@
          %th= t('admin.accounts.followers_url')
          %td= link_to @account.followers_url, @account.followers_url

-%hr
-%h3= t('admin.accounts.moderation_notes')
+%hr.spacer/
+
+= render @moderation_notes

 = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
  = render 'shared/error_messages', object: @account_moderation_note

-  = f.input :content
+  = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
  = f.hidden_field :target_account_id

  .actions
-  = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
-
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th
-        %th= t('admin.account_moderation_notes.account')
-        %th= t('admin.account_moderation_notes.created_at')
-    %tbody
-      = render @moderation_notes
+    = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
--- a/app/views/admin/reports/_account.html.haml
+++ b/app/views/admin/reports/_account.html.haml
@ -15,5 +15,5 @@
          .account__avatar{ style: "background-image: url(#{account.avatar.url}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
        %span.display-name
          %bdi
-            %strong.display-name__html.emojify= display_name(account)
+            %strong.display-name__html.emojify= display_name(account, custom_emojify: true)
          %span.display-name__account @#{account.acct}
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@ -7,7 +7,7 @@
        %p><
          %strong= Formatter.instance.format_spoiler(status)

-      = Formatter.instance.format(status)
+      = Formatter.instance.format(status, custom_emojify: true)

    - unless status.media_attachments.empty?
      - if status.media_attachments.first.video?
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@ -1,10 +1,7 @@
 - content_for :page_title do
  = t('admin.statuses.title')
-
-.back-link
-  = link_to admin_account_path(@account.id) do
-    %i.fa.fa-chevron-left.fa-fw
-    = t('admin.statuses.back_to_account')
+  \-
+  = "@#{@account.acct}"

 .filters
  .filter-subset
@ -12,33 +9,26 @@
    %ul
      %li= link_to t('admin.statuses.no_media'), admin_account_statuses_path(@account.id, current_params.merge(media: nil)), class: !params[:media] && 'selected'
      %li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
+  .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to admin_account_path(@account.id) do
+      %i.fa.fa-chevron-left.fa-fw
+      = t('admin.statuses.back_to_account')

- if @statuses.empty?
-  .accounts-grid
-    = render 'accounts/nothing_here'
- else
-  = form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
-    = hidden_field_tag :page, params[:page]
-    = hidden_field_tag :media, params[:media]
-    .batch-form-box
-      .batch-checkbox-all
+%hr.spacer/
+
+= form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
+  = hidden_field_tag :page, params[:page]
+  = hidden_field_tag :media, params[:media]
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
        = check_box_tag :batch_checkbox_all, nil, false
-      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
-      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
-      .media-spoiler-toggle-buttons
-        .media-spoiler-show-button.button= t('admin.statuses.media.show')
-        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
-    - @statuses.each do |status|
-      .account-status{ data: { id: status.id } }
-        .batch-checkbox
-          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
-        .activity-stream.activity-stream-headless
-          .entry= render 'stream_entries/simple_status', status: status
-        .account-status__actions
-          - unless status.media_attachments.empty?
-            = link_to admin_account_status_path(@account.id, status, current_params.merge(status: { sensitive: !status.sensitive })), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
-              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
-          = link_to admin_account_status_path(@account.id, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
-            = fa_icon 'trash'
+      .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('eye-slash'), t('admin.statuses.batch.nsfw_on')]), name: :nsfw_on, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('eye'), t('admin.statuses.batch.nsfw_off')]), name: :nsfw_off, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('trash'), t('admin.statuses.batch.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }

 = paginate @statuses
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@ -2,9 +2,12 @@
  = t('auth.login')

 = simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-  = f.input :otp_attempt, type: :number, placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, required: true, autofocus: true, hint: t('simple_form.hints.sessions.otp')
+  %p.hint{ style: 'margin-bottom: 25px' }= t('simple_form.hints.sessions.otp')
+
+  = f.input :otp_attempt, type: :number, placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, required: true, autofocus: true

  .actions
    = f.button :button, t('auth.login'), type: :submit

-.form-footer= render 'auth/shared/links'
+  - if Setting.site_contact_email.present?
+    %p.hint.subtle-hint= t('users.otp_lost_help_html', email: mail_to(Setting.site_contact_email, nil))
--- a/app/views/authorize_follows/_card.html.haml
+++ b/app/views/authorize_follows/_card.html.haml
@ -6,7 +6,7 @@
    %span.display-name
      - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
      = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
-        %strong.emojify= display_name(account)
+        %strong.emojify= display_name(account, custom_emojify: true)
        %span @#{account.acct}

  - if account.note?
--- a/app/views/remote_unfollows/_card.html.haml
+++ b/app/views/remote_unfollows/_card.html.haml
@ -6,7 +6,7 @@
    %span.display-name
      - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
      = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
-        %strong.emojify= display_name(account)
+        %strong.emojify= display_name(account, custom_emojify: true)
        %span @#{account.acct}

  - if account.note?
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@ -10,15 +10,15 @@
        %td
      %tr
        %th= t('exports.follows')
-        %td= @export.total_follows
+        %td= number_to_human @export.total_follows
        %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
      %tr
        %th= t('exports.blocks')
-        %td= @export.total_blocks
+        %td= number_to_human @export.total_blocks
        %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
      %tr
        %th= t('exports.mutes')
-        %td= @export.total_mutes
+        %td= number_to_human @export.total_mutes
        %td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)

 %p.muted-hint= t('exports.archive_takeout.hint_html')
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@ -19,6 +19,9 @@
  .fields-group
    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')

+  .fields-group
+    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
+
  .fields-group
    .input.with_block_label
      %label= t('simple_form.labels.defaults.fields')
--- a/app/views/shared/_landing_strip.html.haml
+++ b/app/views/shared/_landing_strip.html.haml
@ -2,7 +2,7 @@
  = image_tag asset_pack_path('logo.svg'), class: 'logo'

  %div
-    = t('landing_strip_html', name: content_tag(:span, display_name(account), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path))
+    = t('landing_strip_html', name: content_tag(:span, display_name(account, custom_emojify: true), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path))

    - if open_registrations?
      = t('landing_strip_signup_html', sign_up_path: new_user_registration_path)
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@ -4,7 +4,7 @@
      .avatar
        = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo'
    %span.display-name
-      %strong.p-name.emojify= display_name(status.account)
+      %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
      %span= acct(status.account)

  - if embedded_view?
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@ -10,7 +10,7 @@
        %div
          = image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo'
      %span.display-name
-        %strong.p-name.emojify= display_name(status.account)
+        %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
        %span= acct(status.account)

  .status__content.p-name.emojify<
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@ -28,7 +28,7 @@
        = fa_icon('retweet fw')
      %span
        = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %strong.emojify= display_name(status.account)
+          %strong.emojify= display_name(status.account, custom_emojify: true)
        = t('stream_entries.reblogged')
  - elsif pinned
    .pre-header
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@ -33,3 +33,5 @@
              %p= t 'about.about_mastodon_html'

              = render 'features'
+
+#modal-container
--- a/bin/retry
+++ b/bin/retry
@ -0,0 +1,46 @@
+#!/bin/bash
+# https://github.com/travis-ci/travis-build/blob/cbe49ea239ab37b9b38b5b44d287b7ec7a108c16/lib/travis/build/templates/header.sh#L243-L260
+#
+# MIT LICENSE
+#
+# Copyright (c) 2016 Travis CI GmbH <contact@travis-ci.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+retry() {
+  local result=0
+  local count=1
+
+  while [ $count -le 3 ]; do
+    if [ $result -ne 0 ]; then
+      echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
+    fi
+
+    "$@" && { result=0 && break; } || result=$?
+    count=$(($count + 1))
+    sleep 1
+  done
+
+  if [ $count -gt 3 ]; then
+    echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
+  fi
+
+  return $result
+}
+
+retry $@
--- a/config/application.rb
+++ b/config/application.rb
@ -41,6 +41,7 @@ module Mastodon
      :ar,
      :bg,
      :ca,
+      :co,
      :de,
      :el,
      :eo,
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@ -60,6 +60,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
    fog_credentials: {
      provider: 'OpenStack',
      openstack_username: ENV['SWIFT_USERNAME'],
+      openstack_project_id: ENV['SWIFT_PROJECT_ID'],
      openstack_project_name: ENV['SWIFT_TENANT'],
      openstack_tenant: ENV['SWIFT_TENANT'], # Some OpenStack-v2 ignores project_name but needs tenant
      openstack_api_key: ENV['SWIFT_PASSWORD'],
--- a/config/locales/activerecord.co.yml
+++ b/config/locales/activerecord.co.yml
@ -0,0 +1,13 @@
+---
+co:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: solu lettere, numeri è liniette basse
+        status:
+          attributes:
+            reblog:
+              taken: di u statutu esista digià
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -4,6 +4,7 @@ ar:
    about_hashtag_html: هذه هي الرسائل العامة مع الكلمات الدلالية  <strong> 1#%{hashtag}</strong>. يمكنك التفاعل معهم إذا كان لديك حساب في أي مكان على الإنترنت المتحد.
    about_mastodon_html: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
    about_this: عن مثيل الخادوم هذا
+    administered_by: 'يديره :'
    closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا.
    contact: للتواصل معنا
    contact_missing: غير محدد
@ -52,17 +53,24 @@ ar:
    unfollow: إلغاء المتابعة
  admin:
    account_moderation_notes:
-      account: مُشرِف
      create: إنشاء
-      created_at: التاريخ
      created_msg: تم إنشاء ملاحظة الإشراف بنجاح !
      delete: حذف
      destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح !
    accounts:
      are_you_sure: متأكد ؟
+      avatar: الصورة الرمزية
      by_domain: النطاق
+      change_email:
+        changed_msg: تم تعديل عنوان البريد الإلكتروني الخاص بالحساب بنجاح !
+        current_email: عنوان البريد الإلكتروني الحالي
+        label: تعديل عنوان البريد الإلكتروني
+        new_email: عنوان البريد الإلكتروني الجديد
+        submit: تعديل عنوان البريد الإلكتروني
+        title: تعديل عنوان البريد الإلكتروني الخاص بـ %{username}
      confirm: تأكيد
      confirmed: مؤكَّد
+      confirming: التأكد
      demote: إنزال الرُتبة الوظيفية
      disable: تعطيل
      disable_two_factor_authentication: تعطيل 2FA
@ -71,6 +79,7 @@ ar:
      domain: النطاق
      edit: تعديل
      email: البريد الإلكتروني
+      email_status: حالة البريد الإلكتروني
      enable: تفعيل
      enabled: مفعَّل
      feed_url: عنوان رابط التغذية
@ -108,6 +117,11 @@ ar:
      public: عمومي
      push_subscription_expires: انتهاء الاشتراك ”PuSH“
      redownload: تحديث الصورة الرمزية
+      remove_avatar: حذف الصورة الرمزية
+      resend_confirmation:
+        already_confirmed: هذا المستخدم مؤكد بالفعل
+        send: أعد إرسال رسالة البريد الالكتروني الخاصة بالتأكيد
+        success: تم إرسال رسالة التأكيد بنجاح!
      reset: إعادة التعيين
      reset_password: إعادة ضبط كلمة السر
      resubscribe: اشترك مرة أخرى
@ -241,12 +255,8 @@ ar:
      are_you_sure: هل أنت متأكد ؟
      comment:
        none: لا شيء
-      delete: حذف
      id: معرّف ID
      mark_as_resolved: إعتبار التقرير كمحلول
-      nsfw:
-        'false': الكشف عن الصور
-        'true': إخفاء الوسائط المرفقة
      report: 'التقرير #%{id}'
      report_contents: المحتويات
      reported_account: حساب مُبلّغ عنه
@ -305,11 +315,8 @@ ar:
      back_to_account: العودة إلى صفحة الحساب
      batch:
        delete: حذف
-      execute: تفعيل
      failed_to_execute: خطأ في التفعيل
      media:
-        hide: إخفاء الوسائط
-        show: إظهار الوسائط
        title: الوسائط
      title: منشورات الحساب
      with_media: بالوسائط
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -53,9 +53,7 @@ ca:
    unfollow: Deixa de seguir
  admin:
    account_moderation_notes:
-      account: Moderador
      create: Crea
-      created_at: Data
      created_msg: La nota de moderació s'ha creat correctament!
      delete: Suprimeix
      destroyed_msg: Nota de moderació destruïda amb èxit!
@ -72,6 +70,7 @@ ca:
        title: Canviar adreça de correu de %{username}
      confirm: Confirma
      confirmed: Confirmat
+      confirming: Confirmando
      demote: Degrada
      disable: Inhabilita
      disable_two_factor_authentication: Desactiva 2FA
@ -80,6 +79,7 @@ ca:
      domain: Domini
      edit: Edita
      email: Correu electrònic
+      email_status: Estado del correo electrónico
      enable: Habilita
      enabled: Habilitat
      feed_url: URL del canal
@ -118,6 +118,10 @@ ca:
      push_subscription_expires: La subscripció PuSH expira
      redownload: Actualitza l'avatar
      remove_avatar: Eliminar avatar
+      resend_confirmation:
+        already_confirmed: Este usuario ya está confirmado
+        send: Reenviar el correo electrónico de confirmación
+        success: "¡Correo electrónico de confirmación enviado con éxito!"
      reset: Reinicialitza
      reset_password: Restableix la contrasenya
      resubscribe: Torna a subscriure
@ -269,7 +273,6 @@ ca:
      comment:
        none: Cap
      created_at: Reportat
-      delete: Suprimeix
      id: ID
      mark_as_resolved: Marca com a resolt
      mark_as_unresolved: Marcar sense resoldre
@ -279,9 +282,6 @@ ca:
        create_and_unresolve: Reobrir amb nota
        delete: Esborrar
        placeholder: Descriu les accions que s'han pres o qualsevol altra actualització d'aquest informe…
-      nsfw:
-        'false': Mostra els fitxers multimèdia adjunts
-        'true': Amaga els fitxers multimèdia adjunts
      reopen: Reobrir informe
      report: 'Informe #%{id}'
      report_contents: Contingut
@ -356,11 +356,8 @@ ca:
        delete: Suprimeix
        nsfw_off: Marcar com a no sensible
        nsfw_on: Marcar com a sensible
-      execute: Executa
      failed_to_execute: No s'ha pogut executar
      media:
-        hide: Amaga el contingut multimèdia
-        show: Mostra el contingut multimèdia
        title: Contingut multimèdia
      no_media: Sense contingut multimèdia
      title: Estats del compte
@ -376,6 +373,7 @@ ca:
  admin_mailer:
    new_report:
      body: "%{reporter} ha informat de %{target}"
+      body_remote: Algú des de el domini %{domain} ha informat sobre %{target}
      subject: Informe nou per a %{instance} (#%{id})
  application_mailer:
    notification_preferences: Canvia les preferències de correu
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@ -0,0 +1,831 @@
+---
+co:
+  about:
+    about_hashtag_html: Quessi sò statuti pubblichi taggati cù <strong>#%{hashtag}</strong>. Pudete interagisce cù elli sì voi avete un contu in qualche parte di u <em>fediverse</em>.
+    about_mastodon_html: Mastodon ghjè una rete suciale custruita incù prutucolli web aperti è lugiziali liberi. Hè decentralizatu cumu l’e-mail.
+    about_this: À prupositu
+    administered_by: 'Amministratu da:'
+    closed_registrations: Pè avà, l’arregistramenti sò chjosi nant’à st’istanza. Mà pudete truvà un’altr’istanza per fà un contu è avè accessu à listessa reta da quallà!
+    contact: Cuntattu
+    contact_missing: Mancante
+    contact_unavailable: Micca dispunibule
+    description_headline: Quale hè %{domain} ?
+    domain_count_after: altre istanze
+    domain_count_before: Cunnettati à
+    extended_description_html: |
+      <h3>Una bona piazza per e regule</h3>
+      <p>A descrizzione stesa ùn hè micca stata riempiuta.</p>
+    features:
+      humane_approach_body: Mastodon hà amparatu da i sbagli di l’altre rete suciale, è prova à fà scelte di cuncezzione più etiche per luttà contr’à l’abusu di i media suciali.
+      humane_approach_title: Una mentalità più umana
+      not_a_product_body: Mastodon ùn hè micca una rete cummerciale. Micca pubblicità, micca pruspizzione di dati, micca ambienti chjosi, è micca auturità centrale.
+      not_a_product_title: Site una parsona, micca un pruduttu
+      real_conversation_body: Cù 500 caratteri dispunibuli, diffusione persunalizata di u cuntinutu è avertimenti per media sensibili, pudete cumunicà cum’è voi vulete.
+      real_conversation_title: Fattu per una vera cunversazione
+      within_reach_body: Parechje app per iOS, Android è altre piattaforme, create cù un sistemu d’API accessibile à i prugrammatori, vi permettenu d’avè accessu à i vostri amichi senza prublemi.
+      within_reach_title: Sempre accessibile
+    generic_description: "%{domain} hè un servore di a rete"
+    hosted_on: Mastodon allughjatu nant’à %{domain}
+    learn_more: Amparà di più
+    other_instances: Lista di l’istanze
+    source_code: Codice di fonte
+    status_count_after: statuti
+    status_count_before: chì anu pubblicatu
+    user_count_after: parsone quì
+    user_count_before: Ci sò
+    what_is_mastodon: Quale hè Mastodon?
+  accounts:
+    follow: Siguità
+    followers: Abbunati
+    following: Abbunamenti
+    media: Media
+    moved_html: "%{name} hà cambiatu di contu, avà hè nant’à %{new_profile_link}:"
+    nothing_here: Ùn c’hè nunda quì!
+    people_followed_by: Seguitati da %{name}
+    people_who_follow: Seguitanu %{name}
+    posts: Statuti
+    posts_with_replies: Statuti è risposte
+    remote_follow: Siguità d’altrò
+    reserved_username: Stu cugnome hè riservatu
+    roles:
+      admin: Amministratore
+      moderator: Muderatore
+    unfollow: Ùn siguità più
+  admin:
+    account_moderation_notes:
+      create: Creà
+      created_msg: Nota di muderazione creata!
+      delete: Toglie
+      destroyed_msg: Nota di muderazione sguassata!
+    accounts:
+      are_you_sure: Site sicuru·a?
+      avatar: Ritrattu di prufile
+      by_domain: Duminiu
+      change_email:
+        changed_msg: Email di u contu cambiatu!
+        current_email: Email attuale
+        label: Mudificà l’Email
+        new_email: Novu Email
+        submit: Cambià Email
+        title: Mudificà l’Email di %{username}
+      confirm: Cunfirmà
+      confirmed: Cunfirmata
+      demote: Ritrugradà
+      disable: Disattivà
+      disable_two_factor_authentication: Disattivà l’identificazione à 2 fattori
+      disabled: Disattivatu
+      display_name: Nome pubblicu
+      domain: Duminiu
+      edit: Mudificà
+      email: E-mail
+      enable: Attivà
+      enabled: Attivatu
+      feed_url: URL di u flussu
+      followers: Abbunati
+      followers_url: URL di l’abbunati
+      follows: Abbunamenti
+      inbox_url: URL di l’inbox
+      ip: IP
+      location:
+        all: Tutti
+        local: Lucale
+        remote: D’altrò
+        title: Lucalizazione
+      login_status: Statutu di cunnessione
+      media_attachments: Media aghjunti
+      memorialize: Trasfurmà in mimuriale
+      moderation:
+        all: Tutti
+        silenced: Silenzati
+        suspended: Suspesi
+        title: Muderazione
+      moderation_notes: Note di muderazione
+      most_recent_activity: Attività più ricente
+      most_recent_ip: IP più ricente
+      not_subscribed: Micca abbunatu
+      order:
+        alphabetic: Alfabeticu
+        most_recent: Più ricente
+        title: Urdine
+      outbox_url: URL di l’outbox
+      perform_full_suspension: Fà una suspensione cumpleta
+      profile_url: URL di u prufile
+      promote: Prumove
+      protocol: Prutucollu
+      public: Pubblicu
+      push_subscription_expires: Spirata di l’abbunamentu PuSH
+      redownload: Mette à ghjornu i ritratti
+      remove_avatar: Toglie l’avatar
+      reset: Reset
+      reset_password: Riinizializà a chjave d’accessu
+      resubscribe: Riabbunassi
+      role: Auturizazione
+      roles:
+        admin: Amministratore
+        moderator: Muderatore
+        staff: Squadra
+        user: Utilizatore
+      salmon_url: URL di Salmon
+      search: Cercà
+      shared_inbox_url: URL di l’inbox spartuta
+      show:
+        created_reports: Signalamenti creati da stu contu
+        report: Signalamentu
+        targeted_reports: Signalamenti creati contr’à stu contu
+      silence: Silenzà
+      statuses: Statuti
+      subscribe: Abbunassi
+      title: Conti
+      unconfirmed_email: E-mail micca cunfirmatu
+      undo_silenced: Ùn silenzà più
+      undo_suspension: Ùn suspende più
+      unsubscribe: Disabbunassi
+      username: Cugnome
+      web: Web
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name} s’hè assignatu u signalamentu %{target}"
+        change_email_user: "%{name} hà cambiatu l’indirizzu e-mail di %{target}"
+        confirm_user: "%{name} hà cunfirmatu l’indirizzu e-mail di %{target}"
+        create_custom_emoji: "%{name} hà caricatu una nov’emoji %{target}"
+        create_domain_block: "%{name} hà bluccatu u duminiu %{target}"
+        create_email_domain_block: "%{name} hà messu u duminiu e-mail %{target} nant’a lista nera"
+        demote_user: "%{name} hà ritrugradatu l’utilizatore %{target}"
+        destroy_domain_block: "%{name} hà sbluccatu u duminiu %{target}"
+        destroy_email_domain_block: "%{name} hà messu u duminiu e-mail %{target} nant’a lista bianca"
+        destroy_status: "%{name} hà toltu u statutu di %{target}"
+        disable_2fa_user: "%{name} hà disattivatu l’identificazione à dui fattori per %{target}"
+        disable_custom_emoji: "%{name} hà disattivatu l’emoji %{target}"
+        disable_user: "%{name} hà disattivatu a cunnessione per %{target}"
+        enable_custom_emoji: "%{name} hà attivatu l’emoji %{target}"
+        enable_user: "%{name} hà attivatu a cunnessione per %{target}"
+        memorialize_account: "%{name} hà trasfurmatu u contu di %{target} in una pagina mimuriale"
+        promote_user: "%{name} hà prumossu %{target}"
+        remove_avatar_user: "%{name} hà toltu u ritrattu di %{target}"
+        reopen_report: "%{name} hà riapertu u signalamentu %{target}"
+        reset_password_user: "%{name} hà riinizializatu a chjave d’accessu di %{target}"
+        resolve_report: "%{name} hà chjosu u signalamentu %{target}"
+        silence_account: "%{name} hà silenzatu u contu di %{target}"
+        suspend_account: "%{name} hà suspesu u contu di %{target}"
+        unassigned_report: "%{name} hà disassignatu u signalamentu %{target}"
+        unsilence_account: "%{name} hà fattu che u contu di %{target} ùn hè più silenzatu"
+        unsuspend_account: "%{name} hà fattu che u contu di %{target} ùn hè più suspesu"
+        update_custom_emoji: "%{name} hà messu à ghjornu l’emoji %{target}"
+        update_status: "%{name} hà cambiatu u statutu di %{target}"
+      title: Ghjurnale d’audit
+    custom_emojis:
+      by_domain: Duminiu
+      copied_msg: Copia lucale di l’emoji creata!
+      copy: Cupià
+      copy_failed_msg: Ùn s’hè micca pussutu creà una copia di l’emoji
+      created_msg: L’emoji hè stata creata!
+      delete: Toglie
+      destroyed_msg: L’emoji hè stata tolta!
+      disable: Disattivà
+      disabled_msg: L’emoji hè stata disattivata!
+      emoji: Emoji
+      enable: Attivà
+      enabled_msg: L’emoji hè stata attivata!
+      image_hint: PNG di 50Ko o menu
+      listed: Listata
+      new:
+        title: Aghjustà una nov’emoji
+      overwrite: Soprascrive
+      shortcode: Accorta
+      shortcode_hint: 2 caratteri o più, solu lettere, numeri è liniette basse
+      title: Emoji parsunalizate
+      unlisted: Micca listata
+      update_failed_msg: Ùn s’hè micca pussutu mette à ghjornu l’emoji
+      updated_msg: L’emoji hè stata messa à ghjornu!
+      upload: Caricà
+    domain_blocks:
+      add_new: Aghjustà
+      created_msg: U blucchime di u duminiu hè attivu
+      destroyed_msg: U blucchime di u duminiu ùn hè più attivu
+      domain: Duminiu
+      new:
+        create: Creà un blucchime
+        hint: U blucchime di duminiu ùn impedirà micca a creazione di conti indè a database, mà metudi di muderazione specifiche saranu applicati.
+        severity:
+          desc_html: Cù<strong>Silenzà</strong>, solu l’abbunati di u contu viderenu i so missaghji. <strong>Suspende</strong> sguassarà tutti i cuntenuti è dati di u contu. Utilizate <strong>Nisuna</strong> s’è voi vulete solu righjittà fugliali media.
+          noop: Nisuna
+          silence: Silenzà
+          suspend: Suspende
+        title: Novu blucchime di duminiu
+      reject_media: Righjittà i fugliali media
+      reject_media_hint: Sguassa tutti i media caricati è ricusa caricamenti futuri. Inutile per una suspensione
+      severities:
+        noop: Nisuna
+        silence: Silenzà
+        suspend: Suspende
+      severity: Severità
+      show:
+        affected_accounts:
+          one: Un contu tuccatu indè a database
+          other: "%{count} conti tuccati indè a database"
+        retroactive:
+          silence: Ùn silenzà più i conti nant’à stu duminiu
+          suspend: Ùn suspende più i conti nant’à stu duminiu
+        title: Ùn bluccà più u duminiu %{domain}
+        undo: Annullà
+      title: Blucchimi di duminiu
+      undo: Annullà
+    email_domain_blocks:
+      add_new: Aghjustà
+      created_msg: U blucchime di u duminiu d’e-mail hè attivu
+      delete: Toglie
+      destroyed_msg: U blucchime di u duminiu d’e-mail ùn hè più attivu
+      domain: Duminiu
+      new:
+        create: Creà un blucchime
+        title: Nova iscrizzione nant’a lista nera e-mail
+      title: Lista nera e-mail
+    instances:
+      account_count: Conti cunnisciuti
+      domain_name: Duminiu
+      reset: Riinizializà
+      search: Cercà
+      title: Istanze cunnisciute
+    invites:
+      filter:
+        all: Tuttu
+        available: Dispunibuli
+        expired: Spirati
+        title: Filtrà
+      title: Invitazione
+    report_notes:
+      created_msg: Nota di signalamentu creata!
+      destroyed_msg: Nota di signalamentu sguassata!
+    reports:
+      account:
+        note: nota
+        report: palisà
+      action_taken_by: Intervenzione di
+      are_you_sure: Site sicuru·a?
+      assign_to_self: Assignallu à mè
+      assigned: Muderatore assignatu
+      comment:
+        none: Nisunu
+      created_at: Palisatu
+      id: ID
+      mark_as_resolved: Indicà cum’è chjosu
+      mark_as_unresolved: Indicà cum’è sempre apertu
+      notes:
+        create: Aghjunghje una nota
+        create_and_resolve: Chjude cù una nota
+        create_and_unresolve: Riapre cù una nota
+        delete: Toglie
+        placeholder: Per parlà di l’azzione piglate, o altre messe à ghjornu nant’à u signalamentu…
+      reopen: Riapre u signalamentu
+      report: 'Signalamente #%{id}'
+      report_contents: Cuntenuti
+      reported_account: Contu palisatu
+      reported_by: Palisatu da
+      resolved: Scioltu è chjosu
+      resolved_msg: Signalamentu scioltu!
+      silence_account: Silenzà u contu
+      status: Statutu
+      suspend_account: Suspende u contu
+      target: Oggettu
+      title: Signalamenti
+      unassign: Disassignà
+      unresolved: Micca sciolti
+      updated_at: Messi à ghjornu
+      view: Vede
+    settings:
+      activity_api_enabled:
+        desc_html: Numeri di statuti creati quì, utilizatori attivi, è arregistramenti novi tutte e settimane
+        title: Pubblicà statistiche nant’à l’attività di l’utilizatori
+      bootstrap_timeline_accounts:
+        desc_html: Cugnomi separati cù virgule. Solu pussibule cù conti lucali è pubblichi. Quandu a lista hè viota, tutti l’amministratori lucali saranu selezziunati.
+        title: Abbunamenti predefiniti per l’utilizatori novi
+      contact_information:
+        email: E-mail prufissiunale
+        username: Identificatore di cuntattu
+      hero:
+        desc_html: Affissatu nant’a pagina d’accolta. Ricumandemu almenu 600x100px. S’ellu ùn hè micca definiti, a vignetta di l’istanza sarà usata
+        title: Ritrattu di cuprendula
+      peers_api_enabled:
+        desc_html: Indirizzi st’istanza hà vistu indè u fediverse
+        title: Pubblicà a lista d’istanza cunnisciute
+      registrations:
+        closed_message:
+          desc_html: Affissatu nant’a pagina d’accolta quandu l’arregistramenti sò chjosi. Pudete fà usu di u furmattu HTML
+          title: Missaghju per l’arregistramenti chjosi
+        deletion:
+          desc_html: Auturizà tuttu u mondu di sguassà u so propiu contu
+          title: Auturizà à sguassà i conti
+        min_invite_role:
+          disabled: Nisunu
+          title: Auturizà l’invitazione da
+        open:
+          desc_html: Auturizà tuttu u mondu à creà un contu quì
+          title: Apre l’arregistramenti
+      show_known_fediverse_at_about_page:
+        desc_html: Quandu ghjè selezziunatu, statuti di tuttu l’istanze cunnisciute saranu affissati indè a vista di e linee. Altrimente soli i statuti lucali saranu mustrati.
+        title: Vedde tuttu u fediverse cunnisciutu nant’a vista di e linee
+      show_staff_badge:
+        desc_html: Mustrerà un badge Squadra nant’à un prufile d’utilizatore
+        title: Mustrà un badge staff
+      site_description:
+        desc_html: Paragrafu di prisentazione nant’a pagina d’accolta è i marchi meta. Pudete fà usu di marchi HTML, in particulare <code>&lt;a&gt;</code> è <code>&lt;em&gt;</code>.
+        title: Discrizzione di l’istanza
+      site_description_extended:
+        desc_html: Una bona piazza per e regule, infurmazione è altre cose chì l’utilizatori duverìanu sapè. Pudete fà usu di marchi HTML
+        title: Discrizzione stesa di u situ
+      site_terms:
+        desc_html: Quì pudete scrive e vostre regule di cunfidenzialità, cundizione d’usu o altre menzione legale. Pudete fà usu di marchi HTML
+        title: Termini persunalizati
+      site_title: Nome di l’istanza
+      thumbnail:
+        desc_html: Utilizatu per viste cù OpenGraph è l’API. Ricumandemu 1200x630px
+        title: Vignetta di l’istanza
+      timeline_preview:
+        desc_html: Vede a linea pubblica nant’a pagina d’accolta
+        title: Vista di e linee
+      title: Parametri di u situ
+    statuses:
+      back_to_account: Ritornu à a pagina di u contu
+      batch:
+        delete: Toglie
+        nsfw_off: Indicà cum’è micca sensibile
+        nsfw_on: Indicà cum’è sensibile
+      failed_to_execute: Esecuzione impussibule
+      media:
+        title: Media
+      no_media: Nisun media
+      title: Statutu di u contu
+      with_media: Cù media
+    subscriptions:
+      callback_url: URL di richjama
+      confirmed: Cunfirmatu
+      expires_in: Spira in
+      last_delivery: Ultima arricata
+      title: WebSub
+      topic: Sughjettu
+    title: Amministrazione
+  admin_mailer:
+    new_report:
+      body: "%{reporter} hà palisatu %{target}"
+      body_remote: Qualch’unu da %{domain} hà palisatu %{target}
+      subject: Novu signalamentu nant’à %{instance} (#%{id})
+  application_mailer:
+    notification_preferences: Cambià e priferenze e-mail
+    salutation: "%{name},"
+    settings: 'Cambià e priferenze e-mail: %{link}'
+    view: 'Vede:'
+    view_profile: Vede u prufile
+    view_status: Vede u statutu
+  applications:
+    created: Applicazione creata
+    destroyed: Applicazione sguassata
+    invalid_url: L’URL ch’è stata pruvista ùn hè valida
+    regenerate_token: Regenerate access token
+    token_regenerated: Access token successfully regenerated
+    warning: Be very careful with this data. Never share it with anyone!
+    your_token: Rigenerà a fiscia d’accessu
+  auth:
+    agreement_html: Arregistrassi vole dì chì site d’accunsentu per siguità <a href="%{rules_path}">e regule di l’istanza</a> è <a href="%{terms_path}">e cundizione d’usu</a>.
+    change_password: Chjave d’accessu
+    confirm_email: Cunfirmà l’e-mail
+    delete_account: Sguassà u contu
+    delete_account_html: S’è voi vulete toglie u vostru contu <a href="%{path}">ghjè quì</a>. Duverete cunfirmà a vostra scelta.
+    didnt_get_confirmation: Ùn avete micca ricevutu l’istruzione di cunfirmazione?
+    forgot_password: Chjave scurdata?
+    invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
+    login: Cunnettassi
+    logout: Scunnettassi
+    migrate_account: Cambià di contu
+    migrate_account_html: S’è voi vulete riindirizà stu contu versu un’altru, <a href="%{path}">ghjè pussibule quì</a>.
+    or: o
+    or_log_in_with: O cunnettatevi cù
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Arregistrassi
+    register_elsewhere: Arregistrassi altrò
+    resend_confirmation: Rimandà l’istruzzioni di cunfirmazione
+    reset_password: Cambià a chjave d’accessu
+    security: Sicurità
+    set_new_password: Creà una nova chjave d’accessu
+  authorize_follow:
+    already_following: You are already following this account
+    error: Peccatu, c’hè statu un prublemu ricercandu u contu.
+    follow: Siguità
+    follow_request: 'Avete dumandatu di siguità:'
+    following: 'Eccu! Avà seguitate:'
+    post_follow:
+      close: Or, you can just close this window.
+      return: Rivultà à u prufile di l’utilizatore
+      web: Andà à l’interfaccia web
+    title: Siguità %{acct}
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_months: "%{count}mo"
+      about_x_years: "%{count}y"
+      almost_x_years: "%{count}y"
+      half_a_minute: Avà
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Avà
+      over_x_years: "%{count}y"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mo"
+      x_seconds: "%{count}s"
+  deletes:
+    bad_password_msg: È nò! Sta chjave ùn hè curretta
+    confirm_password: Entrate a vostra chjave d’accessu attuale per verificà a vostra identità
+    description_html: U contu sarà deattivatu è u cuntenutu sarà sguassatu di manera <strong>permanente è irreversibile</strong>. Ùn sarà micca pussibule piglià stu cugnome torna per evità l’impusture.
+    proceed: Sguassà u contu
+    success_msg: U vostru contu hè statu sguassatu
+    warning_html: Pudete esse sicuru·a solu chì u cuntenutu sarà sguassatu di st’istanza. S’ellu hè statu spartutu in altrò, sarà forse sempre quallà.
+    warning_title: Dispunibilità di i cuntenuti sparsi
+  errors:
+    '403': Ùn site micca auturizatu·a à vede sta pagina.
+    '404': Sta pagina ùn esiste micca.
+    '410': Sta pagina ùn esiste più.
+    '422':
+      content: C’hè statu un prublemu cù a verificazione di sicurità. Forse bluccate cookies?
+      title: Fiascu di verificazione
+    '429': Limitatu dop’à troppu richieste
+    '500':
+      content: Scusate, mà c’hè statu un prublemu cù u nostru servore.
+      title: Sta pagina ùn hè curretta
+    noscript_html: Mastodon nant’à u web hà bisognu di JavaScript per funziunà. Pudete ancu pruvà <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">l’applicazione native</a> per a vostra piattaforma.
+  exports:
+    archive_takeout:
+      date: Data
+      download: Scaricà l’archiviu
+      hint_html: Pudete dumandà un’archiviu di i vostri <strong>statuti è media caricati</strong>. I dati saranu in u furmattu ActivityPub è pudarenu esse letti da tutti i lugiziali chì u supportanu.
+      in_progress: Cumpilazione di l’archiviu...
+      request: Dumandà u vostr’archiviu
+      size: Pesu
+    blocks: Bluccate
+    csv: CSV
+    follows: Seguitate
+    mutes: Piattate
+    storage: I vostri media
+  followers:
+    domain: Duminiu
+    explanation_html: Per assicuravi di a cunfidenzialità di i vostri statuti, duvete avè primura di quale vi seguita. <strong>I vostri statuti privati sò mandati à tutte l’istanze induve avete abbunati</strong>. Pensate à u vostru livellu di cunfidenza in i so amministratori.
+    followers_count: Numeru d’abbunati
+    lock_link: Rendete u contu privatu
+    purge: Toglie di a lista d’abbunati
+    success:
+      one: Suppressione di l’abbunati d’un duminiu...
+      other: Suppressione di l’abbunati da %{count} duminii...
+    true_privacy_html: Ùn vi scurdate chì <strong>una vera cunfidenzialità pò solu esse ottenuta cù crittografia da un capu à l’altru</strong>.
+    unlocked_warning_html: Tuttu u mondu pò seguitavi è vede i vostri statuti privati. %{lock_link}  per pudè cunfirmà o righjittà abbunamenti.
+    unlocked_warning_title: U vostru contu hè pubblicu
+  generic:
+    changes_saved_msg: Cambiamenti salvati!
+    powered_by: mossu da %{link}
+    save_changes: Salvà e mudificazione
+    validation_errors:
+      one: Qualcosa ùn và bè! Verificate un prublemu quì sottu.
+      other: Qualcosa ùn và bè! Verificate %{count} prublemi quì sottu.
+  imports:
+    preface: Pudete impurtà certi dati cumu e persone chì seguitate o bluccate nant’à u vostru contu nant’à st’istanza à partesi di fugliali creati nant’à un’altr’istanza.
+    success: I vostri dati sò stati impurtati è saranu trattati da quì à pocu.
+    types:
+      blocking: Persone chì bluccate
+      following: Persone chì seguitate
+      muting: Persone chì piattate
+    upload: Impurtà
+  in_memoriam_html: In mimoria.
+  invites:
+    delete: Disattivà
+    expired: Spirata
+    expires_in:
+      '1800': 30 minuti
+      '21600': 6 ore
+      '3600': 1 ora
+      '43200': 12 ore
+      '604800': 1 settimana
+      '86400': 1 ghjornu
+    expires_in_prompt: Mai
+    generate: Creà
+    max_uses:
+      one: 1 usu
+      other: "%{count} usi"
+    max_uses_prompt: Micca limita
+    prompt: Create è spartete ligami cù altre parsone per dà accessu à l’istanza
+    table:
+      expires_at: Spira
+      uses: Utiliza
+    title: Invità ghjente
+  landing_strip_html: "<strong>%{name}</strong> hè nant’à %{link_to_root_path}. Pudete seguitallu·a o cumunicà cù ellu·a cù un contu in qualche parte di u fediverse."
+  landing_strip_signup_html: Pudete ancu <a href="%{sign_up_path}">arrigistravi quì</a>.
+  lists:
+    errors:
+      limit: Ùn pudete più creà altre liste.
+  media_attachments:
+    validations:
+      images_and_video: Ùn si pò micca aghjunghje un filmettu à un statutu chì hà digià ritratti
+      too_many: Ùn si pò micca aghjunghje più di 4 fugliali
+  migrations:
+    acct: cugnome@duminiu di u novu contu
+    currently_redirecting: "’U vostru prufile riindiriza tuttu versu à:’"
+    proceed: Salvà
+    updated_msg: I paramettri di migrazione sò stati messi à ghjornu!
+  moderation:
+    title: Muderazione
+  notification_mailer:
+    digest:
+      action: Vede tutte e nutificazione
+      body: Eccu cio ch’avete mancatu dapoi à a vostr’ultima visita u %{since}
+      mention: "%{name} v’hà mintuvatu·a in:"
+      new_followers_summary:
+        one: Avete ancu un’abbunatu novu!
+        other: Avete ancu %{count} abbunati novi!
+      subject:
+        one: "Una nutificazione nova dapoi à a vostr’ultima visita \U0001F418"
+        other: "%{count} nutificazione nove dapoi à a vostr’ultima visita \U0001F418"
+      title: Dapoi l’ultima volta…
+    favourite:
+      body: "%{name} hà aghjuntu u vostru statutu à i so favuriti :"
+      subject: "%{name} hà messu u vostru post in i so favuriti"
+      title: Novu favuritu
+    follow:
+      body: "%{name} s’hè abbunatu à u vostru contu !"
+      subject: "%{name} vi seguita"
+      title: Abbunatu novu
+    follow_request:
+      action: Vede e dumande d’abbunamentu
+      body: "%{name} vole abbunassi à u vostru contu"
+      subject: 'Dumanda d’abbunamentu: %{name}'
+      title: Nova dumanda d’abbunamentu
+    mention:
+      action: Risposta
+      body: "%{name} v’hà mintuvatu·a indè :"
+      subject: "%{name} v’hà mintuvatu·a"
+      title: Nova menzione
+    reblog:
+      body: 'U vostru statutu hè statu spartutu da %{name}:'
+      subject: "%{name} hà spartutu u vostru statutu"
+      title: Nova spartera
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: G
+          million: M
+          quadrillion: P
+          thousand: K
+          trillion: T
+          unit: ''
+  pagination:
+    newer: Più ricente
+    next: Dopu
+    older: Più vechju
+    prev: Nanzu
+    truncate: "&hellip;"
+  preferences:
+    languages: Lingue
+    other: Altre
+    publishing: Pubblicazione
+    web: Web
+  push_notifications:
+    favourite:
+      title: "%{name} hà aghjuntu u vostru statutu à i so favuriti"
+    follow:
+      title: "%{name} vi seguita"
+    group:
+      title: "%{count} nutificazioni"
+    mention:
+      action_boost: Sparte
+      action_expand: Vede di più
+      action_favourite: Aghjunghje à i favuriti
+      title: "%{name} v’hà mintuvatu·a"
+    reblog:
+      title: "%{name} hà spartutu u vostru statutu"
+  remote_follow:
+    acct: Entrate u vostru cugnome@istanza da induve vulete siguità stu contu.
+    missing_resource: Ùn avemu pussutu à truvà l’indirizzu di ridirezzione
+    proceed: Cuntinuà per siguità
+    prompt: 'Avete da siguità:'
+  remote_unfollow:
+    error: Errore
+    title: Titulu
+    unfollowed: Disabbunatu
+  sessions:
+    activity: Ultima attività
+    browser: Navigatore
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Navigatore scunnisciutu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Sessione attuale
+    description: "%{browser} nant’à %{platform}"
+    explanation: Quessi sò i navigatori cunnettati à u vostru contu Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: piattaforma scunnisciuta
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Rivucà
+    revoke_success: Sessione rivucata
+    title: Sessioni
+  settings:
+    authorized_apps: Applicazione auturizate
+    back: Ritornu nant’à Mastodon
+    delete: Suppressione di u contu
+    development: Sviluppu
+    edit_profile: Mudificà u prufile
+    export: Spurtazione d’infurmazione
+    followers: Abbunati auturizati
+    import: Impurtazione
+    migrate: Migrazione di u contu
+    notifications: Nutificazione
+    preferences: Priferenze
+    settings: Parametri
+    two_factor_authentication: Identificazione à dui fattori
+    your_apps: E vostre applicazione
+  statuses:
+    attached:
+      description: 'Aghjuntu: %{attached}'
+      image:
+        one: "%{count} ritrattu"
+        other: "%{count} ritratti"
+      video:
+        one: "%{count} filmettu"
+        other: "%{count} filmetti"
+    content_warning: 'Avertimentu: %{warning}'
+    disallowed_hashtags:
+      one: 'cuntene l’hashtag disattivatu: %{tags}'
+      other: 'cuntene l’hashtag disattivati: %{tags}'
+    open_in_web: Apre nant’à u web
+    over_character_limit: Site sopr’à a limita di %{max} caratteri
+    pin_errors:
+      limit: Avete digià puntarulatu u numeru massimale di statuti
+      ownership: Pudete puntarulà solu unu di i vostri propii statuti
+      private: Ùn pudete micca puntarulà un statutu ch’ùn hè micca pubblicu
+      reblog: Ùn pudete micca puntarulà una spartera
+    show_more: Vede di più
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      private: Solu per l’abbunati
+      private_long: Mustrà solu à l’abbunati
+      public: Pubblicu
+      public_long: Tuttu u mondu pò vede
+      unlisted: Micca listatu
+      unlisted_long: Tuttu u mondu pò vede, mà micca indè e linee pubbliche
+  stream_entries:
+    click_to_show: Cliccà per vede
+    pinned: Statutu puntarulatu
+    reblogged: spartutu
+    sensitive_content: Cuntenutu sensibile
+  terms:
+    body_html: |
+      <h2>Privacy Policy</h2>
+      <h3 id="collect">What information do we collect?</h3>
+
+      <ul>
+        <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
+        <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
+        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it’s important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+        <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">What do we use your information for?</h3>
+
+      <p>Any of the information we collect from you may be used in the following ways:</p>
+
+      <ul>
+        <li>To provide the core functionality of Mastodon. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
+        <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
+        <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect">How do we protect your information?</h3>
+
+      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">What is our data retention policy?</h3>
+
+      <p>We will make a good faith effort to:</p>
+
+      <ul>
+        <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
+        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+      </ul>
+
+      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
+
+      <p>You may irreversibly delete your account at any time.</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">Do we use cookies?</h3>
+
+      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer’s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
+
+      <p>We use cookies to understand and save your preferences for future visits.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
+
+      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
+
+      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
+
+      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="coppa">Children’s Online Privacy Protection Act Compliance</h3>
+
+      <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children’s Online Privacy Protection Act</a>) do not use this site.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">Changes to our Privacy Policy</h3>
+
+      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
+
+      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
+
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
+    title: Termini d’usu è di cunfidenzialità per %{instance}
+  themes:
+    contrast: Cuntrastu altu
+    default: Mastodon
+  time:
+    formats:
+      default: "%d %b %Y, %H:%M"
+  two_factor_authentication:
+    code_hint: Entrate u codice generatu da l’applicazione per cunfirmà
+    description_html: S’ella hè attivata <strong>l’identificazione à dui fattori</strong>, duvete avè u vostru telefuninu pè ottene un codice di cunnezzione.
+    disable: Disattivà
+    enable: Attivà
+    enabled: Identificazione à dui fattori attivata
+    enabled_success: L’identificazione à dui fattori hè stata attivata.
+    generate_recovery_codes: Creà codici di ricuperazione
+    instructions_html: "<strong>Scanate stu QR code cù Google Authenticator, Authy o qualcosa cusì nant’à u vostru telefuninu</strong>. St’applicazione hà da creà codici da entrà ogni volta chì vi cunnettate."
+    lost_recovery_codes: I codici di ricuperazione à usu unicu vi permettenu di sempre avè accessu à u vostru contu s’è voi avete persu u vostru telefuninu. S’elli sò ancu persi, pudete creà codici novi quì. I vechji codici ùn marchjeranu più.
+    manual_instructions: S’ellu ùn hè micca pussibule scanà u QR code, pudete entre sta chjave sicreta:’
+    recovery_codes: Codici di ricuperazione
+    recovery_codes_regenerated: Codici di ricuperazione ricreati
+    recovery_instructions_html: Pudete fà usu di i codici quì sottu per sempre avè accessu à u vostru contu s’ellu hè statu persu u vostru telefuninu. <strong>Guardateli in una piazza sicura</strong>. Per esempiu, stampati è cunservati cù altri ducumenti impurtanti.
+    setup: Installà
+    wrong_code: U codice ùn hè micca currettu! Site sicuru che l’ora di u telefuninu è di u servore sò esatte?
+  user_mailer:
+    backup_ready:
+      explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
+      subject: U vostru archiviu hè prontu à scaricà
+      title: Archiviu prontu
+    welcome:
+      edit_profile_action: Cunfigurazione di u prufile
+      edit_profile_step: Pudete persunalizà u vostru prufile cù un ritrattu di prufile o di cuprendula, un nome pubblicu persunalizatu, etc. Pudete ancu rende u contu privatu per duvè cunfirmà ogni dumanda d’abbunamentu.
+      explanation: Eccu alcune idee per principià
+      final_action: Principià à pustà
+      final_step: 'Andemu! Ancu senza abbunati i vostri missaghji pubblichi puderanu esse visti da altre persone, per esempiu nant’a linea lucale è l’hashtag. Pudete ancu prisintavi nant’à u hashtag #introductions!'
+      full_handle: U vostru identificatore cumplettu
+      full_handle_hint: Quessu ghjè cio chì direte à i vostri amichi per circavi, abbunassi à u vostru contu da altrò, o mandà missaghji.
+      review_preferences_action: Mudificà e priferenze
+      review_preferences_step: Quì pudete adattà u cumpurtamentu di Mastodon à e vostre priferenze, cum’è l’email che vulete riceve, u nivellu di cunfidenzialità predefinitu di i vostri statuti, o u cumpurtamentu di i GIF animati.
+      subject: Benvenutu·a nant’à Mastodon
+      tip_bridge_html: S’è voi venite di Twitter, pudete truvà i vostri amichi da quallà chì sò nant’à Mastodon cù a <a href="%{bridge_url}">bridge app</a>. Mà ùn marchja chè s’elli l’anu ancu usata!
+      tip_federated_timeline: A linea pubblica glubale mostra i statuti da altre istanze nant’a rete Mastodon, mà ùn hè micca cumpleta perchè ci sò soli i conti à quelli sò abbunati membri di a vostr’istanza.
+      tip_following: Site digià abbunatu·a à l’amministratori di u vostru servore. Per truvà d’altre parsone da siguità, pudete pruvà e linee pubbliche.
+      tip_local_timeline: A linea pubblica lucale ghjè una vista crunulogica di i statuti di a ghjente nant’à %{instance}.
+      tip_mobile_webapp: Pudete aghjunghje Mastodon à a pagina d’accolta di u vostru navigatore di telefuninu per riceve nutificazione, cum’un applicazione.
+      tips: Cunsiglii
+      title: Benvenutu·a, %{name}!
+  users:
+    invalid_email: L’indirizzu e-mail ùn hè currettu.
+    invalid_otp_token: U codice d’identificazione ùn hè currettu.
+    seamless_external_login: Site cunnettatu·a dapoi un serviziu esternu, allora i parametri di chjave d’accessu è d’indirizzu e-mail ùn so micca dispunibili.
+    signed_in_as: 'Cunnettatu·a cum’è:'
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -53,9 +53,7 @@ de:
    unfollow: Entfolgen
  admin:
    account_moderation_notes:
-      account: Moderator*in
      create: Erstellen
-      created_at: Datum
      created_msg: Moderationsnotiz erfolgreich erstellt!
      delete: Löschen
      destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
@ -72,6 +70,7 @@ de:
        title: E-Mail-Adresse für %{username} ändern
      confirm: Bestätigen
      confirmed: Bestätigt
+      confirming: Bestätigung
      demote: Degradieren
      disable: Ausschalten
      disable_two_factor_authentication: 2FA abschalten
@ -80,6 +79,7 @@ de:
      domain: Domain
      edit: Bearbeiten
      email: E-Mail
+      email_status: E-Mail-Status
      enable: Freischalten
      enabled: Freigegeben
      feed_url: Feed-URL
@ -118,6 +118,10 @@ de:
      push_subscription_expires: PuSH-Abonnement läuft aus
      redownload: Avatar neu laden
      remove_avatar: Profilbild entfernen
+      resend_confirmation:
+        already_confirmed: Dieser Benutzer wurde bereits bestätigt
+        send: Bestätigungsmail erneut senden
+        success: Bestätigungs-E-Mail erfolgreich gesendet!
      reset: Zurücksetzen
      reset_password: Passwort zurücksetzen
      resubscribe: Wieder abonnieren
@ -269,7 +273,6 @@ de:
      comment:
        none: Kein
      created_at: Gemeldet
-      delete: Löschen
      id: ID
      mark_as_resolved: Als gelöst markieren
      mark_as_unresolved: Als ungelöst markieren
@ -279,9 +282,6 @@ de:
        create_and_unresolve: Mit Kommentar wieder öffnen
        delete: Löschen
        placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder andere Neuigkeiten zu dieser Meldung…
-      nsfw:
-        'false': Medienanhänge wieder anzeigen
-        'true': Medienanhänge verbergen
      reopen: Meldung wieder öffnen
      report: 'Meldung #%{id}'
      report_contents: Inhalt
@ -356,11 +356,8 @@ de:
        delete: Löschen
        nsfw_off: Als nicht heikel markieren
        nsfw_on: Als heikel markieren
-      execute: Ausführen
      failed_to_execute: Ausführen fehlgeschlagen
      media:
-        hide: Medien verbergen
-        show: Medien anzeigen
        title: Medien
      no_media: Keine Medien
      title: Beiträge des Kontos
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@ -0,0 +1,82 @@
+---
+co:
+  devise:
+    confirmations:
+      confirmed: U vostru indirizzu email hè statu cunfirmatu.
+      send_instructions: Avete da riceve un’email cù l’istruzzione di cunfirmazione in qualchì minuta. Pensate à verificà u cartulare di spam s’ellu ùn c’hè nunda.
+      send_paranoid_instructions: S’ellu esiste u vostru indirizzu email in a database, avete da riceve l’istruzzione pè cunfirmà u vostru contu in qualchì minuta. Pensate à verificà u cartulare di spam s’ellu ùn c’hè nunda.
+    failure:
+      already_authenticated: Site digià cunnettatu·a.
+      inactive: U vostru contu ùn hè ancu attivatu.
+      invalid: L’ %{authentication_keys} o a chjave d’accessu ùn sò curretti.
+      last_attempt: Avete un’ultimu tintativu nanzu chì u vostru contu sia chjosu.
+      locked: U vostru contu hè chjosu.
+      not_found_in_database: L’ %{authentication_keys} o a chjave d’accessu ùn sò curretti.
+      timeout: A vostra sezzione hè spirata. Ricunnettatevi pè cuntinuà.
+      unauthenticated: Cunnettatevi o arregistratevi pè cuntinuà.
+      unconfirmed: Duvete cunfirmà u vostru contu pè cuntinuà.
+    mailer:
+      confirmation_instructions:
+        action: Verificà l’indirizzu email
+        explanation: Avete creatu un contu nant’à %{host} cù st’indirizzu email. Pudete attivallu cù un clic, o ignurà quessu missaghji s’ellu un era micca voi.
+        extra_html: Pensate à leghje <a href="%{terms_path}">e regule di l’istanza</a> è <a href="%{policy_path}">i termini d’usu</a>.
+        subject: 'Mastodon: Istruzzione di cunfirmazione per %{instance}'
+        title: Verificà l’indirizzu email
+      email_changed:
+        explanation: 'L’indirizzu email di u vostru contu hè stata cambiata per:'
+        extra: S’ellu un era micca voi ch’avete cambiatu u vostru email, qualch’un’altru hà accessu à u vostru contu. Duvete cambià a vostra chjave d’accessu o cuntattà l’amministratore di l’istanza s’ellu ùn hè più pussibule di cunnettavi.
+        subject: 'Mastodon: Email cambiatu'
+        title: Novu indirizzu email
+      password_change:
+        explanation: A chjave d’accessu per u vostru contu hè stata cambiata.
+        extra: S’ellu un era micca voi ch’avete cambiatu a vostra chjave d’accessu, qualch’un’altru hà accessu à u vostru contu. Duvete cambià a vostra chjave d’accessu o cuntattà l’amministratore di l’istanza s’ellu ùn hè più pussibule di cunnettavi.
+        subject: 'Mastodon: Chjave d’accessu cambiata'
+        title: Chjave cambiata
+      reconfirmation_instructions:
+        explanation: Cunfirmà u novu indirizzu per cambià l’email.
+        extra: S’ellu ùn era micca voi, ignurate stu missaghju. L’email ùn cambiarà micca s’è voi ùn cliccate micca u ligame.
+        subject: 'Mastodon: Cunfirmà l’email per %{instance}'
+        title: Verificà indirizzu email
+      reset_password_instructions:
+        action: Cambià a chjave d’accessu
+        explanation: Avete dumandatu una nova chjave d’accessu per u vostru contu.
+        extra: S’ellu ùn era micca voi, ignurate stu missaghju. A chjave d’accessu ùn cambiarà micca s’è voi ùn cliccate micca u ligame.
+        subject: 'Mastodon: Cambià a chjave d’accessu'
+        title: Cambià a chjave
+      unlock_instructions:
+        subject: 'Mastodon: Riapre u contu'
+    omniauth_callbacks:
+      failure: Ùn pudemu micca cunnettavi da %{kind} perchè "%{reason}".
+      success: Vi site cunnettatu·a da %{kind}.
+    passwords:
+      no_token: Ùn pudete micca vede sta pagina senza vene d’un e-mail di cambiamentu di chjave d’accessu. S’è voi venite quì dapoi st’e-mail, assicuratevi ch’avete utilizatu l’indirizzu URL cumpletu.
+      send_instructions: Avete da riceve l’istruzzione di cambiamentu di a chjave d’accessu in qualchì minuta.
+      send_paranoid_instructions: S’ellu esiste u vostr’e-mail in a database, avete da riceve un ligame di reinizialisazione.
+      updated: A vostra chjave d’accessu hè stata cambiata, è site cunnettatu·a.
+      updated_not_active: A vostra chjave d’accessu hè stata cambiata.
+    registrations:
+      destroyed: U vostru contu hè statu sguassatu. Avvedeci!
+      signed_up: Benvinutu! Site cunnettatu·a.
+      signed_up_but_inactive: Site arregistratu·a, mà ùn pudete micca cunnettavi perchè u vostru contu deve esse attivatu.
+      signed_up_but_locked: Site arregistratu·a, mà ùn pudete micca cunnettavi perchè u vostru contu hè chjosu.
+      signed_up_but_unconfirmed: Un missaghju cù un ligame di cunfirmazione hè statu mandatu à u vostru indirizzu e-mail. Aprite stu ligame pè attivà u vostru contu. Pensate à verificà u cartulare di spam s’ellu ùn c’hè nunda.
+      update_needs_confirmation: U vostru contu hè statu messu à ghjornu mà duvemu verificà u vostru novu e-mail. Un missaghju cù un ligame di cunfirmazione hè statu mandatu. Pensate à verificà u cartulare di spam s’ellu ùn c’hè nunda.
+      updated: U vostru contu hè statu messu à ghjornu.
+    sessions:
+      already_signed_out: Scunnettatu·a.
+      signed_in: Cunnettatu·a.
+      signed_out: Scunnettatu·a.
+    unlocks:
+      send_instructions: Avete da riceve un’e-mail cù l’istruzzione pè riapre u vostru contu in qualchì minuta.
+      send_paranoid_instructions: S’ellu esiste u vostru contu, avete da riceve un’e-mail dù l’istruzzione pè riapre u vostru contu.
+      unlocked: U vostru contu hè statu riapertu, pudete cunnettavi pè cuntinuà.
+  errors:
+    messages:
+      already_confirmed: hè digià cunfirmatu, pudete pruvà à cunnettà vi
+      confirmation_period_expired: deve esse cunfirmatu nanz’à %{period}, duvete fà un’altra dumanda
+      expired: hè spiratu, duvete fà un’altra dumanda
+      not_found: ùn hè micca statu trovu
+      not_locked: ùn era micca chjosu
+      not_saved:
+        one: Un prublemu hà impeditu a cunservazione di stu (sta) %{resource}
+        other: "%{count} prublemi anu impeditu a cunservazione di stu (sta) %{resource} :"
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@ -0,0 +1,119 @@
+---
+co:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nome di l’applicazione
+        redirect_uri: URI di ridirezzione
+        scopes: Scopi
+        website: Situ di l’applicazione
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ùn pò cuntene un pezzu.
+              invalid_uri: duve esse un’URI curretta.
+              relative_uri: duve esse un’URI assoluta.
+              secured_uri: duve esse un’URL HTTPS/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Appruvà
+        cancel: Sguassà
+        destroy: Strughje
+        edit: Mudificà
+        submit: Mandà
+      confirmations:
+        destroy: Site sicuru·a?
+      edit:
+        title: Mudificà l’applicazione
+      form:
+        error: Uups! V’invitemu à verificà u vostru formulariu per vede s’elli ùn ci sò sbaglii.
+      help:
+        native_redirect_uri: Utilizate %{native_redirect_uri} pè e prove lucale
+        redirect_uri: Utilizzate una linea per ogni URI
+        scopes: Separate i scopi cù spazii. Lasciate viotu per utilizzà i scopi predefiniti.
+      index:
+        application: Applicazione
+        callback_url: URL di richjama
+        delete: Toglie
+        name: Nome
+        new: Applicazione nova
+        scopes: Scopi
+        show: Vede
+        title: E vostre applicazione
+      new:
+        title: Applicazione nova
+      show:
+        actions: Azzioni
+        application_id: Chjave di u clientu
+        callback_urls: URL di richjama
+        scopes: Scopi
+        secret: Sicretu di u clientu
+        title: 'Applicazione : %{name}'
+    authorizations:
+      buttons:
+        authorize: Appruvà
+        deny: Ricusà
+      error:
+        title: C’hè statu un prublemu
+      new:
+        able_to: St’applicazione puderà
+        prompt: Parmette %{client_name} d’utilizzà u vostru contu?
+        title: Permessu riquestu
+      show:
+        title: Codice d’auturizazione da cupià indè l’applicazione
+    authorized_applications:
+      buttons:
+        revoke: Sguassà
+      confirmations:
+        revoke: Site sicuru·a?
+      index:
+        application: Applicazione
+        created_at: Auturizata u
+        date_format: "%d-%m-%Y %H:%M:%S"
+        scopes: Scopi
+        title: E vostre applicazione auturizate
+    errors:
+      messages:
+        access_denied: U pruprietariu di a risorsa o u servore d’autitinficazione hà ricusatu a dumanda.
+        credential_flow_not_configured: U flussu di l’identificazione di u pruprietariu di a risorsa hà fiascatu perchè Doorkeeper.configure.resource_owner_from_credentials ùn hè micca cunfiguratu.
+        invalid_client: L’autintificazione di u cliente hà fiascatu perchè u cliente ùn hè micca cunnisciutu, l’identificazione di u cliente ùn hè cumpresa, o u modu d’identificazione ùn marchja micca.
+        invalid_grant: L’accunsentu d’auturizazione furnitu ùn hè currettu, hè spiratu, sguassatu, ùn và micca cù l’indirizzu di ridirezzione usatu in a dumanda d’auturizazione, o hè statu emessu per un’altru cliente.
+        invalid_redirect_uri: L’URI di ridirezzione ùn hè curretta.
+        invalid_request: Ci manca un parametru riquestu indè a dumanda, cuntene un parametru ch’ùn esiste micca, o altru sbagliu di forma.
+        invalid_resource_owner: L’idintificanti di u pruprietariu di a risorsa ùn sò curretti, o u pruprietariu ùn pò micca esse trovu.
+        invalid_scope: U scopu dumandatu ùn hè currettu, hè scunnisciutu, o altru sbagliu di forma.
+        invalid_token:
+          expired: A marca d’accessu hè spirata
+          revoked: A marca d’accessu hè stata rivucata
+          unknown: A marca d’accessu ùn hè curretta
+        resource_owner_authenticator_not_configured: Ùn c’hè micca pussutu ricercà u pruprietariu di a risorsa perchè Doorkeeper.configure.resource_owner_authenticator ùn hè micca cunfiguratu.
+        server_error: C’hè statu un prublemu cù u servore d’auturizazione.
+        temporarily_unavailable: U servore d’auturizazione ùn pò micca trattà a dumanda avà perchè hè sopraccaricatu o in mantenimentu.
+        unauthorized_client: U cliente ùn pò micca fà sta dumanda cusì.
+        unsupported_grant_type: Stu tippu d’accunsentu ùn marchja micca nant’à stu servore d’auturizazione.
+        unsupported_response_type: Sta risposta ùn marchja micca nant’à stu servore d’auturizazione.
+    flash:
+      applications:
+        create:
+          notice: Applicazione creata.
+        destroy:
+          notice: Applicazione sguassata.
+        update:
+          notice: Applicazione messa à ghjornu.
+      authorized_applications:
+        destroy:
+          notice: Applicazione sguassata.
+    layouts:
+      admin:
+        nav:
+          applications: Applicazione
+          oauth2_provider: Furnitore OAuth2
+      application:
+        title: Auturizazione OAuth riquestata.
+    scopes:
+      follow: bluccà, sbluccà, è reghje l’abbunamenti
+      read: leghje l’infurmazione di u vostru contu
+      write: mandà missaghji per voi
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@ -33,14 +33,14 @@ sk:
      help:
        native_redirect_uri: Použite %{native_redirect_uri} pre lokálne testy
        redirect_uri: Iba jedna URI na riadok
-        scopes: Rozsahy oddeľujte medzerami. Nechajte prázdne pre štandardné rozsahy.
+        scopes: Oprávnenia oddeľujte medzerami. Nechajte prázdne pre štandardné oprávnenia.
      index:
        application: Aplikácia
        callback_url: Návratová URL
        delete: Zmazať
        name: Názov
        new: Nová aplikácia
-        scopes: Rozsahy
+        scopes: Oprávnenia
        show: Ukázať
        title: Vaše aplikácie
      new:
@ -49,7 +49,7 @@ sk:
        actions: Akcie
        application_id: Kľúč klienta
        callback_urls: Návratové URL adresy
-        scopes: Rozsahy
+        scopes: Oprávnenia
        secret: Tajné slovo klienta
        title: 'Aplikácia: %{name}'
    authorizations:
@ -73,7 +73,7 @@ sk:
        application: Aplikácia
        created_at: Autorizované
        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Rozsahy
+        scopes: Oprávnenia
        title: Vaše autorizované aplikácie
    errors:
      messages:
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -1,12 +1,15 @@
 ---
 el:
  about:
+    about_hashtag_html: Αυτά είναι δημόσια τουτ σημειωμένα με <strong>#%{hashtag}</strong>. Μπορείς να αλληλεπιδράσεις με αυτά αν έχεις λογαριασμό οπουδήποτε στο fediverse.
    about_mastodon_html: Το Mastodon είναι ένα κοινωνικό δίκτυο που βασίζεται σε ανοιχτά δικτυακά πρωτόκολλα και ελεύθερο λογισμικό ανοιχτού κώδικα. Είναι αποκεντρωμένο όπως το e-mail.
    about_this: Σχετικά
    administered_by: 'Διαχειρίζεται από:'
    closed_registrations: Αυτή τη στιγμή οι εγγραφές σε αυτό τον διακομιστή είναι κλειστές. Αλλά! Μπορείς να βρεις έναν άλλο διακομιστή για να ανοίξεις λογαριασμό και να έχεις πρόσβαση από εκεί στο ίδιο ακριβώς δίκτυο.
    contact: Επικοινωνία
    contact_missing: Δεν έχει οριστεί
+    contact_unavailable: Μ/Δ
+    description_headline: Τι είναι το %{domain};
    domain_count_after: άλλοι διακομιστές
    domain_count_before: Συνδέεται με
    extended_description_html: |
@ -15,9 +18,12 @@ el:
    features:
      humane_approach_body: Μαθαίνοντας από τις αποτυχίες άλλων δικτύων, το Mastodon στοχεύει να κάνει σχεδιαστικά ηθικές επιλογές για να καταπολεμήσει την κακόβουλη χρήση των κοινωνικών δικτύων.
      humane_approach_title: Μια πιο ανθρώπινη προσέγγιση
+      not_a_product_body: Το Mastodon δεν είναι εμπορικό δίκτυο. Χωρίς διαφημίσεις, χωρίς εξόρυξη δεδομένων, χωρίς φραγμένες περιοχές. Δεν έχει κεντρική αρχή.
      not_a_product_title: Είσαι άτομο, όχι προϊόν
+      real_conversation_body: Με 500 χαρακτήρες στη διάθεσή σου και υποστήριξη για λεπτομερή έλεγχο και προειδοποιήσεις πολυμέσων, μπορείς να εκφραστείς με τον τρόπο που θέλεις.
      real_conversation_title: Φτιαγμένο για αληθινή συζήτηση
      within_reach_body: Οι πολλαπλές εφαρμογές για το iOS, το Android και τις υπόλοιπες πλατφόρμες, χάρη σε ένα φιλικό προς τους προγραμματιστές οικοσύστημα API, σου επιτρέπουν να κρατάς επαφή με τους φίλους και τις φίλες σου οπουδήποτε.
+      within_reach_title: Πάντα προσβάσιμο
    generic_description: "%{domain} είναι ένας εξυπηρετητής στο δίκτυο"
    hosted_on: Το Mastodon φιλοξενείται στο %{domain}
    learn_more: Μάθε περισσότερα
@ -26,6 +32,7 @@ el:
    status_count_after: καταστάσεις
    status_count_before: Ποιός συνέγραψε
    user_count_after: χρήστες
+    user_count_before: Σπίτι
    what_is_mastodon: Τι είναι το Mastodon;
  accounts:
    follow: Ακολούθησε
@ -38,3 +45,163 @@ el:
    people_who_follow: Χρήστες που ακολουθούν τον/την %{name}
    posts: Τουτ
    posts_with_replies: Τουτ και απαντήσεις
+    remote_follow: Απομακρυσμένη παρακολούθηση
+    reserved_username: Το όνομα χρήστη είναι κατειλημμένο
+    roles:
+      admin: Διαχειριστής
+      moderator: Μεσολαβητής
+    unfollow: Διακοπή παρακολούθησης
+  admin:
+    account_moderation_notes:
+      create: Δημιουργία
+      created_msg: Επιτυχής δημιουργία σημειώματος μεσολάβησης!
+      delete: Διαγραφή
+      destroyed_msg: Επιτυχής καταστροφή σημειώματος μεσολάβησης!
+    accounts:
+      are_you_sure: Σίγουρα;
+      avatar: Αβατάρ
+      by_domain: Τομέας
+      change_email:
+        changed_msg: Επιτυχής αλλαγή email λογαριασμού!
+        current_email: Τρέχον email
+        label: Αλλαγή email
+        new_email: Νέο email
+        submit: Αλλαγή email
+        title: Αλλαγή email για %{username}
+      confirm: Επιβεβαίωση
+      confirmed: Επιβεβαιώθηκε
+      demote: Υποβίβαση
+      disable: Απενεργοποίηση
+      disable_two_factor_authentication: Απενεργοποίηση 2FA
+      disabled: Απενεργοποιημένο
+      display_name: Όνομα εμφάνισης
+      domain: Τομέας
+      edit: Αλλαγή
+      email: Email
+      enable: Ενεργοποίηση
+      enabled: Ενεργοποιημένο
+      feed_url: URL ροής
+      followers: Ακόλουθοι
+      followers_url: URL ακολούθων
+      follows: Ακολουθεί
+      inbox_url: URL εισερχομένων
+      ip: IP
+      location:
+        all: Όλα
+        local: Τοπικά
+        remote: Απομακρυσμένα
+        title: Τοποθεσία
+      login_status: Κατάσταση εισόδου
+      media_attachments: Συνημμένα πολυμέσα
+      memorialize: Μετατροπή σε νεκρολογία
+      moderation:
+        all: Όλα
+        silenced: Αποσιωπημένα
+        suspended: Σε αναστολή
+        title: Μεσολάβηση
+      moderation_notes: Σημειώσεις μεσολάβησης
+      most_recent_activity: Πιο πρόσφατη δραστηριότητα
+      most_recent_ip: Πιο πρόσφατη IP
+      not_subscribed: Άνευ εγγραφής
+      order:
+        alphabetic: Αλφαβητικά
+        most_recent: Πιο πρόσφατα
+        title: Ταξινόμηση
+      outbox_url: URL εξερχομένων
+      perform_full_suspension: Πλήρης αναστολή
+      profile_url: URL προφίλ
+      promote: Προβίβασε
+      protocol: Πρωτόκολλο
+      public: Δημόσιο
+      push_subscription_expires: Η εγγραφή PuSH λήγει
+      redownload: Ανανέωση αβατάρ
+      remove_avatar: Απομακρυσμένο αβατάρ
+      reset: Επαναφορά
+      reset_password: Επαναφορά συνθηματικού
+      resubscribe: Επανεγγραφή
+      role: Δικαιώματα
+      roles:
+        admin: Διαχειριστής
+        moderator: Μεσολαβητής
+        staff: Προσωπικό
+        user: Χρήστης
+      salmon_url: URL Salmon
+      search: Αναζήτηση
+      shared_inbox_url: URL κοινόχρηστων εισερχομένων
+      show:
+        created_reports: Αναφορές από αυτόν το λογαριασμό
+        report: ανάφερε
+        targeted_reports: Αναφορές για αυτόν το λογαριασμό
+      silence: Αποσιώπησε
+      statuses: Καταστάσεις
+      subscribe: Εγγραφή
+      title: Λογαριασμοί
+      unconfirmed_email: Ανεπιβεβαίωτο email
+      undo_silenced: Αναίρεση αποσιώπησης
+      undo_suspension: Αναίρεση παύσης
+      unsubscribe: Κατάργηση εγγραφής
+      username: Όνομα χρήστη
+      web: Διαδίκτυο
+    action_logs:
+      actions:
+        assigned_to_self_report: Ο/Η %{name} ανάθεσε την αναφορά %{target} στον εαυτό του/της
+        change_email_user: Ο/Η %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
+        confirm_user: Ο/Η %{name} επιβεβαίωσε τη διεύθυνση email του χρήστη %{target}
+        create_custom_emoji: Ο/Η %{name} ανέβασε νέο emoji %{target}
+        create_domain_block: Ο/Η %{name} μπλόκαρε τον τομέα %{target}
+        create_email_domain_block: Ο/Η %{name} έβαλε τον τομέα email %{target} σε μαύρη λίστα
+        demote_user: Ο/Η %{name} υποβίβασε το χρήστη %{target}
+        destroy_domain_block: Ο/Η %{name} ξεμπλόκαρε τον τομέα %{target}
+        destroy_email_domain_block: Ο/Η %{name} έβαλε τον τομέα email %{target} σε λευκή λίστα
+        destroy_status: Ο/Η %{name} αφαίρεσε την κατάσταση του/της %{target}
+        disable_2fa_user: Ο/Η %{name} απενεργοποίησε την απαίτηση δύο παραγόντων για το χρήστη %{target}
+        disable_custom_emoji: Ο/Η %{name} απενεργοποίησε το emoji %{target}
+        disable_user: Ο/Η %{name} απενεργοποίησε την είσοδο για το χρήστη %{target}
+        enable_custom_emoji: Ο/Η %{name} ενεργοποίησε το emoji %{target}
+        enable_user: Ο/Η %{name} ενεργοποίησε την είσοδο του χρήστη %{target}
+        memorialize_account: Ο/Η %{name} μετέτρεψε το λογαριασμό του/της %{target} σε σελίδα νεκρολογίας
+        promote_user: Ο/Η %{name} προβίβασε το χρήστη %{target}
+        remove_avatar_user: Ο/Η %{name} αφαίρεσε το αβατάρ του/της %{target}
+        reopen_report: Ο/Η %{name} ξανάνοιξε την αναφορά %{target}
+        reset_password_user: Ο/Η %{name} επανέφερε το συνθηματικό του χρήστη %{target}
+        resolve_report: Ο/Η %{name} επέλυσε την αναφορά %{target}
+        silence_account: Ο/Η %{name} αποσιώπησε το λογαριασμό του/της %{target}
+        suspend_account: Ο/Η %{name} έπαυσε το λογαριασμό του/της %{target}
+        unassigned_report: Ο/Η %{name} αποδέσμευσε την αναφορά %{target}
+        unsilence_account: Ο/Η %{name} ήρε την αποσιώπηση του λογαριασμού του/της %{target}
+        unsuspend_account: Ο/Η %{name} ήρε την παύση του λογαριασμού του χρήστη %{target}
+        update_custom_emoji: Ο/Η %{name} ενημέρωσε το emoji %{target}
+        update_status: Ο/Η %{name} ενημέρωσε την κατάσταση του/της %{target}
+      title: Αρχείο ελέγχου
+    custom_emojis:
+      by_domain: Τομέας
+      copied_msg: Επιτυχής δημιουργία τοπικού αντίγραφου του emoji
+      copy: Αντιγραφή
+      copy_failed_msg: Αδυναμία δημιουργίας τοπικού αντίγραφου αυτού του emoji
+      created_msg: Επιτυχής δημιουργία του emoji!
+      delete: Διαγραφή
+      destroyed_msg: Επιτυχής καταστροφή του emojo!
+      disable: Απενεργοποίηση
+      disabled_msg: Επιτυχής απενεργοποίηση αυτού του emoji
+      emoji: Emoji
+      enable: Ενεργοποίηση
+      enabled_msg: Επιτυχής ενεργοποίηση αυτού του emoji
+      image_hint: PNG έως 50KB
+      listed: Αναφερθέντα
+      new:
+        title: Προσθήκη νέου προσαρμοσμένου emoji
+      overwrite: Αντικατάσταση
+      shortcode: Σύντομος κωδικός
+      shortcode_hint: Τουλάχιστον 2 χαρακτήρες, μόνο αλφαριθμητικοί και κάτω παύλες
+      title: Προσαρμοσμένα emoji
+      update_failed_msg: Αδυναμία ενημέρωσης του emoji
+      updated_msg: Επιτυχής ενημέρωση του Emoji!
+      upload: Ανέβασμα
+    domain_blocks:
+      add_new: Προσθήκη νέου
+      created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
+      destroyed_msg: Ο αποκλεισμός τομέα άρθηκε
+      domain: Τομέας
+      new:
+        create: Δημιουργία αποκλεισμού
+        hint: Ο αποκλεισμός τομέα δεν θα αποτρέψει νέες καταχωρίσεις λογαριασμών στην βάση δεδομένων, αλλά θα εφαρμόσει αναδρομικά και αυτόματα συγκεκριμένες πολιτικές μεσολάβησης σε αυτούς τους λογαριασμούς.
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -49,13 +49,12 @@ en:
    reserved_username: The username is reserved
    roles:
      admin: Admin
+      bot: Bot
      moderator: Mod
    unfollow: Unfollow
  admin:
    account_moderation_notes:
-      account: Moderator
-      create: Create
-      created_at: Date
+      create: Leave note
      created_msg: Moderation note successfully created!
      delete: Delete
      destroyed_msg: Moderation note successfully destroyed!
@ -72,6 +71,7 @@ en:
        title: Change Email for %{username}
      confirm: Confirm
      confirmed: Confirmed
+      confirming: Confirming
      demote: Demote
      disable: Disable
      disable_two_factor_authentication: Disable 2FA
@ -80,6 +80,7 @@ en:
      domain: Domain
      edit: Edit
      email: E-mail
+      email_status: E-mail Status
      enable: Enable
      enabled: Enabled
      feed_url: Feed URL
@ -118,6 +119,10 @@ en:
      push_subscription_expires: PuSH subscription expires
      redownload: Refresh avatar
      remove_avatar: Remove avatar
+      resend_confirmation:
+        already_confirmed: This user is already confirmed
+        send: Resend confirmation email
+        success: Confirmation email successfully sent!
      reset: Reset
      reset_password: Reset password
      resubscribe: Resubscribe
@ -269,7 +274,6 @@ en:
      comment:
        none: None
      created_at: Reported
-      delete: Delete
      id: ID
      mark_as_resolved: Mark as resolved
      mark_as_unresolved: Mark as unresolved
@ -279,9 +283,6 @@ en:
        create_and_unresolve: Reopen with note
        delete: Delete
        placeholder: Describe what actions have been taken, or any other updates to this report…
-      nsfw:
-        'false': Unhide media attachments
-        'true': Hide media attachments
      reopen: Reopen report
      report: 'Report #%{id}'
      report_contents: Contents
@ -356,11 +357,8 @@ en:
        delete: Delete
        nsfw_off: Mark as not sensitive
        nsfw_on: Mark as sensitive
-      execute: Execute
      failed_to_execute: Failed to execute
      media:
-        hide: Hide media
-        show: Show media
        title: Media
      no_media: No media
      title: Account statuses
@ -466,7 +464,7 @@ en:
    archive_takeout:
      date: Date
      download: Download your archive
-      hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in ActivityPub format, readable by any compliant software.
+      hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in ActivityPub format, readable by any compliant software. You can request an archive every 7 days.
      in_progress: Compiling your archive...
      request: Request your archive
      size: Size
@ -844,5 +842,6 @@ en:
  users:
    invalid_email: The e-mail address is invalid
    invalid_otp_token: Invalid two-factor code
+    otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
    signed_in_as: 'Signed in as:'
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -52,9 +52,7 @@ eo:
    unfollow: Ne plu sekvi
  admin:
    account_moderation_notes:
-      account: Kontrolanto
      create: Krei
-      created_at: Dato
      created_msg: Kontrola noto sukcese kreita!
      delete: Forigi
      destroyed_msg: Kontrola noto sukcese detruita!
@ -63,6 +61,7 @@ eo:
      by_domain: Domajno
      confirm: Konfirmi
      confirmed: Konfirmita
+      confirming: Konfirmante
      demote: Degradi
      disable: Malebligi
      disable_two_factor_authentication: Malebligi 2FA
@ -71,6 +70,7 @@ eo:
      domain: Domajno
      edit: Redakti
      email: Retpoŝto
+      email_status: Retpoŝto Stato
      enable: Ebligi
      enabled: Ebligita
      feed_url: URL de la fluo
@ -108,6 +108,10 @@ eo:
      public: Publika
      push_subscription_expires: Eksvalidiĝo de la abono al PuSH
      redownload: Aktualigi profilbildon
+      resend_confirmation:
+        already_confirmed: Ĉi tiu uzanto jam estas konfirmita
+        send: Esend konfirmi retpoŝton
+        success: Konfirma retpoŝto sukcese sendis
      reset: Restarigi
      reset_password: Restarigi pasvorton
      resubscribe: Reaboni
@ -244,12 +248,8 @@ eo:
      are_you_sure: Ĉu vi certas?
      comment:
        none: Nenio
-      delete: Forigi
      id: ID
      mark_as_resolved: Marki kiel solvita
-      nsfw:
-        'false': Malkaŝi aŭdovidajn kunsendaĵojn
-        'true': Kaŝi aŭdovidajn kunsendaĵojn
      report: 'Signalo #%{id}'
      report_contents: Enhavo
      reported_account: Signalita konto
@ -320,11 +320,8 @@ eo:
        delete: Forigi
        nsfw_off: Malŝalti NSFW
        nsfw_on: Ŝalti NSFW
-      execute: Ekigi
      failed_to_execute: Ekigo malsukcesa
      media:
-        hide: Kaŝi aŭdovidaĵojn
-        show: Montri aŭdovidaĵojn
        title: Aŭdovidaĵoj
      no_media: Neniu aŭdovidaĵo
      title: Mesaĝoj de la konto
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -53,9 +53,7 @@ es:
    unfollow: Dejar de seguir
  admin:
    account_moderation_notes:
-      account: Moderador
      create: Crear
-      created_at: Fecha
      created_msg: "¡Nota de moderación creada con éxito!"
      delete: Borrar
      destroyed_msg: "¡Nota de moderación destruida con éxito!"
@ -72,6 +70,7 @@ es:
        title: Cambiar el correo electrónico de %{username}
      confirm: Confirmar
      confirmed: Confirmado
+      confirming: Confirmando
      demote: Degradar
      disable: Deshabilitar
      disable_two_factor_authentication: Desactivar autenticación de dos factores
@ -80,6 +79,7 @@ es:
      domain: Dominio
      edit: Editar
      email: E-mail
+      email_status: E-mail Status
      enable: Habilitar
      enabled: Habilitada
      feed_url: URL de notificaciones
@ -118,6 +118,10 @@ es:
      push_subscription_expires: Expiración de la suscripción PuSH
      redownload: Refrescar avatar
      remove_avatar: Eliminar el avatar
+      resend_confirmation:
+        already_confirmed: Este usuario ya está confirmado
+        send: Reenviar el correo electrónico de confirmación
+        success: "¡Correo electrónico de confirmación enviado con éxito"
      reset: Reiniciar
      reset_password: Reiniciar contraseña
      resubscribe: Re-suscribir
@ -269,7 +273,6 @@ es:
      comment:
        none: Ninguno
      created_at: Denunciado
-      delete: Eliminar
      id: ID
      mark_as_resolved: Marcar como resuelto
      mark_as_unresolved: Marcar como no resuelto
@ -279,9 +282,6 @@ es:
        create_and_unresolve: Reabrir con una nota
        delete: Eliminar
        placeholder: Especificar qué acciones se han tomado o cualquier otra novedad respecto a esta denuncia…
-      nsfw:
-        'false': Mostrar multimedia
-        'true': Ocultar multimedia
      reopen: Reabrir denuncia
      report: 'Reportar #%{id}'
      report_contents: Contenido
@ -356,11 +356,8 @@ es:
        delete: Eliminar
        nsfw_off: Marcar contenido como no sensible
        nsfw_on: Marcar contenido como sensible
-      execute: Ejecutar
      failed_to_execute: Falló al ejecutar
      media:
-        hide: Ocultar multimedia
-        show: Mostrar multimedia
        title: Multimedia
      no_media: No hay multimedia
      title: Estado de las cuentas
@ -376,6 +373,7 @@ es:
  admin_mailer:
    new_report:
      body: "%{reporter} ha reportado a %{target}"
+      body_remote: Alguien de %{domain} a reportado a %{target}
      subject: Nuevo reporte para la %{instance} (#%{id})
  application_mailer:
    notification_preferences: Cambiar preferencias de correo electrónico
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -52,9 +52,7 @@ fa:
    unfollow: پایان پیگیری
  admin:
    account_moderation_notes:
-      account: مدیر
      create: نوشتن
-      created_at: تاریخ
      created_msg: یادداشت مدیر با موفقیت ساخته شد!
      delete: پاک کردن
      destroyed_msg: یادداشت مدیر با موفقیت پاک شد!
@ -63,6 +61,7 @@ fa:
      by_domain: دامین
      confirm: تأیید
      confirmed: تأیید شد
+      confirming: تأیید
      demote: تنزل‌دادن
      disable: غیرفعال
      disable_two_factor_authentication: غیرفعال‌سازی ورود دومرحله‌ای
@ -71,6 +70,7 @@ fa:
      domain: دامین
      edit: ویرایش
      email: ایمیل
+      email_status: وضعیت ایمیل
      enable: فعال
      enabled: فعال
      feed_url: نشانی فید
@ -108,6 +108,10 @@ fa:
      public: عمومی
      push_subscription_expires: عضویت از راه PuSH منقضی شد
      redownload: به‌روزرسانی تصویر نمایه
+      resend_confirmation:
+        already_confirmed: این کاربر قبلا تایید شده است
+        send: ایمیل تایید را دوباره بفرستید
+        success: ایمیل تایید با موفقیت ارسال شد
      reset: بازنشانی
      reset_password: بازنشانی رمز
      resubscribe: اشتراک دوباره
@ -244,12 +248,8 @@ fa:
      are_you_sure: آیا مطمئن هستید؟
      comment:
        none: خالی
-      delete: پاک‌کردن
      id: شناسه
      mark_as_resolved: علامت‌گذاری به عنوان حل‌شده
-      nsfw:
-        'false': نمایش پیوست‌های تصویری
-        'true': نهفتن پیوست‌های تصویری
      report: 'گزارش #%{id}'
      report_contents: محتوا
      reported_account: حساب گزارش‌شده
@ -308,11 +308,8 @@ fa:
        delete: پاک‌کردن
        nsfw_off: NSFW خاموش
        nsfw_on: NSFW روشن
-      execute: اجرا
      failed_to_execute: اجرا نشد
      media:
-        hide: نهفتن رسانه
-        show: نمایش رسانه
        title: رسانه
      no_media: بدون رسانه
      title: نوشته‌های حساب
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -52,9 +52,7 @@ fi:
    unfollow: Lopeta seuraaminen
  admin:
    account_moderation_notes:
-      account: Moderaattori
      create: Luo
-      created_at: Päiväys
      created_msg: Moderointimerkinnän luonti onnistui!
      delete: Poista
      destroyed_msg: Moderointimerkinnän poisto onnistui!
@ -63,6 +61,7 @@ fi:
      by_domain: Verkko-osoite
      confirm: Vahvista
      confirmed: Vahvistettu
+      confirming: Vahvistavat
      demote: Alenna
      disable: Poista käytöstä
      disable_two_factor_authentication: Poista 2FA käytöstä
@ -71,6 +70,7 @@ fi:
      domain: Verkko-osoite
      edit: Muokkaa
      email: Sähköposti
+      email_status: Sähköpostin tila
      enable: Ota käyttöön
      enabled: Käytössä
      feed_url: Syötteen URL
@ -108,6 +108,10 @@ fi:
      public: Julkinen
      push_subscription_expires: PuSH-tilaus vanhenee
      redownload: Päivitä profiilikuva
+      resend_confirmation:
+        already_confirmed: Tämä käyttäjä on jo vahvistettu
+        send: Lähetä varmistusviesti uudelleen
+        success: Vahvistusviesti lähetettiin onnistuneesti
      reset: Palauta
      reset_password: Palauta salasana
      resubscribe: Tilaa uudelleen
@ -244,12 +248,8 @@ fi:
      are_you_sure: Oletko varma?
      comment:
        none: Ei mitään
-      delete: Poista
      id: Tunniste
      mark_as_resolved: Merkitse ratkaistuksi
-      nsfw:
-        'false': Peru medialiitteiden piilotus
-        'true': Piilota medialiitteet
      report: Raportti nro %{id}
      report_contents: Sisältö
      reported_account: Raportoitu tili
@ -320,11 +320,8 @@ fi:
        delete: Poista
        nsfw_off: NSFW POIS
        nsfw_on: NSFW PÄÄLLÄ
-      execute: Suorita
      failed_to_execute: Suoritus epäonnistui
      media:
-        hide: Piilota media
-        show: Näytä media
        title: Media
      no_media: Ei mediaa
      title: Tilin tilat
--- a/Show More
+++ b/Show More