Merge pull request #856 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
2023-08-25 08:33:12 +02:00 · 2018-12-16 15:26:50 +01:00 · 2018-12-16 15:26:50 +01:00 · 396c5dea87
commit 396c5dea87
parent f0505a5b2e 7238e4ea5f
143 changed files with 1241 additions and 404 deletions
--- a/8
+++ b/8
@ -15,7 +15,7 @@ gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.2'
 gem 'dotenv-rails', '~> 2.5'

-gem 'aws-sdk-s3', '~> 1.27', require: false
+gem 'aws-sdk-s3', '~> 1.30', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
@ -70,7 +70,7 @@ gem 'rack-attack', '~> 5.4'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 5.1'
 gem 'rails-settings-cached', '~> 0.6'
-gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'redis', '~> 4.1', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 0.10'
 gem 'sanitize', '~> 5.0'
@ -91,7 +91,7 @@ gem 'webpacker', '~> 3.5'
 gem 'webpush'

 gem 'json-ld', '~> 2.2'
-gem 'json-ld-preloaded', '~> 2.2'
+gem 'json-ld-preloaded', '~> 3.0'
 gem 'rdf-normalize', '~> 0.3'

 group :development, :test do
@ -125,7 +125,7 @@ group :development do
  gem 'better_errors', '~> 2.5'
  gem 'binding_of_caller', '~> 0.7'
  gem 'bullet', '~> 5.9'
-  gem 'letter_opener', '~> 1.4'
+  gem 'letter_opener', '~> 1.7'
  gem 'letter_opener_web', '~> 1.3'
  gem 'memory_profiler'
  gem 'rubocop', '~> 0.61', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -76,8 +76,8 @@ GEM
    av (0.9.0)
      cocaine (~> 0.5.3)
    aws-eventstream (1.0.1)
-    aws-partitions (1.118.0)
-    aws-sdk-core (3.41.0)
+    aws-partitions (1.122.0)
+    aws-sdk-core (3.43.0)
      aws-eventstream (~> 1.0)
      aws-partitions (~> 1.0)
      aws-sigv4 (~> 1.0)
@ -85,7 +85,7 @@ GEM
    aws-sdk-kms (1.13.0)
      aws-sdk-core (~> 3, >= 3.39.0)
      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.27.0)
+    aws-sdk-s3 (1.30.0)
      aws-sdk-core (~> 3, >= 3.39.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.0)
@ -292,10 +292,10 @@ GEM
    json-ld (2.2.1)
      multi_json (~> 1.12)
      rdf (>= 2.2.8, < 4.0)
-    json-ld-preloaded (2.2.3)
+    json-ld-preloaded (3.0.0)
      json-ld (>= 2.2, < 4.0)
      multi_json (~> 1.12)
-      rdf (>= 2.2, < 4.0)
+      rdf (~> 3.0)
    jsonapi-renderer (0.2.0)
    jwt (2.1.0)
    kaminari (1.1.1)
@ -312,7 +312,7 @@ GEM
    kaminari-core (1.1.1)
    launchy (2.4.3)
      addressable (~> 2.3)
-    letter_opener (1.6.0)
+    letter_opener (1.7.0)
      launchy (~> 2.2)
    letter_opener_web (1.3.4)
      actionmailer (>= 3.2)
@ -473,12 +473,12 @@ GEM
    rb-fsevent (0.10.3)
    rb-inotify (0.9.10)
      ffi (>= 0.5.0, < 2)
-    rdf (3.0.2)
+    rdf (3.0.7)
      hamster (~> 3.0)
      link_header (~> 0.0, >= 0.0.8)
    rdf-normalize (0.3.3)
      rdf (>= 2.2, < 4.0)
-    redis (4.0.3)
+    redis (4.1.0)
    redis-actionpack (5.0.2)
      actionpack (>= 4.0, < 6)
      redis-rack (>= 1, < 3)
@ -657,7 +657,7 @@ DEPENDENCIES
  active_record_query_trace (~> 1.5)
  addressable (~> 2.5)
  annotate (~> 2.7)
-  aws-sdk-s3 (~> 1.27)
+  aws-sdk-s3 (~> 1.30)
  better_errors (~> 2.5)
  binding_of_caller (~> 0.7)
  bootsnap (~> 1.3)
@ -700,9 +700,9 @@ DEPENDENCIES
  idn-ruby
  iso-639
  json-ld (~> 2.2)
-  json-ld-preloaded (~> 2.2)
+  json-ld-preloaded (~> 3.0)
  kaminari (~> 1.1)
-  letter_opener (~> 1.4)
+  letter_opener (~> 1.7)
  letter_opener_web (~> 1.3)
  link_header (~> 0.0)
  lograge (~> 0.10)
@ -740,7 +740,7 @@ DEPENDENCIES
  rails-i18n (~> 5.1)
  rails-settings-cached (~> 0.6)
  rdf-normalize (~> 0.3)
-  redis (~> 4.0)
+  redis (~> 4.1)
  redis-namespace (~> 1.5)
  redis-rails (~> 5.0)
  rqrcode (~> 0.10)
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@ -31,7 +31,7 @@ class ActivityPub::CollectionsController < Api::BaseController
    when 'featured'
      @account.pinned_statuses.count
    else
-      raise ActiveRecord::NotFound
+      raise ActiveRecord::RecordNotFound
    end
  end

@ -42,7 +42,7 @@ class ActivityPub::CollectionsController < Api::BaseController
        scope.merge!(@account.pinned_statuses)
      end
    else
-      raise ActiveRecord::NotFound
+      raise ActiveRecord::RecordNotFound
    end
  end

--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@ -2,7 +2,7 @@

 module Admin
  class AccountsController < BaseController
-    before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :enable, :disable, :memorialize]
+    before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :disable, :memorialize]
    before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
    before_action :require_local_account!, only: [:enable, :disable, :memorialize]

@ -71,6 +71,17 @@ module Admin
      redirect_to admin_account_path(@account.id)
    end

+    def remove_header
+      authorize @account, :remove_header?
+
+      @account.header = nil
+      @account.save!
+
+      log_action :remove_header, @account.user
+
+      redirect_to admin_account_path(@account.id)
+    end
+
    private

    def set_account
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@ -28,6 +28,7 @@ module Admin
      @pam_enabled           = ENV['PAM_ENABLED'] == 'true'
      @hidden_service        = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
      @trending_hashtags     = TrendingTags.get(7)
+      @profile_directory     = Setting.profile_directory
    end

    private
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@ -28,6 +28,7 @@ module Admin
      show_known_fediverse_at_about_page
      preview_sensitive_media
      custom_css
+      profile_directory
    ).freeze

    BOOLEAN_SETTINGS = %w(
@ -39,6 +40,7 @@ module Admin
      peers_api_enabled
      show_known_fediverse_at_about_page
      preview_sensitive_media
+      profile_directory
    ).freeze

    UPLOAD_SETTINGS = %w(
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@ -18,7 +18,7 @@ module Admin

    def unhide
      authorize @tag, :unhide?
-      @tag.account_tag_stat.update!(hidden: true)
+      @tag.account_tag_stat.update!(hidden: false)
      redirect_to admin_tags_path(@filter_params)
    end

--- a/app/controllers/concerns/remote_account_controller_concern.rb
+++ b/app/controllers/concerns/remote_account_controller_concern.rb
@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module RemoteAccountControllerConcern
-  extend ActiveSupport::Concern
-
-  included do
-    layout 'public'
-    before_action :set_account
-    before_action :check_account_suspension
-  end
-
-  private
-
-  def set_account
-    @account = Account.find_remote!(params[:acct])
-  end
-
-  def check_account_suspension
-    gone if @account.suspended?
-  end
-end
--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@ -3,6 +3,7 @@
 class DirectoriesController < ApplicationController
  layout 'public'

+  before_action :check_enabled
  before_action :set_instance_presenter
  before_action :set_tag, only: :show
  before_action :set_tags
@ -23,6 +24,10 @@ class DirectoriesController < ApplicationController
    use_pack 'share'
  end

+  def check_enabled
+    return not_found unless Setting.profile_directory
+  end
+
  def set_tag
    @tag = Tag.discoverable.find_by!(name: params[:id].downcase)
  end
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@ -1,7 +1,6 @@
 # frozen_string_literal: true

 class Settings::ApplicationsController < Settings::BaseController
-
  before_action :set_application, only: [:show, :update, :destroy, :regenerate]
  before_action :prepare_scopes, only: [:create, :update]

--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@ -3,7 +3,6 @@
 #  Intentionally does not inherit from BaseController
 class Settings::SessionsController < ApplicationController
  before_action :set_session, only: :destroy
-  before_action :set_body_classes

  def destroy
    @session.destroy!
@ -16,8 +15,4 @@ class Settings::SessionsController < ApplicationController
  def set_session
    @session = current_user.session_activations.find(params[:id])
  end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@ -92,7 +92,7 @@ module Admin::ActionLogsHelper
      opposite_verbs?(log) ? 'negative' : 'positive'
    when :update, :reset_password, :disable_2fa, :memorialize, :change_email
      'neutral'
-    when :demote, :silence, :disable, :suspend, :remove_avatar, :reopen
+    when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen
      'negative'
    when :destroy
      opposite_verbs?(log) ? 'positive' : 'negative'
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@ -23,7 +23,7 @@ module HomeHelper
                  else
                    link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do
                      content_tag(:div, class: 'account__avatar-wrapper') do
-                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{account.avatar.url})")
+                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)})")
                      end +
                        content_tag(:span, class: 'display-name') do
                          content_tag(:bdi) do
--- a/app/javascript/flavours/glitch/features/account/components/header.js
+++ b/app/javascript/flavours/glitch/features/account/components/header.js
@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import Avatar from 'flavours/glitch/components/avatar';
 import IconButton from 'flavours/glitch/components/icon_button';

-import { me } from 'flavours/glitch/util/initial_state';
+import { autoPlayGif, me } from 'flavours/glitch/util/initial_state';
 import classNames from 'classnames';

 const messages = defineMessages({
@ -108,7 +108,7 @@ export default class Header extends ImmutablePureComponent {

    return (
      <div className='account__header__wrapper'>
-        <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}>
+        <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${autoPlayGif ? account.get('header') : account.get('header_static')})` }}>
          <div>
            <a
              href={account.get('url')}
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@ -420,6 +420,7 @@ code {
    border: 1px solid darken($ui-base-color, 14%);
    border-radius: 4px;
    padding: 10px;
+    padding-right: 30px;
    height: 41px;
  }

--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -144,7 +144,11 @@ export function submitCompose(routerHistory) {

      if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
        routerHistory.push('/timelines/direct');
-      } else if (response.data.visibility !== 'direct') {
+      } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
+        routerHistory.goBack();
+      }
+
+      if (response.data.visibility !== 'direct') {
        insertIfOnline('home');
      }

--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@ -74,12 +74,14 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
      params.since_id = timeline.getIn(['items', 0]);
    }

+    const isLoadingRecent = !!params.since_id;
+
    dispatch(expandTimelineRequest(timelineId, isLoadingMore));

    api(getState).get(path, { params }).then(response => {
      const next = getLinks(response).refs.find(link => link.rel === 'next');
      dispatch(importFetchedStatuses(response.data));
-      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingMore));
+      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingRecent, isLoadingMore));
      done();
    }).catch(error => {
      dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
@ -112,13 +114,14 @@ export function expandTimelineRequest(timeline, isLoadingMore) {
  };
 };

-export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingMore) {
+export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingRecent, isLoadingMore) {
  return {
    type: TIMELINE_EXPAND_SUCCESS,
    timeline,
    statuses,
    next,
    partial,
+    isLoadingRecent,
    skipLoading: !isLoadingMore,
  };
 };
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@ -30,7 +30,6 @@ export default class ScrollableList extends PureComponent {
    hasMore: PropTypes.bool,
    prepend: PropTypes.node,
    alwaysPrepend: PropTypes.bool,
-    alwaysShowScrollbar: PropTypes.bool,
    emptyMessage: PropTypes.node,
    children: PropTypes.node,
  };
@ -206,11 +205,11 @@ export default class ScrollableList extends PureComponent {
  }

  render () {
-    const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, alwaysPrepend, alwaysShowScrollbar, emptyMessage, onLoadMore } = this.props;
+    const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
    const { fullscreen } = this.state;
    const childrenCount = React.Children.count(children);

-    const loadMore     = (hasMore && childrenCount > 0 && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null;
+    const loadMore     = (hasMore && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null;
    let scrollableArea = null;

    if (showLoading) {
@ -225,7 +224,7 @@ export default class ScrollableList extends PureComponent {
          </div>
        </div>
      );
-    } else if (isLoading || childrenCount > 0 || !emptyMessage) {
+    } else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) {
      scrollableArea = (
        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseMove={this.handleMouseMove}>
          <div role='feed' className='item-list'>
@ -249,10 +248,8 @@ export default class ScrollableList extends PureComponent {
        </div>
      );
    } else {
-      const scrollable = alwaysShowScrollbar;
-
      scrollableArea = (
-        <div className={classNames({ scrollable, fullscreen })} ref={this.setRef} style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
+        <div className={classNames('scrollable scrollable--flex', { fullscreen })} ref={this.setRef}>
          {alwaysPrepend && prepend}

          <div className='empty-column-indicator'>
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@ -55,7 +55,7 @@ export default class StatusList extends ImmutablePureComponent {
  }

  handleLoadOlder = debounce(() => {
-    this.props.onLoadMore(this.props.statusIds.last());
+    this.props.onLoadMore(this.props.statusIds.size > 0 ? this.props.statusIds.last() : undefined);
  }, 300, { leading: true })

  _selectChild (index) {
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -158,7 +158,7 @@ class Header extends ImmutablePureComponent {
    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')})` }}>
+      <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${autoPlayGif ? account.get('header') : account.get('header_static')})` }}>
        <div>
          <Avatar account={account} />

--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@ -36,7 +36,7 @@ class LoadMoreMedia extends ImmutablePureComponent {
    return (
      <LoadMore
        disabled={this.props.disabled}
-        onLoadMore={this.handleLoadMore}
+        onClick={this.handleLoadMore}
      />
    );
  }
@ -68,7 +68,7 @@ class AccountGallery extends ImmutablePureComponent {

  handleScrollToBottom = () => {
    if (this.props.hasMore) {
-      this.handleLoadMore(this.props.medias.last().getIn(['status', 'id']));
+      this.handleLoadMore(this.props.medias.size > 0 ? this.props.medias.last().getIn(['status', 'id']) : undefined);
    }
  }

@ -103,8 +103,8 @@ class AccountGallery extends ImmutablePureComponent {
      );
    }

-    if (!isLoading && medias.size > 0 && hasMore) {
-      loadOlder = <LoadMore onClick={this.handleLoadOlder} />;
+    if (hasMore) {
+      loadOlder = <LoadMore visible={!isLoading} onClick={this.handleLoadOlder} />;
    }

    return (
@ -112,14 +112,15 @@ class AccountGallery extends ImmutablePureComponent {
        <ColumnBackButton />

        <ScrollContainer scrollKey='account_gallery' shouldUpdateScroll={shouldUpdateScroll}>
-          <div className='scrollable' onScroll={this.handleScroll}>
+          <div className='scrollable scrollable--flex' onScroll={this.handleScroll}>
            <HeaderContainer accountId={this.props.params.accountId} />

-            <div className='account-gallery__container'>
+            <div role='feed' className='account-gallery__container'>
              {medias.map((media, index) => media === null ? (
                <LoadMoreMedia
                  key={'more:' + medias.getIn(index + 1, 'id')}
                  maxId={index > 0 ? medias.getIn(index - 1, 'id') : null}
+                  onLoadMore={this.handleLoadMore}
                />
              ) : (
                <MediaItem
@ -129,6 +130,12 @@ class AccountGallery extends ImmutablePureComponent {
              ))}
              {loadOlder}
            </div>
+
+            {isLoading && medias.size === 0 && (
+              <div className='scrollable__append'>
+                <LoadingIndicator />
+              </div>
+            )}
          </div>
        </ScrollContainer>
      </Column>
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@ -73,7 +73,6 @@ class Followers extends ImmutablePureComponent {
          shouldUpdateScroll={shouldUpdateScroll}
          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
          alwaysPrepend
-          alwaysShowScrollbar
          emptyMessage={emptyMessage}
        >
          {accountIds.map(id =>
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@ -73,7 +73,6 @@ class Following extends ImmutablePureComponent {
          shouldUpdateScroll={shouldUpdateScroll}
          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
          alwaysPrepend
-          alwaysShowScrollbar
          emptyMessage={emptyMessage}
        >
          {accountIds.map(id =>
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "اضافو أو حذف مِن القوائم",
  "account.badges.bot": "روبوت",
  "account.block": "حظر @{name}",
  "account.block_domain": "إخفاء كل شيئ قادم من إسم النطاق {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "يتابعك",
  "account.hide_reblogs": "إخفاء ترقيات @{name}",
  "account.link_verified_on": "تم التحقق مِن مالك هذا الرابط بتاريخ {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "وسائط",
  "account.mention": "أُذكُر @{name}",
  "account.moved_to": "{name} إنتقل إلى :",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "نتائج البحث",
  "emoji_button.symbols": "رموز",
  "emoji_button.travel": "أماكن و أسفار",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "ليس هناك تبويقات!",
  "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
  "empty_column.community": "الخط الزمني المحلي فارغ. أكتب شيئا ما للعامة كبداية !",
  "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.",
  "getting_started.security": "الأمان",
  "getting_started.terms": "شروط الخدمة",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "و {additional}",
+  "hashtag.column_header.tag_mode.any": "أو {additional}",
+  "hashtag.column_header.tag_mode.none": "بدون {additional}",
+  "hashtag.column_settings.tag_mode.all": "كلها",
+  "hashtag.column_settings.tag_mode.any": "أي كان مِن هذه",
+  "hashtag.column_settings.tag_mode.none": "لا شيء مِن هذه",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "أساسية",
  "home.column_settings.show_reblogs": "عرض الترقيات",
@ -321,7 +322,7 @@
  "status.show_less_all": "طي الكل",
  "status.show_more": "أظهر المزيد",
  "status.show_more_all": "توسيع الكل",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "الكشف عن المحادثة",
  "status.unmute_conversation": "فك الكتم عن المحادثة",
  "status.unpin": "فك التدبيس من الملف الشخصي",
  "suggestions.dismiss": "إلغاء الإقتراح",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -17,6 +17,7 @@
  "account.follows_you": "Síguete",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mentar a @{name}",
  "account.moved_to": "{name} has moved to:",
@ -208,7 +209,7 @@
  "navigation_bar.follow_requests": "Solicitúes de siguimientu",
  "navigation_bar.info": "Tocante a esta instancia",
  "navigation_bar.keyboard_shortcuts": "Atayos",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.lists": "Llistes",
  "navigation_bar.logout": "Zarrar sesión",
  "navigation_bar.mutes": "Usuarios silenciaos",
  "navigation_bar.personal": "Personal",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -17,6 +17,7 @@
  "account.follows_you": "Твой последовател",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Споменаване",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
  "account.badges.bot": "Bot",
  "account.block": "Bloca @{name}",
  "account.block_domain": "Amaga-ho tot de {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Et segueix",
  "account.hide_reblogs": "Amaga els impulsos de @{name}",
  "account.link_verified_on": "La propietat d'aquest enllaç es va verificar el dia {date}",
+  "account.locked_info": "Aquest estat de privadesa del compte està definit com a bloquejat. El propietari revisa manualment qui pot seguir-lo.",
  "account.media": "Media",
  "account.mention": "Esmentar @{name}",
  "account.moved_to": "{name} s'ha mogut a:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Resultats de la cerca",
  "emoji_button.symbols": "Símbols",
  "emoji_button.travel": "Viatges i Llocs",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "No hi ha toots aquí!",
  "empty_column.blocks": "Encara no has bloquejat cap usuari.",
  "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per fer rodar la pilota!",
  "empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir o informar de problemes a GitHub a {github}.",
  "getting_started.security": "Seguretat",
  "getting_started.terms": "Termes del servei",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "i {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sense {additional}",
+  "hashtag.column_settings.tag_mode.all": "Tots aquests",
+  "hashtag.column_settings.tag_mode.any": "Qualsevol d’aquests",
+  "hashtag.column_settings.tag_mode.none": "Cap d’aquests",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Bàsic",
  "home.column_settings.show_reblogs": "Mostrar impulsos",
@ -321,11 +322,11 @@
  "status.show_less_all": "Mostra menys per a tot",
  "status.show_more": "Mostra més",
  "status.show_more_all": "Mostra més per a tot",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Mostra el fil",
  "status.unmute_conversation": "Activar conversació",
  "status.unpin": "Deslliga del perfil",
  "suggestions.dismiss": "Descartar suggeriment",
-  "suggestions.header": "És possible que t’interessi…",
+  "suggestions.header": "És possible que estiguis interessat en…",
  "tabs_bar.federated_timeline": "Federada",
  "tabs_bar.home": "Inici",
  "tabs_bar.local_timeline": "Local",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Aghjustà o toglie da e liste",
  "account.badges.bot": "Bot",
  "account.block": "Bluccà @{name}",
  "account.block_domain": "Piattà tuttu da {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Vi seguita",
  "account.hide_reblogs": "Piattà spartere da @{name}",
  "account.link_verified_on": "A prupietà di stu ligame hè stata verificata u {date}",
+  "account.locked_info": "U statutu di vita privata di u contu hè chjosu. U pruprietariu esamina manualmente e dumande d'abbunamentu.",
  "account.media": "Media",
  "account.mention": "Mintuvà @{name}",
  "account.moved_to": "{name} hè partutu nant'à:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Risultati di a cerca",
  "emoji_button.symbols": "Simbuli",
  "emoji_button.travel": "Lochi è Viaghju",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Nisun statutu quì!",
  "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
  "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ì.",
@ -138,12 +139,12 @@
  "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.security": "Sicurità",
  "getting_started.terms": "Cundizione di u serviziu",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "è {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "senza {additional}",
+  "hashtag.column_settings.tag_mode.all": "Tutti quessi",
+  "hashtag.column_settings.tag_mode.any": "Unu di quessi",
+  "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Bàsichi",
  "home.column_settings.show_reblogs": "Vede e spartere",
@ -321,7 +322,7 @@
  "status.show_less_all": "Ripiegà tuttu",
  "status.show_more": "Slibrà",
  "status.show_more_all": "Slibrà tuttu",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Vede u filu",
  "status.unmute_conversation": "Ùn piattà più a cunversazione",
  "status.unpin": "Spuntarulà da u prufile",
  "suggestions.dismiss": "Righjittà a pruposta",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
  "account.badges.bot": "Robot",
  "account.block": "Zablokovat uživatele @{name}",
  "account.block_domain": "Skrýt vše z {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Sleduje vás",
  "account.hide_reblogs": "Skrýt boosty od uživatele @{name}",
  "account.link_verified_on": "Vlastnictví tohoto odkazu bylo zkontrolováno {date}",
+  "account.locked_info": "Stav soukromí tohoto účtu je nastaven na zamčeno. Jeho vlastník ručně posuzuje, kdo ho může sledovat.",
  "account.media": "Média",
  "account.mention": "Zmínit uživatele @{name}",
  "account.moved_to": "{name} se přesunul/a na:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Výsledky hledání",
  "emoji_button.symbols": "Symboly",
  "emoji_button.travel": "Cestování a místa",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Tady nejsou žádné tooty!",
  "empty_column.blocks": "Ještě jste nezablokoval/a žádného uživatele.",
  "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!",
  "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
@ -138,13 +139,13 @@
  "getting_started.open_source_notice": "Mastodon je otevřený software. Na GitHubu k němu můžete přispět nebo nahlásit chyby: {github}.",
  "getting_started.security": "Zabezpečení",
  "getting_started.terms": "Podmínky používání",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_header.tag_mode.all": "a {additional}",
+  "hashtag.column_header.tag_mode.any": "nebo {additional}",
+  "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "hashtag.column_settings.tag_mode.all": "Všechny z těchto",
+  "hashtag.column_settings.tag_mode.any": "Jakékoliv z těchto",
+  "hashtag.column_settings.tag_mode.none": "Žádné z těchto",
+  "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci dodatečné hashtagy",
  "home.column_settings.basic": "Základní",
  "home.column_settings.show_reblogs": "Zobrazit boosty",
  "home.column_settings.show_replies": "Zobrazit odpovědi",
@ -173,7 +174,7 @@
  "keyboard_shortcuts.profile": "k otevření autorova profilu",
  "keyboard_shortcuts.reply": "k odpovězení",
  "keyboard_shortcuts.requests": "k otevření seznamu požadavků o sledování",
-  "keyboard_shortcuts.search": "k zaměření na vyhledávání",
+  "keyboard_shortcuts.search": "k zaměření na hledání",
  "keyboard_shortcuts.start": "k otevření sloupce „začínáme“",
  "keyboard_shortcuts.toggle_hidden": "k zobrazení/skrytí textu za varováním o obsahu",
  "keyboard_shortcuts.toot": "k napsání úplně nového tootu",
@ -188,7 +189,7 @@
  "lists.edit": "Upravit seznam",
  "lists.new.create": "Přidat seznam",
  "lists.new.title_placeholder": "Název nového seznamu",
-  "lists.search": "Hledejte mezi uživateli, které sledujete",
+  "lists.search": "Hledejte mezi lidmi, které sledujete",
  "lists.subheading": "Vaše seznamy",
  "loading_indicator.label": "Načítám...",
  "media_gallery.toggle_visible": "Přepínat viditelnost",
@ -276,7 +277,7 @@
  "report.submit": "Odeslat",
  "report.target": "Nahlásit {target}",
  "search.placeholder": "Hledat",
-  "search_popout.search_format": "Pokročilé vyhledávání",
+  "search_popout.search_format": "Pokročilé hledání",
  "search_popout.tips.full_text": "Jednoduchý textový výpis příspěvků, které jste napsal/a, oblíbil/a si, boostnul/a, nebo v nich byl/a zmíněn/a, včetně odpovídajících přezdívek, zobrazovaných jmen a hashtagů.",
  "search_popout.tips.hashtag": "hashtag",
  "search_popout.tips.status": "příspěvek",
@ -321,7 +322,7 @@
  "status.show_less_all": "Zobrazit méně pro všechny",
  "status.show_more": "Zobrazit více",
  "status.show_more_all": "Zobrazit více pro všechny",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Zobrazit vlákno",
  "status.unmute_conversation": "Přestat ignorovat konverzaci",
  "status.unpin": "Odepnout z profilu",
  "suggestions.dismiss": "Odmítnout návrh",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -17,6 +17,7 @@
  "account.follows_you": "Yn eich dilyn chi",
  "account.hide_reblogs": "Cuddio bwstiau o @{name}",
  "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Cyfryngau",
  "account.mention": "Crybwyll @{name}",
  "account.moved_to": "Mae @{name} wedi symud i:",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
  "account.badges.bot": "Robot",
  "account.block": "Bloker @{name}",
  "account.block_domain": "Skjul alt fra {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Følger dig",
  "account.hide_reblogs": "Skjul fremhævelserne fra @{name}",
  "account.link_verified_on": "Ejerskabet af dette link blev tjekket den %{date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Medie",
  "account.mention": "Nævn @{name}",
  "account.moved_to": "{name} er flyttet til:",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -1,10 +1,10 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
  "account.badges.bot": "Bot",
  "account.block": "@{name} blockieren",
  "account.block_domain": "Alles von {domain} verstecken",
  "account.blocked": "Blockiert",
-  "account.direct": "Direct Message @{name}",
+  "account.direct": "Direktnachricht an @{name}",
  "account.disclaimer_full": "Das Profil wird möglicherweise unvollständig wiedergegeben.",
  "account.domain_blocked": "Domain versteckt",
  "account.edit_profile": "Profil bearbeiten",
@ -17,6 +17,7 @@
  "account.follows_you": "Folgt dir",
  "account.hide_reblogs": "Geteilte Beiträge von @{name} verbergen",
  "account.link_verified_on": "Besitz dieses Links wurde geprüft am {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Medien",
  "account.mention": "@{name} erwähnen",
  "account.moved_to": "{name} ist umgezogen auf:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Suchergebnisse",
  "emoji_button.symbols": "Symbole",
  "emoji_button.travel": "Reisen und Orte",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Keine Beiträge!",
  "empty_column.blocks": "Du hast keine Profile blockiert.",
  "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
  "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.",
  "getting_started.security": "Sicherheit",
  "getting_started.terms": "Nutzungsbedingungen",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "und {additional}",
+  "hashtag.column_header.tag_mode.any": "oder {additional}",
+  "hashtag.column_header.tag_mode.none": "ohne {additional}",
+  "hashtag.column_settings.tag_mode.all": "All diese",
+  "hashtag.column_settings.tag_mode.any": "Eine von diesen",
+  "hashtag.column_settings.tag_mode.none": "Keine von diesen",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Einfach",
  "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
@ -321,11 +322,11 @@
  "status.show_less_all": "Zeige weniger für alles",
  "status.show_more": "Mehr anzeigen",
  "status.show_more_all": "Zeige mehr für alles",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Zeige Thread",
  "status.unmute_conversation": "Stummschaltung von Thread aufheben",
  "status.unpin": "Vom Profil lösen",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Hinweis ausblenden",
+  "suggestions.header": "Du bist vielleicht interessiert in…",
  "tabs_bar.federated_timeline": "Föderation",
  "tabs_bar.home": "Startseite",
  "tabs_bar.local_timeline": "Lokal",
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -643,6 +643,10 @@
        "defaultMessage": "Ownership of this link was checked on {date}",
        "id": "account.link_verified_on"
      },
+      {
+        "defaultMessage": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+        "id": "account.locked_info"
+      },
      {
        "defaultMessage": "Follows you",
        "id": "account.follows_you"
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Προσθήκη ή αφαίρεση από λίστες",
  "account.badges.bot": "Μποτ",
  "account.block": "Απόκλεισε τον/την @{name}",
  "account.block_domain": "Απόκρυψε τα πάντα από το {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Σε ακολουθεί",
  "account.hide_reblogs": "Απόκρυψη προωθήσεων από @{name}",
  "account.link_verified_on": "Η ιδιοκτησία αυτού του συνδέσμου εκλέχθηκε την {date}",
+  "account.locked_info": "Η κατάσταση απορρήτου αυτού του λογαριασμού είναι κλειδωμένη. Ο ιδιοκτήτης επιβεβαιώνει χειροκίνητα ποιος μπορεί να τον ακολουθήσει.",
  "account.media": "Πολυμέσα",
  "account.mention": "Ανάφερε @{name}",
  "account.moved_to": "{name} μεταφέρθηκε στο:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
  "emoji_button.symbols": "Σύμβολα",
  "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Δεν έχει τουτ εδώ!",
  "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
  "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
  "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
  "getting_started.security": "Ασφάλεια",
  "getting_started.terms": "Όροι χρήσης",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "και {additional}",
+  "hashtag.column_header.tag_mode.any": "ή {additional}",
+  "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
+  "hashtag.column_settings.tag_mode.all": "Όλα αυτα",
+  "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
+  "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Βασικά",
  "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
@ -233,7 +234,7 @@
  "notifications.group": "{count} ειδοποιήσεις",
  "onboarding.done": "Όλα έτοιμα",
  "onboarding.next": "Επόμενο",
-  "onboarding.page_five.public_timelines": "Η τοπική ροή δείχνει τις δημόσιες δημοσιεύσεις από όσους εδρεύουν στον κόμβο {domain}. Η ομοσπονδιακή ροή δείχνει τις δημόσιες δημοσιεύσεις εκείνων που οι χρήστες του {domain} ακολουθούν. Αυτές οι είναι Δημόσιες Ροές, ένας ωραίος τρόπος να ανακαλύψεις καινούριους ανθρώπους.",
+  "onboarding.page_five.public_timelines": "Η τοπική ροή δείχνει τις δημόσιες δημοσιεύσεις από όσους εδρεύουν στον κόμβο {domain}. Η ομοσπονδιακή ροή δείχνει τις δημόσιες δημοσιεύσεις εκείνων που οι χρήστες του {domain} ακολουθούν. Αυτές είναι οι Δημόσιες Ροές, ένας ωραίος τρόπος να ανακαλύψεις καινούριους ανθρώπους.",
  "onboarding.page_four.home": "Η αρχική ροή δείχνει καταστάσεις από ανθρώπους που ακολουθείς.",
  "onboarding.page_four.notifications": "Η στήλη ειδοποιήσεων δείχνει πότε κάποιος αλληλεπιδράει μαζί σου.",
  "onboarding.page_one.federation": "Το Mastodon είναι ένα δίκτυο ανεξάρτητων εξυπηρετητών (servers) που συνεργάζονται δημιουργώντας ένα μεγαλύτερο κοινωνικό δίκτυο. Τους εξυπηρετητές αυτούς τους λέμε κόμβους.",
@ -321,11 +322,11 @@
  "status.show_less_all": "Δείξε λιγότερα για όλα",
  "status.show_more": "Δείξε περισσότερα",
  "status.show_more_all": "Δείξε περισσότερα για όλα",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Εμφάνιση νήματος",
  "status.unmute_conversation": "Διέκοψε την αποσιώπηση της συζήτησης",
  "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Απόρριψη πρότασης",
+  "suggestions.header": "Ίσως να ενδιαφέρεσαι για…",
  "tabs_bar.federated_timeline": "Ομοσπονδιακή",
  "tabs_bar.home": "Αρχική",
  "tabs_bar.local_timeline": "Τοπικά",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
  "account.badges.bot": "Roboto",
  "account.block": "Bloki @{name}",
  "account.block_domain": "Kaŝi ĉion de {domain}",
@ -11,12 +11,13 @@
  "account.endorse": "Montri en profilo",
  "account.follow": "Sekvi",
  "account.followers": "Sekvantoj",
-  "account.followers.empty": "No one follows this user yet.",
+  "account.followers.empty": "Neniu ankoraŭ sekvas ĉi tiun uzanton.",
  "account.follows": "Sekvatoj",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows.empty": "Ĉi tiu uzanto ne ankoraŭ sekvas iun.",
  "account.follows_you": "Sekvas vin",
  "account.hide_reblogs": "Kaŝi diskonigojn de @{name}",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.link_verified_on": "Proprieto de ĉi tiu ligilo estis kontrolita je {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Aŭdovidaĵoj",
  "account.mention": "Mencii @{name}",
  "account.moved_to": "{name} moviĝis al:",
@ -91,9 +92,9 @@
  "confirmations.mute.confirm": "Silentigi",
  "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
  "confirmations.redraft.confirm": "Forigi kaj reskribi",
-  "confirmations.redraft.message": "Ĉu vi certas, ke vi volas forigi tiun mesaĝon kaj reskribi ĝin? Vi perdos ĉiujn respondojn, diskonigojn kaj stelumojn ligitajn al ĝi.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun mesaĝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos orfigitaj.",
+  "confirmations.reply.confirm": "Respondi",
+  "confirmations.reply.message": "Respondi nun anstataŭigos la mesaĝon ke vi aktuale skribas. Ĉu vi certas ke vi volas daŭrigi?",
  "confirmations.unfollow.confirm": "Ne plu sekvi",
  "confirmations.unfollow.message": "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?",
  "embed.instructions": "Enkorpigu ĉi tiun mesaĝon en vian retejon per kopio de la suba kodo.",
@ -112,20 +113,20 @@
  "emoji_button.search_results": "Serĉaj rezultoj",
  "emoji_button.symbols": "Simboloj",
  "emoji_button.travel": "Vojaĝoj kaj lokoj",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.account_timeline": "Neniu mesaĝo ĉi tie!",
+  "empty_column.blocks": "Vi ne ankoraŭ blokis iun uzanton.",
  "empty_column.community": "La loka tempolinio estas malplena. Skribu ion por plenigi ĝin!",
  "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.domain_blocks": "Ankoraŭ estas neniu domajno blokita.",
+  "empty_column.favourited_statuses": "Vi ne ankoraŭ havas iun stelumitan mesaĝon. Kiam vi stelumos iun, tiu aperos ĉi tie.",
+  "empty_column.favourites": "Neniu ankoraŭ stelumis ĉi tiun mesaĝon. Kiam iu faros ĝin, tiu aperos ĉi tie.",
+  "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝ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",
  "empty_column.list": "Ankoraŭ estas nenio en ĉi tiu listo. Kiam membroj de ĉi tiu listo afiŝos novajn mesaĝojn, ili aperos ĉi tie.",
  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.mutes": "Vi ne ankoraŭ silentigis iun uzanton.",
  "empty_column.notifications": "Vi ankoraŭ ne havas sciigojn. Interagu kun aliaj por komenci konversacion.",
  "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj nodoj por plenigi la publikan tempolinion",
  "follow_request.authorize": "Rajtigi",
@ -141,40 +142,40 @@
  "hashtag.column_header.tag_mode.all": "and {additional}",
  "hashtag.column_header.tag_mode.any": "or {additional}",
  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_mode.all": "Ĉiuj",
+  "hashtag.column_settings.tag_mode.any": "Iu ajn",
+  "hashtag.column_settings.tag_mode.none": "Neniu",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Bazaj agordoj",
  "home.column_settings.show_reblogs": "Montri diskonigojn",
  "home.column_settings.show_replies": "Montri respondojn",
  "keyboard_shortcuts.back": "por reveni",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.blocked": "por malfermi la liston de blokitaj uzantoj",
  "keyboard_shortcuts.boost": "por diskonigi",
  "keyboard_shortcuts.column": "por fokusigi mesaĝon en unu el la kolumnoj",
  "keyboard_shortcuts.compose": "por fokusigi la tekstujon",
  "keyboard_shortcuts.description": "Priskribo",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "por malfermi la kolumnon de rektaj mesaĝoj",
  "keyboard_shortcuts.down": "por iri suben en la listo",
  "keyboard_shortcuts.enter": "por malfermi mesaĝon",
  "keyboard_shortcuts.favourite": "por stelumi",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.favourites": "por malfermi la liston de stelumoj",
+  "keyboard_shortcuts.federated": "por malfermi la frataran tempolinion",
  "keyboard_shortcuts.heading": "Klavaraj mallongigoj",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "por malfermi la hejman tempolinion",
  "keyboard_shortcuts.hotkey": "Rapidklavo",
  "keyboard_shortcuts.legend": "por montri ĉi tiun noton",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.local": "por malfermi la lokan tempolinion",
  "keyboard_shortcuts.mention": "por mencii la aŭtoron",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.muted": "por malfermi la liston de silentigitaj uzantoj",
+  "keyboard_shortcuts.my_profile": "por malfermi vian profilon",
+  "keyboard_shortcuts.notifications": "por malfermi la kolumnon de sciigoj",
+  "keyboard_shortcuts.pinned": "por malfermi la liston de alpinglitaj mesaĝoj",
  "keyboard_shortcuts.profile": "por malfermi la profilon de la aŭtoro",
  "keyboard_shortcuts.reply": "por respondi",
-  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.requests": "por malfermi la liston de petoj de sekvado",
  "keyboard_shortcuts.search": "por fokusigi la serĉilon",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.start": "por malfermi la kolumnon «por komenci»",
  "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",
@ -195,10 +196,10 @@
  "missing_indicator.label": "Ne trovita",
  "missing_indicator.sublabel": "Ĉi tiu elemento ne estis trovita",
  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn el ĉi tiu uzanto?",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.apps": "Telefonaj aplikaĵoj",
  "navigation_bar.blocks": "Blokitaj uzantoj",
  "navigation_bar.community_timeline": "Loka tempolinio",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.compose": "Redakti novan mesaĝon",
  "navigation_bar.direct": "Rektaj mesaĝoj",
  "navigation_bar.discover": "Esplori",
  "navigation_bar.domain_blocks": "Kaŝitaj domajnoj",
@ -291,7 +292,7 @@
  "status.cancel_reblog_private": "Eksdiskonigi",
  "status.cannot_reblog": "Ĉi tiu mesaĝo ne diskonigeblas",
  "status.delete": "Forigi",
-  "status.detailed_status": "Detailed conversation view",
+  "status.detailed_status": "Detala konversacia vido",
  "status.direct": "Rekte mesaĝi @{name}",
  "status.embed": "Enkorpigi",
  "status.favourite": "Stelumi",
@ -305,11 +306,11 @@
  "status.open": "Grandigi",
  "status.pin": "Alpingli profile",
  "status.pinned": "Alpinglita mesaĝo",
-  "status.read_more": "Read more",
+  "status.read_more": "Legi pli",
  "status.reblog": "Diskonigi",
  "status.reblog_private": "Diskonigi al la originala atentaro",
  "status.reblogged_by": "{name} diskonigis",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.reblogs.empty": "Neniu ankoraŭ diskonigis ĉi tiun mesaĝon. Kiam iu faris ĝin, tiu aperos ĉi tie.",
  "status.redraft": "Forigi kaj reskribi",
  "status.reply": "Respondi",
  "status.replyAll": "Respondi al la fadeno",
@ -321,11 +322,11 @@
  "status.show_less_all": "Malgrandigi ĉiujn",
  "status.show_more": "Grandigi",
  "status.show_more_all": "Grandigi ĉiujn",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Montri fadenon",
  "status.unmute_conversation": "Malsilentigi konversacion",
  "status.unpin": "Depingli de profilo",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Forigi la proponon",
+  "suggestions.header": "Vi povus interesiĝi pri…",
  "tabs_bar.federated_timeline": "Fratara tempolinio",
  "tabs_bar.home": "Hejmo",
  "tabs_bar.local_timeline": "Loka tempolinio",
@ -334,7 +335,7 @@
  "trends.count_by_accounts": "{count} {rawCount, pluraj, unu {person} alia(j) {people}} parolas",
  "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",
+  "upload_button.label": "Aldoni aŭdovidaĵon (JPEG, PNG, GIF, WebM, MP4, MOV)",
  "upload_form.description": "Priskribi por misvidantaj homoj",
  "upload_form.focus": "Stuci",
  "upload_form.undo": "Forigi",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -17,6 +17,7 @@
  "account.follows_you": "Te sigue",
  "account.hide_reblogs": "Ocultar retoots de @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mencionar a @{name}",
  "account.moved_to": "{name} se ha mudado a:",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
  "account.badges.bot": "Bot",
  "account.block": "Blokeatu @{name}",
  "account.block_domain": "Ezkutatu {domain} domeinuko guztia",
@ -17,6 +17,7 @@
  "account.follows_you": "Jarraitzen dizu",
  "account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak",
  "account.link_verified_on": "Esteka honen jabetzaren egiaztaketa data: {date}",
+  "account.locked_info": "Kontu honen pribatutasun egoera blokeatuta gisa ezarri da. Jabeak eskuz erabakitzen du nork jarraitu diezaioken.",
  "account.media": "Media",
  "account.mention": "Aipatu @{name}",
  "account.moved_to": "{name} hona lekualdatu da:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Bilaketaren emaitzak",
  "emoji_button.symbols": "Sinboloak",
  "emoji_button.travel": "Bidaiak eta tokiak",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Ez dago toot-ik hemen!",
  "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
  "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
  "empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.",
  "getting_started.security": "Segurtasuna",
  "getting_started.terms": "Erabilera baldintzak",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "eta {osagarria}",
+  "hashtag.column_header.tag_mode.any": "edo {osagarria}",
+  "hashtag.column_header.tag_mode.none": "gabe {osagarria}",
+  "hashtag.column_settings.tag_mode.all": "Hauetako guztiak",
+  "hashtag.column_settings.tag_mode.any": "Hautako edozein",
+  "hashtag.column_settings.tag_mode.none": "Hauetako bat ere ez",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Oinarrizkoa",
  "home.column_settings.show_reblogs": "Erakutsi bultzadak",
@ -315,13 +316,13 @@
  "status.replyAll": "Erantzun harian",
  "status.report": "Salatu @{name}",
  "status.sensitive_toggle": "Egin klik ikusteko",
-  "status.sensitive_warning": "Eduki hunkigarria",
+  "status.sensitive_warning": "Kontuz: Eduki hunkigarria",
  "status.share": "Partekatu",
  "status.show_less": "Erakutsi gutxiago",
  "status.show_less_all": "Erakutsi denetarik gutxiago",
  "status.show_more": "Erakutsi gehiago",
  "status.show_more_all": "Erakutsi denetarik gehiago",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Erakutsi haria",
  "status.unmute_conversation": "Desmututu elkarrizketa",
  "status.unpin": "Desfinkatu profiletik",
  "suggestions.dismiss": "Errefusatu proposamena",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -17,6 +17,7 @@
  "account.follows_you": "پیگیر شماست",
  "account.hide_reblogs": "پنهان کردن بازبوق‌های @{name}",
  "account.link_verified_on": "مالکیت این نشانی در تایخ {date} بررسی شد",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "عکس و ویدیو",
  "account.mention": "نام‌بردن از @{name}",
  "account.moved_to": "{name} منتقل شده است به:",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -17,6 +17,7 @@
  "account.follows_you": "Seuraa sinua",
  "account.hide_reblogs": "Piilota buustaukset käyttäjältä @{name}",
  "account.link_verified_on": "Tämän linkin omistaja tarkistettiin {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mainitse @{name}",
  "account.moved_to": "{name} on muuttanut instanssiin:",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
  "account.badges.bot": "Bot",
  "account.block": "Bloquer @{name}",
  "account.block_domain": "Tout masquer venant de {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Vous suit",
  "account.hide_reblogs": "Masquer les partages de @{name}",
  "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
+  "account.locked_info": "Ce compte est verrouillé. Son propriétaire approuve manuellement qui peut le ou la suivre.",
  "account.media": "Média",
  "account.mention": "Mentionner",
  "account.moved_to": "{name} a déménagé vers :",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Résultats de la recherche",
  "emoji_button.symbols": "Symboles",
  "emoji_button.travel": "Lieux & Voyages",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Aucun pouet ici !",
  "empty_column.blocks": "Vous n’avez bloqué aucun utilisateur pour le moment.",
  "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
  "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.",
  "getting_started.security": "Sécurité",
  "getting_started.terms": "Conditions d’utilisation",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "et {additional}",
+  "hashtag.column_header.tag_mode.any": "ou {additional}",
+  "hashtag.column_header.tag_mode.none": "sans {additional}",
+  "hashtag.column_settings.tag_mode.all": "Tous ces éléments",
+  "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
+  "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Basique",
  "home.column_settings.show_reblogs": "Afficher les partages",
@ -321,7 +322,7 @@
  "status.show_less_all": "Tout replier",
  "status.show_more": "Déplier",
  "status.show_more_all": "Tout déplier",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Afficher le fil",
  "status.unmute_conversation": "Ne plus masquer la conversation",
  "status.unpin": "Retirer du profil",
  "suggestions.dismiss": "Rejeter la suggestion",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Engadir ou Eliminar das listas",
  "account.badges.bot": "Bot",
  "account.block": "Bloquear @{name}",
  "account.block_domain": "Ocultar calquer contido de {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Séguena",
  "account.hide_reblogs": "Ocultar repeticións de @{name}",
  "account.link_verified_on": "A propiedade de esta ligazón foi comprobada en {date}",
+  "account.locked_info": "O estado da intimidade de esta conta estableceuse en pechado. A persoa dona da conta revisa quen pode seguila.",
  "account.media": "Medios",
  "account.mention": "Mencionar @{name}",
  "account.moved_to": "{name} marchou a:",
@ -99,7 +100,7 @@
  "embed.instructions": "Copie o código inferior para incrustar no seu sitio web este estado.",
  "embed.preview": "Así será mostrado:",
  "emoji_button.activity": "Actividade",
-  "emoji_button.custom": "Personalizado",
+  "emoji_button.custom": "Persoalizado",
  "emoji_button.flags": "Marcas",
  "emoji_button.food": "Comida e Bebida",
  "emoji_button.label": "Insertar emoji",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Resultados da busca",
  "emoji_button.symbols": "Símbolos",
  "emoji_button.travel": "Viaxes e Lugares",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Sen toots por aquí!",
  "empty_column.blocks": "Non bloqueou ningunha usuaria polo de agora.",
  "empty_column.community": "A liña temporal local está baldeira. Escriba algo de xeito público para que rule!",
  "empty_column.direct": "Aínda non ten mensaxes directas. Cando envíe ou reciba unha, aparecerá aquí.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon é software de código aberto. Pode contribuír ou informar de fallos en GitHub en {github}.",
  "getting_started.security": "Seguridade",
  "getting_started.terms": "Termos do servizo",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "ou {additional}",
+  "hashtag.column_header.tag_mode.none": "sen {additional}",
+  "hashtag.column_settings.tag_mode.all": "Todos estos",
+  "hashtag.column_settings.tag_mode.any": "Calquera de estos",
+  "hashtag.column_settings.tag_mode.none": "Ningún de estos",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Básico",
  "home.column_settings.show_reblogs": "Mostrar repeticións",
@ -211,7 +212,7 @@
  "navigation_bar.lists": "Listas",
  "navigation_bar.logout": "Sair",
  "navigation_bar.mutes": "Usuarias acaladas",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Persoal",
  "navigation_bar.pins": "Mensaxes fixadas",
  "navigation_bar.preferences": "Preferencias",
  "navigation_bar.public_timeline": "Liña temporal federada",
@ -321,7 +322,7 @@
  "status.show_less_all": "Mostrar menos para todas",
  "status.show_more": "Mostrar máis",
  "status.show_more_all": "Mostrar máis para todas",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Mostrar fío",
  "status.unmute_conversation": "Non acalar a conversa",
  "status.unpin": "Despegar do perfil",
  "suggestions.dismiss": "Rexeitar suxestión",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -17,6 +17,7 @@
  "account.follows_you": "במעקב אחריך",
  "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "מדיה",
  "account.mention": "אזכור של @{name}",
  "account.moved_to": "החשבון {name} הועבר אל:",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -17,6 +17,7 @@
  "account.follows_you": "te slijedi",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Spomeni @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -17,6 +17,7 @@
  "account.follows_you": "Követnek téged",
  "account.hide_reblogs": "Rejtsd el a tülkölést @{name}-tól/től",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Média",
  "account.mention": "@{name} említése",
  "account.moved_to": "{name} átköltözött:",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -17,6 +17,7 @@
  "account.follows_you": "Հետեւում է քեզ",
  "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Մեդիա",
  "account.mention": "Նշել @{name}֊ին",
  "account.moved_to": "{name}֊ը տեղափոխվել է՝",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -17,6 +17,7 @@
  "account.follows_you": "Mengikuti anda",
  "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Balasan @{name}",
  "account.moved_to": "{name} telah pindah ke:",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -17,6 +17,7 @@
  "account.follows_you": "Sequas tu",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mencionar @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
  "account.badges.bot": "Bot",
  "account.block": "Blocca @{name}",
  "account.block_domain": "Nascondi tutto da {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Ti segue",
  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
  "account.link_verified_on": "La proprietà di questo link è stata controllata il {date}",
+  "account.locked_info": "Il livello di privacy di questo account è impostato a \"bloccato\". Il proprietario esamina manualmente le richieste di seguirlo.",
  "account.media": "Media",
  "account.mention": "Menziona @{name}",
  "account.moved_to": "{name} si è trasferito su:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Risultati della ricerca",
  "emoji_button.symbols": "Simboli",
  "emoji_button.travel": "Viaggi e luoghi",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Non ci sono toot qui!",
  "empty_column.blocks": "Non hai ancora bloccato nessun utente.",
  "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
  "empty_column.direct": "Non hai ancora nessun messaggio diretto. Quando ne manderai o riceverai qualcuno, apparirà qui.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.",
  "getting_started.security": "Sicurezza",
  "getting_started.terms": "Condizioni del servizio",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "senza {additional}",
+  "hashtag.column_settings.tag_mode.all": "Tutti questi",
+  "hashtag.column_settings.tag_mode.any": "Uno o più di questi",
+  "hashtag.column_settings.tag_mode.none": "Nessuno di questi",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Semplice",
  "home.column_settings.show_reblogs": "Mostra post condivisi",
@ -321,7 +322,7 @@
  "status.show_less_all": "Mostra meno per tutti",
  "status.show_more": "Mostra di più",
  "status.show_more_all": "Mostra di più per tutti",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Mostra thread",
  "status.unmute_conversation": "Annulla silenzia conversazione",
  "status.unpin": "Non fissare in cima al profilo",
  "suggestions.dismiss": "Elimina suggerimento",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -17,6 +17,7 @@
  "account.follows_you": "フォローされています",
  "account.hide_reblogs": "@{name}さんからのブーストを非表示",
  "account.link_verified_on": "このリンクの所有権は{date}に確認されました",
+  "account.locked_info": "このアカウントは承認制に設定されています。フォローするには所有者の確認が必要です。",
  "account.media": "メディア",
  "account.mention": "@{name}さんにトゥート",
  "account.moved_to": "{name}さんは引っ越しました:",
@ -139,7 +140,7 @@
  "getting_started.find_friends": "Twitterの友達を探す",
  "getting_started.heading": "スタート",
  "getting_started.invite": "招待",
-  "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に参加したり、問題を報告したりできます。",
+  "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub ( {github} ) から開発に参加したり、問題を報告したりできます。",
  "getting_started.security": "セキュリティ",
  "getting_started.terms": "プライバシーポリシー",
  "hashtag.column_header.tag_mode.all": "と {additional}",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@ -17,6 +17,7 @@
  "account.follows_you": "მოგყვებათ",
  "account.hide_reblogs": "დაიმალოს ბუსტები @{name}-სგან",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "მედია",
  "account.mention": "ასახელეთ @{name}",
  "account.moved_to": "{name} გადავიდა:",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -17,6 +17,7 @@
  "account.follows_you": "날 팔로우합니다",
  "account.hide_reblogs": "@{name}의 부스트를 숨기기",
  "account.link_verified_on": "{date}에 이 링크의 소유권이 확인 됨",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "미디어",
  "account.mention": "@{name}에게 글쓰기",
  "account.moved_to": "{name}는 계정을 이동했습니다:",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@ -17,6 +17,7 @@
  "account.follows_you": "Follows you",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mention @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
  "account.badges.bot": "Bot",
  "account.block": "Blokkeer @{name}",
  "account.block_domain": "Verberg alles van {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Volgt jou",
  "account.hide_reblogs": "Verberg boosts van @{name}",
  "account.link_verified_on": "Eigendom van deze link is gecontroleerd op {date}",
+  "account.locked_info": "De privacystatus van dit account is op besloten gezet. De eigenaar bepaalt handmatig wie hen kan volgen.",
  "account.media": "Media",
  "account.mention": "Vermeld @{name}",
  "account.moved_to": "{name} is verhuisd naar:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Zoekresultaten",
  "emoji_button.symbols": "Symbolen",
  "emoji_button.travel": "Reizen en plekken",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Hier zijn geen toots!",
  "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
  "empty_column.community": "De lokale tijdlijn is nog leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
  "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.",
  "getting_started.security": "Beveiliging",
  "getting_started.terms": "Voorwaarden",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "of {additional}",
+  "hashtag.column_header.tag_mode.none": "zonder {additional}",
+  "hashtag.column_settings.tag_mode.all": "Allemaal",
+  "hashtag.column_settings.tag_mode.any": "Een van deze",
+  "hashtag.column_settings.tag_mode.none": "Geen van deze",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Algemeen",
  "home.column_settings.show_reblogs": "Boosts tonen",
@ -209,7 +210,7 @@
  "navigation_bar.info": "Over deze server",
  "navigation_bar.keyboard_shortcuts": "Sneltoetsen",
  "navigation_bar.lists": "Lijsten",
-  "navigation_bar.logout": "Afmelden",
+  "navigation_bar.logout": "Uitloggen",
  "navigation_bar.mutes": "Genegeerde gebruikers",
  "navigation_bar.personal": "Persoonlijk",
  "navigation_bar.pins": "Vastgezette toots",
@ -321,7 +322,7 @@
  "status.show_less_all": "Alles minder tonen",
  "status.show_more": "Meer tonen",
  "status.show_more_all": "Alles meer tonen",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Gesprek tonen",
  "status.unmute_conversation": "Gesprek niet langer negeren",
  "status.unpin": "Van profielpagina losmaken",
  "suggestions.dismiss": "Suggestie verwerpen",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -17,6 +17,7 @@
  "account.follows_you": "Følger deg",
  "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Nevn @{name}",
  "account.moved_to": "{name} har flyttet til:",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -150,32 +150,32 @@
  "home.column_settings.show_reblogs": "Mostrar los partatges",
  "home.column_settings.show_replies": "Mostrar las responsas",
  "keyboard_shortcuts.back": "anar enrèire",
-  "keyboard_shortcuts.blocked": "per dobrir la lista d’utilizaires blocats",
+  "keyboard_shortcuts.blocked": "dobrir la lista d’utilizaires blocats",
  "keyboard_shortcuts.boost": "partejar",
  "keyboard_shortcuts.column": "centrar un estatut a una colomna",
  "keyboard_shortcuts.compose": "anar al camp tèxte",
-  "keyboard_shortcuts.description": "Descripcion",
-  "keyboard_shortcuts.direct": "per dobrir la colomna de messatges dirèctes",
+  "keyboard_shortcuts.description": "descripcion",
+  "keyboard_shortcuts.direct": "dobrir la colomna de messatges dirèctes",
  "keyboard_shortcuts.down": "far davalar dins la lista",
  "keyboard_shortcuts.enter": "dobrir los estatuts",
  "keyboard_shortcuts.favourite": "apondre als favorits",
-  "keyboard_shortcuts.favourites": "per dobrir la lista de favorits",
-  "keyboard_shortcuts.federated": "per dobrir lo flux public global",
+  "keyboard_shortcuts.favourites": "dobrir la lista de favorits",
+  "keyboard_shortcuts.federated": "dobrir lo flux public global",
  "keyboard_shortcuts.heading": "Acorchis clavièr",
-  "keyboard_shortcuts.home": "per dobrir lo flux public local",
+  "keyboard_shortcuts.home": "dobrir lo flux public local",
  "keyboard_shortcuts.hotkey": "Acorchis",
  "keyboard_shortcuts.legend": "mostrar aquesta legenda",
-  "keyboard_shortcuts.local": "per dobrir lo flux public local",
+  "keyboard_shortcuts.local": "dobrir lo flux public local",
  "keyboard_shortcuts.mention": "mencionar l’autor",
-  "keyboard_shortcuts.muted": "per dobrir la lista dels utilizaires silenciats",
-  "keyboard_shortcuts.my_profile": "per dobrir vòstre perfil",
-  "keyboard_shortcuts.notifications": "per dobrir la colomna de notificacions",
-  "keyboard_shortcuts.pinned": "per dobrir la lista dels tuts penjats",
-  "keyboard_shortcuts.profile": "per dobrir lo perfil de l’autor",
+  "keyboard_shortcuts.muted": "dobrir la lista dels utilizaires silenciats",
+  "keyboard_shortcuts.my_profile": "dobrir vòstre perfil",
+  "keyboard_shortcuts.notifications": "dobrir la colomna de notificacions",
+  "keyboard_shortcuts.pinned": "dobrir la lista dels tuts penjats",
+  "keyboard_shortcuts.profile": "dobrir lo perfil de l’autor",
  "keyboard_shortcuts.reply": "respondre",
-  "keyboard_shortcuts.requests": "per dorbir la lista de demanda d’abonament",
+  "keyboard_shortcuts.requests": "dorbir la lista de demanda d’abonament",
  "keyboard_shortcuts.search": "anar a la recèrca",
-  "keyboard_shortcuts.start": "per dobrir la colomna «Per començar»",
+  "keyboard_shortcuts.start": "dobrir la colomna « Per començar »",
  "keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments",
  "keyboard_shortcuts.toot": "començar un estatut tot novèl",
  "keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Adicionar ou remover de listas",
  "account.badges.bot": "Robô",
  "account.block": "Bloquear @{name}",
  "account.block_domain": "Esconder tudo de {domain}",
@ -17,6 +17,7 @@
  "account.follows_you": "Segue você",
  "account.hide_reblogs": "Esconder compartilhamentos de @{name}",
  "account.link_verified_on": "A posse desse link foi verificada em {date}",
+  "account.locked_info": "Essa conta está trancada. Se você a seguir sua solicitação será revisada manualmente.",
  "account.media": "Mídia",
  "account.mention": "Mencionar @{name}",
  "account.moved_to": "{name} se mudou para:",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Resultados da busca",
  "emoji_button.symbols": "Símbolos",
  "emoji_button.travel": "Viagens & Lugares",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Não há toots aqui!",
  "empty_column.blocks": "Você ainda não bloqueou nenhum usuário.",
  "empty_column.community": "A timeline local está vazia. Escreva algo publicamente para começar!",
  "empty_column.direct": "Você não tem nenhuma mensagem direta ainda. Quando você enviar ou receber uma, as mensagens aparecerão por aqui.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon é um software de código aberto. Você pode contribuir ou reportar problemas na página do GitHub do projeto: {github}.",
  "getting_started.security": "Segurança",
  "getting_started.terms": "Termos de serviço",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "ou {additional}",
+  "hashtag.column_header.tag_mode.none": "sem {additional}",
+  "hashtag.column_settings.tag_mode.all": "Todas essas",
+  "hashtag.column_settings.tag_mode.any": "Qualquer uma dessas",
+  "hashtag.column_settings.tag_mode.none": "Nenhuma dessas",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Básico",
  "home.column_settings.show_reblogs": "Mostrar compartilhamentos",
@ -321,11 +322,11 @@
  "status.show_less_all": "Mostrar menos para todas as mensagens",
  "status.show_more": "Mostrar mais",
  "status.show_more_all": "Mostrar mais para todas as mensagens",
-  "status.show_thread": "Show thread",
+  "status.show_thread": "Mostrar sequência",
  "status.unmute_conversation": "Desativar silêncio desta conversa",
  "status.unpin": "Desafixar do perfil",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "Ignorar a sugestão",
+  "suggestions.header": "Você pode se interessar por…",
  "tabs_bar.federated_timeline": "Global",
  "tabs_bar.home": "Página inicial",
  "tabs_bar.local_timeline": "Local",
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@ -17,6 +17,7 @@
  "account.follows_you": "É teu seguidor",
  "account.hide_reblogs": "Esconder partilhas de @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mencionar @{name}",
  "account.moved_to": "{name} mudou a sua conta para:",
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@ -17,6 +17,7 @@
  "account.follows_you": "Te urmărește",
  "account.hide_reblogs": "Ascunde redistribuirile de la @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Menționează @{name}",
  "account.moved_to": "{name} a fost mutat la:",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -17,6 +17,7 @@
  "account.follows_you": "Подписан(а) на Вас",
  "account.hide_reblogs": "Скрыть продвижения от @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Медиа",
  "account.mention": "Упомянуть",
  "account.moved_to": "Ищите {name} здесь:",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -1,5 +1,5 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.add_or_remove_from_list": "Pridaj, alebo odstráň zo zoznamov",
  "account.badges.bot": "Bot",
  "account.block": "Blokuj @{name}",
  "account.block_domain": "Ukry všetko z {domain}",
@ -13,10 +13,11 @@
  "account.followers": "Sledujúci",
  "account.followers.empty": "Tohto užívateľa ešte nikto nenásleduje.",
  "account.follows": "Následuje",
-  "account.follows.empty": "Tento užívateľ ešte nikoho nenásleduje.",
+  "account.follows.empty": "Tento užívateľ tu ešte nikoho nenásleduje.",
  "account.follows_you": "Následuje ťa",
  "account.hide_reblogs": "Skryť povýšenia od @{name}",
  "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
+  "account.locked_info": "Stav súkromia pre tento účet je nastavený na zamknutý. Jeho vlastník sám prehodnocuje, kto ho môže sledovať.",
  "account.media": "Médiá",
  "account.mention": "Spomeň @{name}",
  "account.moved_to": "{name} sa presunul/a na:",
@ -24,7 +25,7 @@
  "account.mute_notifications": "Stĺmiť oboznámenia od @{name}",
  "account.muted": "Utíšený/á",
  "account.posts": "Hlášky",
-  "account.posts_with_replies": "Príspevky s odpoveďami",
+  "account.posts_with_replies": "Hlášky s odpoveďami",
  "account.report": "Nahlás @{name}",
  "account.requested": "Čaká na schválenie. Kliknite pre zrušenie žiadosti",
  "account.share": "Zdieľať @{name} profil",
@ -55,7 +56,7 @@
  "column.lists": "Zoznamy",
  "column.mutes": "Ignorovaní užívatelia",
  "column.notifications": "Oboznámenia",
-  "column.pins": "Pripnuté príspevky",
+  "column.pins": "Pripnuté hlášky",
  "column.public": "Federovaná časová os",
  "column_back_button.label": "Späť",
  "column_header.hide_settings": "Skryť nastavenia",
@ -112,7 +113,7 @@
  "emoji_button.search_results": "Nájdené",
  "emoji_button.symbols": "Symboly",
  "emoji_button.travel": "Cestovanie a miesta",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Niesú tu žiadne príspevky!",
  "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
  "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
  "empty_column.direct": "Ešte nemáš žiadne súkromné správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.",
@ -138,12 +139,12 @@
  "getting_started.open_source_notice": "Mastodon je softvér s otvoreným kódom. Nahlásiť chyby, alebo prispievať môžeš na GitHube v {github}.",
  "getting_started.security": "Zabezpečenie",
  "getting_started.terms": "Podmienky prevozu",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "a {additional}",
+  "hashtag.column_header.tag_mode.any": "alebo {additional}",
+  "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "hashtag.column_settings.tag_mode.all": "Všetky tieto",
+  "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
+  "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Základné",
  "home.column_settings.show_reblogs": "Zobraziť povýšené",
@ -193,8 +194,8 @@
  "loading_indicator.label": "Načítam...",
  "media_gallery.toggle_visible": "Zapnúť/Vypnúť viditeľnosť",
  "missing_indicator.label": "Nenájdené",
-  "missing_indicator.sublabel": "Tento zdroj sa nepodarilo nájsť",
-  "mute_modal.hide_notifications": "Skryť notifikácie od tohoto užívateľa?",
+  "missing_indicator.sublabel": "Tento zdroj sa ešte nepodarilo nájsť",
+  "mute_modal.hide_notifications": "Skryť oboznámenia od tohoto užívateľa?",
  "navigation_bar.apps": "Mobilné aplikácie",
  "navigation_bar.blocks": "Blokovaní užívatelia",
  "navigation_bar.community_timeline": "Lokálna časová os",
@ -233,7 +234,7 @@
  "notifications.group": "{count} oznámenia",
  "onboarding.done": "Koniec",
  "onboarding.next": "Ďalej",
-  "onboarding.page_five.public_timelines": "Lokálna časová os zobrazuje verejné správy od všetkých na {domain}. Federovaná časová os zobrazuje verejné správy od všetkých tých, čo následujú užívatrľov {domain} z iných serverov. Tieto sú takzvané Verejné Časové Osi, výborná možnosť ako nájsť a spoznať nových ľudí.",
+  "onboarding.page_five.public_timelines": "Lokálna časová os zobrazuje verejné správy od všetkých na {domain}. Federovaná časová os zobrazuje verejné správy od všetkých tých, čo následujú užívateľov {domain} z iných serverov. Tieto sú takzvané Verejné Časové Osi, výborná možnosť ako nájsť a spoznať nových ľudí.",
  "onboarding.page_four.home": "Domovská časová os zobrazí správy od ľudí ktorých sledujete.",
  "onboarding.page_four.notifications": "Stĺpec s notifikáciami zobrazí keď budete s niekým komunikovať.",
  "onboarding.page_one.federation": "Mastodon je sieť nezávislých serverov, spojením ktorých vzniká jedna veľká federovaná sociálna sieť.",
@ -284,8 +285,8 @@
  "search_popout.tips.user": "používateľ",
  "search_results.accounts": "Ľudia",
  "search_results.hashtags": "Haštagy",
-  "search_results.statuses": "Príspevky",
-  "search_results.total": "{count, number} {count, plural, jeden {výsledok} ostatné {výsledky}}",
+  "search_results.statuses": "Hlášky",
+  "search_results.total": "{count, number} {count, plural, one {výsledok} many {výsledkov} other {výsledky}}",
  "standalone.public_title": "Náhľad dovnútra...",
  "status.block": "Blokovať @{name}",
  "status.cancel_reblog_private": "Nezdieľaj",
@ -321,9 +322,9 @@
  "status.show_less_all": "Všetkým ukáž menej",
  "status.show_more": "Ukáž viac",
  "status.show_more_all": "Všetkým ukáž viac",
-  "status.show_thread": "Show thread",
-  "status.unmute_conversation": "Prestať ignorovať konverzáciu",
-  "status.unpin": "Odopnúť z profilu",
+  "status.show_thread": "Ukáž diskusné vlákno",
+  "status.unmute_conversation": "Prestaň ignorovať konverzáciu",
+  "status.unpin": "Odopni z profilu",
  "suggestions.dismiss": "Zavrhni návrh",
  "suggestions.header": "Mohlo by ťa zaujímať…",
  "tabs_bar.federated_timeline": "Federovaná",
@ -331,7 +332,7 @@
  "tabs_bar.local_timeline": "Lokálna",
  "tabs_bar.notifications": "Notifikácie",
  "tabs_bar.search": "Hľadaj",
-  "trends.count_by_accounts": "{count} {rawCount, viacerí, jeden {person} iní {people}} diskutujú",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {človek vraví} other {ľudia vravia}}",
  "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
  "upload_area.title": "Pretiahni a pusť pre nahratie",
  "upload_button.label": "Pridať médiálny súbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@ -17,6 +17,7 @@
  "account.follows_you": "Ti sledi",
  "account.hide_reblogs": "Skrij sunke od @{name}",
  "account.link_verified_on": "Lastništvo te povezave je bilo preverjeno {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Mediji",
  "account.mention": "Omeni @{name}",
  "account.moved_to": "{name} se je premaknil na:",
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@ -17,6 +17,7 @@
  "account.follows_you": "Prati Vas",
  "account.hide_reblogs": "Sakrij podrške koje daje korisnika @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Mediji",
  "account.mention": "Pomeni korisnika @{name}",
  "account.moved_to": "{name} se pomerio na:",
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@ -17,6 +17,7 @@
  "account.follows_you": "Прати Вас",
  "account.hide_reblogs": "Сакриј подршке које даје корисника @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Медији",
  "account.mention": "Помени корисника @{name}",
  "account.moved_to": "{name} се померио на:",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -17,6 +17,7 @@
  "account.follows_you": "Följer dig",
  "account.hide_reblogs": "Dölj knuffar från @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Nämna @{name}",
  "account.moved_to": "{name} har flyttat till:",
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@ -17,6 +17,7 @@
  "account.follows_you": "Follows you",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mention @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@ -17,6 +17,7 @@
  "account.follows_you": "మిమ్మల్ని అనుసరిస్తున్నారు",
  "account.hide_reblogs": "@{name} నుంచి బూస్ట్ లను దాచిపెట్టు",
  "account.link_verified_on": "ఈ లంకె యొక్క యాజమాన్యం {date}న పరీక్షించబడింది",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "మీడియా",
  "account.mention": "@{name}ను ప్రస్తావించు",
  "account.moved_to": "{name} ఇక్కడికి మారారు:",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -17,6 +17,7 @@
  "account.follows_you": "Follows you",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Mention @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -17,6 +17,7 @@
  "account.follows_you": "Seni takip ediyor",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
  "account.mention": "Bahset @{name}",
  "account.moved_to": "{name} has moved to:",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -17,6 +17,7 @@
  "account.follows_you": "Підписаний(-а) на Вас",
  "account.hide_reblogs": "Сховати передмухи від @{name}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Медіа",
  "account.mention": "Згадати @{name}",
  "account.moved_to": "{name} переїхав на:",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -17,6 +17,7 @@
  "account.follows_you": "关注了你",
  "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "媒体",
  "account.mention": "提及 @{name}",
  "account.moved_to": "{name} 已经迁移到：",
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@ -17,6 +17,7 @@
  "account.follows_you": "關注你",
  "account.hide_reblogs": "隱藏 @{name} 的轉推",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "媒體",
  "account.mention": "提及 @{name}",
  "account.moved_to": "{name} 已經遷移到：",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -17,6 +17,7 @@
  "account.follows_you": "關注你",
  "account.hide_reblogs": "隱藏來自 @{name} 的轉推",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "媒體",
  "account.mention": "提到 @{name}",
  "account.moved_to": "{name} 已經移至：",
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@ -26,10 +26,10 @@ const initialTimeline = ImmutableMap({
  items: ImmutableList(),
 });

-const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial) => {
+const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
  return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
    mMap.set('isLoading', false);
-    if (!next) mMap.set('hasMore', false);
+    if (!next && !isLoadingRecent) mMap.set('hasMore', false);

    if (!statuses.isEmpty()) {
      mMap.update('items', ImmutableList(), oldIds => {
@ -126,7 +126,7 @@ export default function timelines(state = initialState, action) {
  case TIMELINE_EXPAND_FAIL:
    return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
  case TIMELINE_EXPAND_SUCCESS:
-    return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial);
+    return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent);
  case TIMELINE_UPDATE:
    return updateTimeline(state, action.timeline, fromJS(action.status));
  case TIMELINE_DELETE:
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -420,6 +420,7 @@ code {
    border: 1px solid darken($ui-base-color, 14%);
    border-radius: 4px;
    padding: 10px;
+    padding-right: 30px;
    height: 41px;
  }

--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@ -31,6 +31,8 @@ class CustomEmoji < ApplicationRecord

  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }

+  before_validation :downcase_domain
+
  validates_attachment :image, content_type: { content_type: 'image/png' }, presence: true, size: { less_than: LIMIT }
  validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 }

@ -73,4 +75,8 @@ class CustomEmoji < ApplicationRecord
  def remove_entity_cache
    Rails.cache.delete(EntityCache.instance.to_key(:emoji, shortcode, domain))
  end
+
+  def downcase_domain
+    self.domain = domain.downcase unless domain.nil?
+  end
 end
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@ -26,7 +26,7 @@ class CustomEmojiFilter
    when 'remote'
      CustomEmoji.remote
    when 'by_domain'
-      CustomEmoji.where(domain: value)
+      CustomEmoji.where(domain: value.downcase)
    when 'shortcode'
      CustomEmoji.search(value)
    else
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@ -46,6 +46,8 @@ class Form::AdminSettings
    :preview_sensitive_media=,
    :custom_css,
    :custom_css=,
+    :profile_directory,
+    :profile_directory=,
    to: Setting
  )

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -73,7 +73,7 @@ class User < ApplicationRecord

  validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
  validates_with BlacklistedEmailValidator, if: :email_changed?
-  validates_with EmailMxValidator, if: :email_changed?
+  validates_with EmailMxValidator, if: :validate_email_dns?

  scope :recent, -> { order(id: :desc) }
  scope :admins, -> { where(admin: true) }
@ -360,4 +360,8 @@ class User < ApplicationRecord
  def needs_feed_update?
    last_sign_in_at < ACTIVE_DURATION.ago
  end
+
+  def validate_email_dns?
+    email_changed? && !(Rails.env.test? || Rails.env.development?)
+  end
 end
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@ -33,6 +33,10 @@ class AccountPolicy < ApplicationPolicy
    staff?
  end

+  def remove_header?
+    staff?
+  end
+
  def subscribe?
    admin?
  end
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@ -105,7 +105,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
  end

  def virtual_tags
-    object.emojis
+    object.emojis + object.tags
  end

  def virtual_attachments
@ -119,6 +119,24 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
  class CustomEmojiSerializer < ActivityPub::EmojiSerializer
  end

+  class TagSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :type, :href, :name
+
+    def type
+      'Hashtag'
+    end
+
+    def href
+      explore_hashtag_url(object)
+    end
+
+    def name
+      "##{object.name}"
+    end
+  end
+
  class Account::FieldSerializer < ActiveModel::Serializer
    attributes :type, :name, :value

--- a/app/services/pubsubhubbub/subscribe_service.rb
+++ b/app/services/pubsubhubbub/subscribe_service.rb
@ -19,31 +19,18 @@ class Pubsubhubbub::SubscribeService < BaseService
  private

  def process_subscribe
-    case subscribe_status
-    when :invalid_topic
+    if account.nil?
      ['Invalid topic URL', 422]
-    when :invalid_callback
+    elsif !valid_callback?
      ['Invalid callback URL', 422]
-    when :callback_not_allowed
+    elsif blocked_domain?
      ['Callback URL not allowed', 403]
-    when :valid
+    else
      confirm_subscription
      ['', 202]
    end
  end

-  def subscribe_status
-    if account.nil?
-      :invalid_topic
-    elsif !valid_callback?
-      :invalid_callback
-    elsif blocked_domain?
-      :callback_not_allowed
-    else
-      :valid
-    end
-  end
-
  def confirm_subscription
    subscription = locate_subscription
    Pubsubhubbub::ConfirmationWorker.perform_async(subscription.id, 'subscribe', secret, lease_seconds)
@ -58,12 +45,7 @@ class Pubsubhubbub::SubscribeService < BaseService
  end

  def locate_subscription
-    subscription = Subscription.find_by(account: account, callback_url: callback)
-
-    if subscription.nil?
-      subscription = Subscription.new(account: account, callback_url: callback)
-    end
-
+    subscription = Subscription.find_or_initialize_by(account: account, callback_url: callback)
    subscription.domain = domain
    subscription.save!
    subscription
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@ -12,6 +12,9 @@ class UpdateAccountService < BaseService
      check_links(account)
      process_hashtags(account)
    end
+  rescue Mastodon::DimensionsValidationError => de
+    account.errors.add(:avatar, de.message)
+    false
  end

  private
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@ -4,7 +4,6 @@ require 'resolv'

 class EmailMxValidator < ActiveModel::Validator
  def validate(user)
-    return if Rails.env.test? || Rails.env.development?
    user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email)
  end

@ -15,13 +14,23 @@ class EmailMxValidator < ActiveModel::Validator

    return true if domain.nil?

-    records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
-    records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s } if records.empty?
+    hostnames = []
+    ips       = []

-    records.empty? || on_blacklist?(records)
+    Resolv::DNS.open do |dns|
+      dns.timeouts = 1
+
+      hostnames = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+
+      ([domain] + hostnames).uniq.each do |hostname|
+        ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
+      end
+    end
+
+    ips.empty? || on_blacklist?(hostnames + ips)
  end

  def on_blacklist?(values)
-    EmailDomainBlock.where(domain: values).any?
+    EmailDomainBlock.where(domain: values.uniq).any?
  end
 end
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@ -1,12 +1,9 @@
 .public-account-header{:class => ("inactive" if account.moved?)}
  .public-account-header__image
-    = image_tag account.header.url, class: 'parallax'
+    = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax'
  .public-account-header__bar
    = link_to short_account_url(account), class: 'avatar' do
-      - if current_account&.user&.setting_auto_play_gif
-        = image_tag account.avatar_original_url
-      - else
-        = image_tag account.avatar_static_url
+      = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)
    .public-account-header__tabs
      .public-account-header__tabs__name
        %h1
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@ -13,3 +13,6 @@
      %time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
    - else
      \-
+  %td
+    = table_link_to 'circle', t('admin.accounts.web'), web_path("accounts/#{account.id}")
+    = table_link_to 'globe', t('admin.accounts.public'), TagManager.instance.url_for(account)
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@ -41,6 +41,7 @@
        %th= t('admin.accounts.role')
        %th= t('admin.accounts.most_recent_ip')
        %th= t('admin.accounts.most_recent_activity')
+        %th
    %tbody
      = render @accounts

--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@ -16,11 +16,18 @@

      %tr
        %th= t('admin.accounts.avatar')
-        %th
+        %td
          = link_to @account.avatar.url(:original) do
            = image_tag @account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
          - if @account.local? && @account.avatar?
            = table_link_to 'trash', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, @account)
+      %tr
+        %th= t('admin.accounts.header')
+        %td
+          = link_to @account.header.url(:original) do
+            = image_tag @account.header.url(:original), alt: '', width: 128, height: 40, class: 'header'
+          - if @account.local? && @account.header?
+            = table_link_to 'trash', t('admin.accounts.remove_header'), remove_header_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_header, @account)

      - if @account.local?
        %tr
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@ -57,6 +57,12 @@
            %span.pull-right.positive-hint= fa_icon 'check fw'
          - else
            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = link_to t('admin.dashboard.feature_profile_directory'), edit_admin_settings_path
+          - if @profile_directory
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
        %li
          = link_to t('admin.dashboard.feature_relay'), admin_relays_path
          - if @relay_enabled
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@ -62,6 +62,9 @@
  .fields-group
    = f.input :preview_sensitive_media, as: :boolean, wrapper: :with_label, label: t('admin.settings.preview_sensitive_media.title'), hint: t('admin.settings.preview_sensitive_media.desc_html')

+  .fields-group
+    = f.input :profile_directory, as: :boolean, wrapper: :with_label, label: t('admin.settings.profile_directory.title'), hint: t('admin.settings.profile_directory.desc_html')
+
  %hr.spacer/

  .fields-group
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@ -6,7 +6,8 @@
          = link_to root_url, class: 'brand' do
            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'

-          = link_to t('directories.directory'), explore_path, class: 'nav-link'
+          - if Setting.profile_directory
+            = link_to t('directories.directory'), explore_path, class: 'nav-link'
          = link_to t('about.about_this'), about_more_path, class: 'nav-link'
          = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link'
        .nav-center
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@ -26,8 +26,9 @@
  .fields-group
    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')

-  .fields-group
-    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path)
+  - if Setting.profile_directory
+    .fields-group
+      = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path)

  %hr.spacer/

--- a/config/boot.rb
+++ b/config/boot.rb
@ -4,7 +4,7 @@ require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap' # Speed up boot time by caching expensive operations.

 Bootsnap.setup(
-  cache_dir:            'tmp/cache',
+  cache_dir:            File.expand_path('../tmp/cache', __dir__),
  development_mode:     ENV.fetch('RAILS_ENV', 'development') == 'development',
  load_path_cache:      true,
  autoload_paths_cache: true,
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@ -17,6 +17,10 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
      headers: :any,
      methods: [:get],
      credentials: false
+    resource '/users/:username',
+      headers: :any,
+      methods: [:get],
+      credentials: false
    resource '/api/*',
      headers: :any,
      methods: [:post, :put, :delete, :get, :patch, :options],
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -60,6 +60,7 @@ ar:
      zero: متابِعون
    following: مُتابَع
    joined: انضم·ت في %{date}
+    last_active: آخر نشاط
    link_verified_on: تم التحقق مِن مالك هذا الرابط بتاريخ %{date}
    media: الوسائط
    moved_html: "%{name} إنتقلَ إلى %{new_profile_link} :"
@ -130,6 +131,7 @@ ar:
      media_attachments: الوسائط المرفقة
      memorialize: تحول إلى صفحة للذاكرة
      moderation:
+        active: نشِط
        all: الكل
        silenced: تم كتمه
        suspended: مُجَمَّد
@ -455,6 +457,12 @@ ar:
      hint_html: 'لتأكيد إجراء تعليق الحساب، يُرجى إدخال %{value} في الحقل التالي:'
      proceed: مواصلة
      title: تعليق الحساب %{acct}
+    tags:
+      accounts: الحسابات
+      hidden: المخفية
+      name: الوسم
+      title: الوسوم
+      visible: ظاهر
    title: الإدارة
  admin_mailer:
    new_report:
@ -531,6 +539,9 @@ ar:
    proceed: حذف حساب
    success_msg: تم حذف حسابك بنجاح
    warning_title: توافر المحتوى المنشور و المبعثَر
+  directories:
+    explore_mastodon: استكشف %{title}
+    most_popular: المشهورة
  errors:
    '403': ليس لك الصلاحيات الكافية لعرض هذه الصفحة.
    '404': إنّ الصفحة التي تبحث عنها لا وجود لها أصلا.
@ -645,7 +656,13 @@ ar:
      body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في  %{since}
      mention: "%{name} أشار إليك في :"
      new_followers_summary: رائع، لقد قام بمتابعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون !
-      subject: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+      subject:
+        few: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+        many: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+        one: "إشعار واحد منذ آخر زيارة لك لـ \U0001F418"
+        other: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+        two: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+        zero: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
      title: أثناء فترة غيابك …
    favourite:
      body: 'أُعجب %{name} بمنشورك :'
@ -763,8 +780,20 @@ ar:
  statuses:
    attached:
      description: 'مُرفَق : %{attached}'
-      image: "%{count} صُوَر"
-      video: "%{count} فيديوهات"
+      image:
+        few: "%{count} صور"
+        many: "%{count} صور"
+        one: صورة %{count}
+        other: "%{count} صور"
+        two: صور
+        zero: صور
+      video:
+        few: "%{count} فيديوهات"
+        many: "%{count} فيديوهات"
+        one: فيديو %{count}
+        other: "%{count} فيديوهات"
+        two: فيديوهات
+        zero: فيديوهات
    boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
    content_warning: 'تحذير عن المحتوى : %{warning}'
    disallowed_hashtags: 'يحتوي على أحد الوسوم الممنوعة: %{tags}'
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@ -24,12 +24,14 @@ ast:
    status_count_after: estaos
    status_count_before: Que crearon
    terms: Términos del serviciu
-    user_count_after: usuarios
+    user_count_after:
+      one: usuariu
+      other: usuarios
    user_count_before: Ye'l llar de
    what_is_mastodon: "¿Qué ye Mastodon?"
  accounts:
    followers:
-      one: Siguidor
+      one: Xente que te sigue
      other: Siguidores
    joined: Xunióse en %{date}
    moved_html: "%{name} mudóse a %{new_profile_link}:"
@ -37,7 +39,11 @@ ast:
    nothing_here: "¡Equí nun hai nada!"
    people_followed_by: Persones a les que sigue %{name}
    people_who_follow: Persones que siguen a %{name}
-    posts: Toots
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
+    posts_with_replies: Toots y rempuestes
    reserved_username: El nome d'usuariu ta acutáu
    roles:
      bot: Robó
@ -139,6 +145,7 @@ ast:
      cas: CAS
      saml: SAML
    register: Rexistrase
+    register_elsewhere: Rexistrase n'otru sirvidor
    security: Seguranza
  authorize_follow:
    already_following: Yá tas siguiendo a esta cuenta
@ -155,6 +162,10 @@ ast:
  deletes:
    bad_password_msg: "¡Bon intentu, crackers! Contraseña incorreuta"
    confirm_password: Introduz la contraseña pa verificar la to identidá
+  directories:
+    people:
+      one: "%{count} persona"
+      other: "%{count} persones"
  errors:
    '403': Nun tienes permisu pa ver esta páxina.
    '404': La páxina que tabes guetando nun esiste.
@ -167,8 +178,12 @@ ast:
    archive_takeout:
      date: Data
      hint_html: Pues solicitar un archivu colos tos <strong>toots y ficheros xubíos</strong>. Los datos esportaos van tar nel formatu ActivityPub, llexible pa cualesquier software que seya compatible. Pues solicitar un archivu cada 7 díes.
+      request: Solicitar l'archivu
      size: Tamañu
+    blocks: Xente que bloquiesti
    csv: CSV
+    follows: Xente que sigues
+    mutes: Xente que silenciesti
  filters:
    contexts:
      notifications: Avisos
@ -340,6 +355,7 @@ ast:
    lost_recovery_codes: Los códigos de recuperación permítente recuperar l'accesu a la cuenta si pierdes el teléfonu. Si tamién pierdes esos códigos, pues xeneralos de nueves equí. Los códigos de recuperación vieyos van invalidase.
    manual_instructions: 'Si nun pues escaniar el códigu QR y precises introducilu a mano, equí ta''l secretu en testu planu:'
    recovery_codes: Códigos de recuperación
+    recovery_codes_regenerated: Los códigos de recuperación rexeneráronse con ésitu
  user_mailer:
    welcome:
      full_handle_hint: Esto ye lo que-yos diríes a los collacios pa que puean unviate mensaxes o siguite dende otra instancia.
@ -348,3 +364,5 @@ ast:
  users:
    invalid_email: La direición de corréu nun ye válida
    seamless_external_login: Aniciesti sesión pente un serviciu esternu, polo que los axustes de la contraseña y corréu nun tán disponibles.
+  verification:
+    verification: Verificación
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -658,7 +658,7 @@ ca:
      title: Menció nova
    reblog:
      body: "%{name} ha impulsat el teu estat:"
-      subject: "%{name} ha retootejat el teu estat"
+      subject: "%{name} ha impulsat el teu estat"
      title: Nou impuls
  number:
    human:
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@ -48,6 +48,7 @@ co:
      other: Abbunati
    following: Abbunamenti
    joined: Quì dapoi %{date}
+    last_active: ultima attività
    link_verified_on: A pruprietà d'issu ligame hè stata verificata u %{date}
    media: Media
    moved_html: "%{name} hà cambiatu di contu, avà hè nant’à %{new_profile_link}:"
@ -114,6 +115,7 @@ co:
      media_attachments: Media aghjunti
      memorialize: Trasfurmà in mimuriale
      moderation:
+        active: Attivu
        all: Tutti
        silenced: Silenzati
        suspended: Suspesi
@ -439,6 +441,14 @@ co:
      proceed: Cuntinuà
      title: Suspende %{acct}
      warning_html: 'A suspensione di u contu sguasserà di manera <strong>irreversibile</strong> i so dati, cum''è:'
+    tags:
+      accounts: Conti
+      hidden: Piattatu
+      hide: Piattà di l'annuariu
+      name: Hashtag
+      title: Hashtag
+      unhide: Mustrà in l'annuariu
+      visible: Visibile
    title: Amministrazione
  admin_mailer:
    new_report:
@ -517,6 +527,15 @@ co:
    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
+  directories:
+    directory: Annuariu di i prufili
+    explanation: Scopre utilizatori à partesi di i so centri d'interessu
+    explore_mastodon: Scopre à %{title}
+    most_popular: I più pupulari
+    most_recently_active: Attività a più fresca
+    people:
+      one: "%{count} persona"
+      other: "%{count} persone"
  errors:
    '403': Ùn site micca auturizatu·a à vede sta pagina.
    '404': Sta pagina ùn esiste micca.
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -31,7 +31,7 @@ cs:
    privacy_policy: Zásady soukromí
    source_code: Zdrojový kód
    status_count_after:
-      few: příspěvků
+      few: příspěvky
      one: příspěvek
      other: příspěvků
    status_count_before: Kteří napsali
@ -48,9 +48,10 @@ cs:
    followers:
      few: Sledovatelé
      one: Sledovatel
-      other: Sledovatelé
+      other: Sledovatelů
    following: Sledovaných
    joined: Připojil/a se v %{date}
+    last_active: naposledy aktivní
    link_verified_on: Vlastnictví tohoto odkazu bylo zkontrolováno %{date}
    media: Média
    moved_html: 'Účet %{name} byl přesunut na %{new_profile_link}:'
@ -63,7 +64,7 @@ cs:
    posts:
      few: Tooty
      one: Toot
-      other: Tooty
+      other: Tootů
    posts_tab_heading: Tooty
    posts_with_replies: Tooty a odpovědi
    reserved_username: Toto uživatelské jméno je rezervováno
@ -118,6 +119,7 @@ cs:
      media_attachments: Mediální přílohy
      memorialize: Změnit na „in memoriam“
      moderation:
+        active: Aktivní
        all: Vše
        silenced: Utišen/a
        suspended: Suspendován/a
@ -272,7 +274,7 @@ cs:
      severity: Přísnost
      show:
        affected_accounts:
-          few: "%{count} účtů v databázi bylo ovlivněno"
+          few: "%{count} účty v databázi byly ovlivněny"
          one: Jeden účet v databázi byl ovlivněn
          other: "%{count} účtů v databázi bylo ovlivněno"
        retroactive:
@ -444,6 +446,14 @@ cs:
      proceed: Pokračovat
      title: Suspendovat účet %{acct}
      warning_html: 'Suspenzace tohoto účtu <strong>nenávratně</strong> smaže z tohoto účtu data, včetně:'
+    tags:
+      accounts: Účty
+      hidden: Skryté
+      hide: Skrýt z adresáře
+      name: Hashtag
+      title: Hashtagy
+      unhide: Zobrazit v adresáři
+      visible: Viditelné
    title: Administrace
  admin_mailer:
    new_report:
@ -522,6 +532,16 @@ cs:
    success_msg: Váš účet byl úspěšně odstraněn
    warning_html: Pouze vymazání obsahu z této konkrétní instance je zaručeno. Obsah, který byl široce sdílen, po sobě pravděpodobně zanechá stopy. U offline serverů a serverů, které vaše aktualizace již neodebírají, nebudou databáze aktualizovány.
    warning_title: Dostupnost rozšířeného obsahu
+  directories:
+    directory: Adresář profilů
+    explanation: Objevujte uživatele podle jejich zájmů
+    explore_mastodon: Prozkoumejte %{title}
+    most_popular: Nejpopulárnější
+    most_recently_active: Naposledy aktivní
+    people:
+      few: "%{count} lidé"
+      one: "%{count} člověk"
+      other: "%{count} lidí"
  errors:
    '403': Nemáte povolení zobrazit tuto stránku.
    '404': Stránka, kterou hledáte, neexistuje.
@ -570,9 +590,9 @@ cs:
    lock_link: Zamkněte svůj účet
    purge: Odstranit ze sledovatelů
    success:
-      few: V průběhu blokování sledovatelů z %{count} domény...
+      few: V průběhu blokování sledovatelů ze %{count} domén...
      one: V průběhu blokování sledovatelů z jedné domény...
-      other: V průběhu blokování sledovatelů z %{count} domény...
+      other: V průběhu blokování sledovatelů z %{count} domén...
    true_privacy_html: Berte prosím na vědomí, že <strong>skutečného soukromí se dá dosáhnout pouze za pomoci end-to-end šifrování</strong>.
    unlocked_warning_html: Kdokoliv vás může sledovat a okamžitě vidět vaše soukromé příspěvky. %{lock_link}, abyste mohl/a zkontrolovat a odmítnout sledovatele.
    unlocked_warning_title: Váš účet není zamknutý
@ -585,7 +605,7 @@ cs:
    copy: Kopírovat
    save_changes: Uložit změny
    validation_errors:
-      few: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyb níže
+      few: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyby níže
      one: Něco ještě není úplně v pořádku! Prosím zkontrolujte chybu níže
      other: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyb níže
  imports:
@ -640,11 +660,11 @@ cs:
      body: Zde najdete stručný souhrn zpráv, které jste zmeškal/a od vaší poslední návštěvy %{since}
      mention: "%{name} vás zmínil/a v:"
      new_followers_summary:
-        few: Navíc jste získal/a %{count} nových sledovatelů, zatímco jste byl/a pryč! Hurá!
+        few: Navíc jste získal/a %{count} nové sledovatele, zatímco jste byl/a pryč! Hurá!
        one: Navíc jste získal/a jednoho nového sledovatele, zatímco jste byl/a pryč! Hurá!
        other: Navíc jste získal/a %{count} nových sledovatelů, zatímco jste byl/a pryč! Hurá!
      subject:
-        few: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
+        few: "%{count} nová oznámení od vaší poslední návštěvy \U0001F418"
        one: "1 nové oznámení od vaší poslední návštěvy \U0001F418"
        other: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
      title: Ve vaší nepřítomnosti...
@ -764,11 +784,11 @@ cs:
    attached:
      description: 'Přiloženo: %{attached}'
      image:
-        few: "%{count} obrázků"
+        few: "%{count} obrázky"
        one: "%{count} obrázek"
        other: "%{count} obrázků"
      video:
-        few: "%{count} videí"
+        few: "%{count} videa"
        one: "%{count} video"
        other: "%{count} videí"
    boosted_from_html: Boostnuto z %{acct_link}
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -48,6 +48,7 @@ de:
      other: Follower
    following: Folgt
    joined: Beigetreten am %{date}
+    last_active: zuletzt aktiv
    link_verified_on: Besitz des Links wurde überprüft am %{date}
    media: Medien
    moved_html: "%{name} ist auf %{new_profile_link} umgezogen:"
@ -114,6 +115,7 @@ de:
      media_attachments: Medienanhänge
      memorialize: In Gedenkmal verwandeln
      moderation:
+        active: Aktiv
        all: Alle
        silenced: Stummgeschaltet
        suspended: Gesperrt
@ -439,6 +441,14 @@ de:
      proceed: Fortfahren
      title: "%{acct} sperren"
      warning_html: 'Die Sperrung des Benutzerkontos wird <strong>unwiederrufliche</strong> Schäden hervorrufen und alle Daten löschen, die folgendes beinhalten:'
+    tags:
+      accounts: Konten
+      hidden: Versteckt
+      hide: Vor Verzeichnis verstecken
+      name: Hashtag
+      title: Hashtags
+      unhide: Zeige in Verzeichnis
+      visible: Sichtbar
    title: Administration
  admin_mailer:
    new_report:
@ -815,7 +825,7 @@ de:

      <h3 id="protect">Wie beschützen wir deine Informationen?</h3>

-      <p>Wir implementieren eine Reihe von Sicherheitsmaßnahmen, um die Sicherheit deiner persönlichen Information sicherzustellen, wenn du persönliche Informationen eingibst, übermittelst oder auf sie zugreifst. Neben anderen Dingen, wird sowohl deine Browsersitzung, als auch der Datenverkehr zischen deinen Anwendungen und der Programmierschnittstelle (API) mit SSL gesichert, dein Passwort wird mit einem starken Einwegalgorithmus gehasht. Du kannst Zwei-Faktor-Authentifizierung aktivieren, um den Zugriff auf dein Konto zusätzlich abzusichern.</p>
+      <p>Wir implementieren eine Reihe von Sicherheitsmaßnahmen, um die Sicherheit deiner persönlichen Information sicherzustellen, wenn du persönliche Informationen eingibst, übermittelst oder auf sie zugreifst. Neben anderen Dingen, wird sowohl deine Browsersitzung, als auch der Datenverkehr zwischen deinen Anwendungen und der Programmierschnittstelle (API) mit SSL gesichert, dein Passwort wird mit einem starken Einwegalgorithmus gehasht. Du kannst Zwei-Faktor-Authentifizierung aktivieren, um den Zugriff auf dein Konto zusätzlich abzusichern.</p>

      <hr class="spacer" />

@ -830,7 +840,7 @@ de:

      <p>Du kannst ein Archiv deines Inhalts anfordern und herunterladen, inkludierend deiner Beiträge, Medienanhänge, Profilbilder und Headerbilder.</p>

-      <p>Du kannst dein Konto unwiderruflich jederzeit löschen.</p>
+      <p>Du kannst dein Konto jederzeit unwiderruflich  löschen.</p>

      <hr class="spacer"/>

@ -864,9 +874,9 @@ de:

      <h3 id="changes">Änderung an unserer Datenschutzerklärung</h3>

-      <p>Wenn wir uns entscheiden, Änderungen an unserer Datenschutzerklärung vorzunehmen, werden wird diese Änderungen auf dieser Seite bekannt geben.</p>
+      <p>Wenn wir uns entscheiden, Änderungen an unserer Datenschutzerklärung vorzunehmen, werden wird diese Änderungen auf dieser Seite bekannt gegeben.</p>

-      <p>Dies ist eine Übersetzung, Irrtümer und Übersetzungsfehler vorbehalten. Im Zweifelsfall gilt die englische Originalversion</p>
+      <p>Dies ist eine Übersetzung, Irrtümer und Übersetzungsfehler vorbehalten. Im Zweifelsfall gilt die englische Originalversion.</p>

      <p>Dieses Dokument ist CC-BY-SA. Es wurde zuletzt aktualisiert am 7. März 2018.</p>

--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@ -78,6 +78,6 @@ cs:
      not_found: nenalezen
      not_locked: nebyl uzamčen
      not_saved:
-        few: "%{count} chyb zabránilo uložení tohoto %{resource}:"
+        few: "%{count} chyby zabránily uložení tohoto %{resource}:"
        one: '1 chyba zabránila uložení tohoto %{resource}:'
        other: "%{count} chyb zabránilo uložení tohoto %{resource}:"
--- a/Show More
+++ b/Show More