Bump version to 2.2.0

Fix padding bug in landing page column header (#6374 )
ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372 )
2018-01-29 01:12:36 +01:00 · 2018-01-29 01:10:59 +01:00 · 2018-01-29 01:06:39 +01:00 · 2018-01-29 00:22:20 +01:00 · 2018-01-28 22:48:09 +09:00 · 2018-01-27 08:51:03 +09:00
496 changed files with 8512 additions and 3393 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -27,6 +27,7 @@ plugins:
    enabled: true
  eslint:
    enabled: true
    channel: eslint-4
  rubocop:
    enabled: true
  scss-lint:
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -17,11 +17,9 @@ plugins:
 parserOptions:
  sourceType: module
  ecmaFeatures:
-    arrowFunctions: true
+    experimentalObjectRestSpread: true
    jsx: true
-    destructuring: true
+  ecmaVersion: 2018
    modules: true
    spread: true
 settings:
  import/extensions:
@@ -109,6 +107,7 @@ rules:
  react/self-closing-comp: error
  jsx-a11y/accessible-emoji: warn
  jsx-a11y/alt-text: warn
  jsx-a11y/anchor-has-content: warn
  jsx-a11y/aria-activedescendant-has-tabindex: warn
  jsx-a11y/aria-props: warn
@@ -119,16 +118,22 @@ rules:
  jsx-a11y/href-no-hash: warn
  jsx-a11y/html-has-lang: warn
  jsx-a11y/iframe-has-title: warn
  jsx-a11y/img-has-alt: warn
  jsx-a11y/img-redundant-alt: warn
  jsx-a11y/interactive-supports-focus: warn
  jsx-a11y/label-has-for: off
  jsx-a11y/mouse-events-have-key-events: warn
  jsx-a11y/no-access-key: warn
  jsx-a11y/no-distracting-elements: warn
  jsx-a11y/no-noninteractive-element-interactions:
  - warn
  - handlers:
    - onClick
  jsx-a11y/no-onchange: warn
  jsx-a11y/no-redundant-roles: warn
-  jsx-a11y/onclick-has-focus: warn
+  jsx-a11y/no-static-element-interactions:
-  jsx-a11y/onclick-has-role: warn
+  - warn
  - handlers:
    - onClick
  jsx-a11y/role-has-required-aria-props: warn
  jsx-a11y/role-supports-aria-props: off
  jsx-a11y/scope: warn
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4.2
+2.5.0
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,10 @@ cache:
  - public/packs-test
  - tmp/cache/babel-loader
 dist: trusty
-sudo: required
+sudo: false
 branches:
  only:
  - master
 notifications:
  email: false
@@ -37,8 +40,8 @@ addons:
    - yarn
 rvm:
  - 2.3.4
  - 2.4.2
  - 2.5.0
 services:
  - redis-server
@@ -49,8 +52,7 @@ install:
  - yarn install
 before_script:
-  - bundle exec rake parallel:create parallel:load_schema parallel:prepare
+  - ./bin/rails parallel:create parallel:load_schema parallel:prepare assets:precompile
  - bundle exec rails assets:precompile
  - ln -s /usr/bin/x86_64-linux-gnu-g++-6 "$HOME/g++"
 script:
--- a/3
+++ b/3
@@ -1,4 +1,4 @@
-FROM ruby:2.4.2-alpine3.6
+FROM ruby:2.5.0-alpine3.7
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
      description="A GNU Social-compatible microblogging server"
@@ -40,6 +40,7 @@ RUN apk -U upgrade \
    protobuf \
    su-exec \
    tini \
    tzdata \
 && update-ca-certificates \
 && mkdir -p /tmp/src /opt \
 && wget -O yarn.tar.gz "https://github.com/yarnpkg/yarn/releases/download/v$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
--- a/9
+++ b/9
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
-ruby '>= 2.3.0', '< 2.5.0'
+ruby '>= 2.3.0', '< 2.6.0'
 gem 'pkg-config', '~> 1.2'
@@ -28,15 +28,15 @@ gem 'browser'
 gem 'charlock_holmes', '~> 0.7.5'
 gem 'iso-639'
 gem 'cld3', '~> 3.2.0'
-gem 'devise', '~> 4.3'
+gem 'devise', '~> 4.4'
 gem 'devise-two-factor', '~> 3.0'
 gem 'doorkeeper', '~> 4.2'
 gem 'fast_blank', '~> 1.0'
-gem 'goldfinger', '~> 2.0'
+gem 'goldfinger', '~> 2.1'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 2.2'
+gem 'http', '~> 3.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 0.99'
 gem 'idn-ruby', require: 'idn'
@@ -49,6 +49,7 @@ gem 'oj', '~> 3.3'
 gem 'ostatus2', '~> 2.0'
 gem 'ox', '~> 2.8'
 gem 'pundit', '~> 1.1'
 gem 'premailer-rails'
 gem 'rack-attack', '~> 5.0'
 gem 'rack-cors', '~> 0.4', require: 'rack/cors'
 gem 'rack-timeout', '~> 0.4'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
      coderay (>= 1.0.0)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
    bootsnap (1.1.5)
      msgpack (~> 1.0)
@@ -110,7 +110,7 @@ GEM
      activesupport
    charlock_holmes (0.7.5)
    chunky_png (1.3.8)
-    cld3 (3.2.1)
+    cld3 (3.2.2)
      ffi (>= 1.1.0, < 1.10.0)
    climate_control (0.2.0)
    cocaine (0.5.8)
@@ -122,8 +122,10 @@ GEM
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    crass (1.0.3)
    css_parser (1.6.0)
      addressable
    debug_inspector (0.0.3)
-    devise (4.3.0)
+    devise (4.4.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0, < 5.2)
@@ -179,9 +181,9 @@ GEM
      ruby-progressbar (~> 1.4)
    globalid (0.4.1)
      activesupport (>= 4.2.0)
-    goldfinger (2.0.1)
+    goldfinger (2.1.0)
      addressable (~> 2.5)
-      http (~> 2.2)
+      http (~> 3.0)
      nokogiri (~> 1.8)
      oj (~> 3.0)
    hamlit (2.8.5)
@@ -200,14 +202,14 @@ GEM
    hiredis (0.6.1)
    hkdf (0.3.0)
    htmlentities (4.3.4)
-    http (2.2.2)
+    http (3.0.0)
      addressable (~> 2.3)
      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
+      http-form_data (>= 2.0.0.pre.pre2, < 3)
      http_parser.rb (~> 0.6.0)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
-    http-form_data (1.0.3)
+    http-form_data (2.0.0)
    http_accept_language (2.1.1)
    http_parser.rb (0.6.0)
    httplog (0.99.7)
@@ -298,12 +300,12 @@ GEM
      concurrent-ruby (~> 1.0.0)
      sidekiq (>= 3.5.0)
      statsd-ruby (~> 1.2.0)
-    oj (3.3.9)
+    oj (3.3.10)
    orm_adapter (0.5.0)
-    ostatus2 (2.0.2)
+    ostatus2 (2.0.3)
-      addressable (~> 2.4)
+      addressable (~> 2.5)
-      http (~> 2.0)
+      http (~> 3.0)
-      nokogiri (~> 1.6)
+      nokogiri (~> 1.8)
    ox (2.8.2)
    paperclip (5.1.0)
      activemodel (>= 4.2.0)
@@ -324,6 +326,13 @@ GEM
      activerecord
    pkg-config (1.2.8)
    powerpack (0.1.1)
    premailer (1.11.1)
      addressable
      css_parser (>= 1.6.0)
      htmlentities (>= 4.0.0)
    premailer-rails (1.10.1)
      actionmailer (>= 3, < 6)
      premailer (~> 1.7, >= 1.7.9)
    pry (0.11.3)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
@@ -559,7 +568,7 @@ DEPENDENCIES
  charlock_holmes (~> 0.7.5)
  cld3 (~> 3.2.0)
  climate_control (~> 0.2)
-  devise (~> 4.3)
+  devise (~> 4.4)
  devise-two-factor (~> 3.0)
  doorkeeper (~> 4.2)
  dotenv-rails (~> 2.2)
@@ -570,11 +579,11 @@ DEPENDENCIES
  fog-local (~> 0.4)
  fog-openstack (~> 0.1)
  fuubar (~> 2.2)
-  goldfinger (~> 2.0)
+  goldfinger (~> 2.1)
  hamlit-rails (~> 0.2)
  hiredis (~> 0.6)
  htmlentities (~> 4.3)
-  http (~> 2.2)
+  http (~> 3.0)
  http_accept_language (~> 2.1)
  httplog (~> 0.99)
  i18n-tasks (~> 0.9)
@@ -600,6 +609,7 @@ DEPENDENCIES
  pg (~> 0.20)
  pghero (~> 1.7)
  pkg-config (~> 1.2)
  premailer-rails
  pry-rails (~> 0.3)
  puma (~> 3.10)
  pundit (~> 1.1)
@@ -639,7 +649,7 @@ DEPENDENCIES
  webpush
 RUBY VERSION
-   ruby 2.4.2p198
+   ruby 2.5.0p0
 BUNDLED WITH
   1.16.1
--- a/app/controllers/activitypub/follows_controller.rb
+++ b/app/controllers/activitypub/follows_controller.rb
@@ -1,22 +0,0 @@
 # frozen_string_literal: true
 class ActivityPub::FollowsController < Api::BaseController
  include SignatureVerification
  def show
    render json: follow_request,
           serializer: ActivityPub::FollowSerializer,
           adapter: ActivityPub::Adapter,
           content_type: 'application/activity+json'
  end
  private
  def follow_request
    FollowRequest.includes(:account).references(:account).find_by!(
      id: params.require(:id),
      accounts: { domain: nil, username: params.require(:account_username) },
      target_account: signed_request_account
    )
  end
 end
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::InboxesController < Api::BaseController
  def upgrade_account
    if signed_request_account.ostatus?
      signed_request_account.update(last_webfingered_at: nil)
-      ResolveRemoteAccountWorker.perform_async(signed_request_account.acct)
+      ResolveAccountWorker.perform_async(signed_request_account.acct)
    end
    Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed?
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -6,8 +6,8 @@ class Api::BaseController < ApplicationController
  include RateLimitHeaders
  skip_before_action :verify_authenticity_token
  skip_before_action :store_current_location
  protect_from_forgery with: :null_session
  rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
    render json: { error: e.to_s }, status: 422
--- a/app/controllers/api/v1/instances/activity_controller.rb
+++ b/app/controllers/api/v1/instances/activity_controller.rb
@@ -21,9 +21,9 @@ class Api::V1::Instances::ActivityController < Api::BaseController
      weeks << {
        week: week.to_time.to_i.to_s,
-        statuses: Redis.current.get("activity:statuses:local:#{week_id}") || 0,
+        statuses: Redis.current.get("activity:statuses:local:#{week_id}") || '0',
-        logins: Redis.current.pfcount("activity:logins:#{week_id}"),
+        logins: Redis.current.pfcount("activity:logins:#{week_id}").to_s,
-        registrations: Redis.current.get("activity:accounts:local:#{week_id}") || 0,
+        registrations: Redis.current.get("activity:accounts:local:#{week_id}") || '0',
      }
    end
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -9,7 +9,11 @@ class Api::V1::Timelines::HomeController < Api::BaseController
  def show
    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+
    render json: @statuses,
           each_serializer: REST::StatusSerializer,
           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
           status: regeneration_in_progress? ? 206 : 200
  end
  private
@@ -57,4 +61,8 @@ class Api::V1::Timelines::HomeController < Api::BaseController
  def pagination_since_id
    @statuses.first.id
  end
  def regeneration_in_progress?
    Redis.current.exists("account:#{current_account.id}:regeneration")
  end
 end
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -4,6 +4,7 @@ class Api::Web::PushSubscriptionsController < Api::BaseController
  respond_to :json
  before_action :require_user!
  protect_from_forgery with: :exception
  def create
    params.require(:subscription).require(:endpoint)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base
  private
  def https_enabled?
-    Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'
+    Rails.env.production?
  end
  def store_current_location
@@ -124,15 +124,15 @@ class ApplicationController < ActionController::Base
  def render_cached_json(cache_key, **options)
    options[:expires_in] ||= 3.minutes
    options[:public]     ||= true
    cache_key              = cache_key.join(':') if cache_key.is_a?(Enumerable)
    cache_public           = options.key?(:public) ? options.delete(:public) : true
    content_type           = options.delete(:content_type) || 'application/json'
    data = Rails.cache.fetch(cache_key, { raw: true }.merge(options)) do
      yield.to_json
    end
-    expires_in options[:expires_in], public: options[:public]
+    expires_in options[:expires_in], public: cache_public
    render json: data, content_type: content_type
  end
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -41,7 +41,7 @@ class AuthorizeFollowsController < ApplicationController
  end
  def account_from_remote_follow
-    ResolveRemoteAccountService.new.call(acct_without_prefix)
+    ResolveAccountService.new.call(acct_without_prefix)
  end
  def acct_param_is_url?
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -114,7 +114,7 @@ module SignatureVerification
  def account_from_key_id(key_id)
    if key_id.start_with?('acct:')
-      ResolveRemoteAccountService.new.call(key_id.gsub(/\Aacct:/, ''))
+      ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, ''))
    elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
      account   = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
      account ||= ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false)
--- a/app/controllers/concerns/user_tracking_concern.rb
+++ b/app/controllers/concerns/user_tracking_concern.rb
@@ -3,7 +3,6 @@
 module UserTrackingConcern
  extend ActiveSupport::Concern
  REGENERATE_FEED_DAYS = 14
  UPDATE_SIGN_IN_HOURS = 24
  included do
@@ -14,25 +13,10 @@ module UserTrackingConcern
  def set_user_activity
    return unless user_needs_sign_in_update?
    # Mark as signed-in today
    current_user.update_tracked_fields!(request)
    ActivityTracker.record('activity:logins', current_user.id)
    # Regenerate feed if needed
    regenerate_feed! if user_needs_feed_update?
  end
  def user_needs_sign_in_update?
    user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago)
  end
  def user_needs_feed_update?
    current_user.last_sign_in_at < REGENERATE_FEED_DAYS.days.ago
  end
  def regenerate_feed!
    Redis.current.setnx("account:#{current_user.account_id}:regeneration", true) == 1 && Redis.current.expire("account:#{current_user.account_id}:regeneration", 3_600 * 24)
    RegenerationWorker.perform_async(current_user.account_id)
  end
 end
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -6,6 +6,7 @@ module Settings
      layout 'admin'
      before_action :authenticate_user!
      before_action :ensure_otp_secret
      def new
        prepare_two_factor_form
@@ -38,6 +39,10 @@ module Settings
        @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Rails.configuration.x.local_domain)
        @qrcode = RQRCode::QRCode.new(@provision_url)
      end
      def ensure_otp_secret
        redirect_to settings_two_factor_authentication_path unless current_user.otp_secret
      end
    end
  end
 end
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -14,13 +14,14 @@ class SharesController < ApplicationController
  private
  def initial_state_params
    text = [params[:title], params[:text], params[:url]].compact.join(' ')
    {
      settings: Web::Setting.find_by(user: current_user)&.data || {},
      push_subscription: current_account.user.web_push_subscription(current_session),
      current_account: current_account,
      token: current_session.token,
      admin: Account.find_local(Setting.site_contact_username),
-      text: params[:text],
+      text: text,
    }
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -22,10 +22,18 @@ module ApplicationHelper
  end
  def add_rtl_body_class(other_classes)
-    other_classes = "#{other_classes} rtl" if [:ar, :fa, :he].include?(I18n.locale)
+    other_classes = "#{other_classes} rtl" if locale_direction == 'rtl'
    other_classes
  end
  def locale_direction
    if [:ar, :fa, :he].include?(I18n.locale)
      'rtl'
    else
      'ltr'
    end
  end
  def favicon_path
    env_suffix = Rails.env.production? ? '' : '-dev'
    "/favicon#{env_suffix}.ico"
--- a/app/helpers/instance_helper.rb
+++ b/app/helpers/instance_helper.rb
@@ -6,6 +6,6 @@ module InstanceHelper
  end
  def site_hostname
-    Rails.configuration.x.local_domain
+    @site_hostname ||= Addressable::URI.parse("//#{Rails.configuration.x.local_domain}").display_uri.host
  end
 end
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -39,6 +39,10 @@ module JsonLdHelper
    !json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
  end
  def unsupported_uri_scheme?(uri)
    !uri.start_with?('http://', 'https://')
  end
  def canonicalize(json)
    graph = RDF::Graph.new << JSON::LD::API.toRdf(json)
    graph.dump(:normalize)
--- a/app/helpers/mailer_helper.rb
+++ b/app/helpers/mailer_helper.rb
@@ -0,0 +1,4 @@
 # frozen_string_literal: true
 module MailerHelper
 end
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -16,6 +16,7 @@ module SettingsHelper
    he: 'עברית',
    hr: 'Hrvatski',
    hu: 'Magyar',
    hy: 'Հայերեն',
    id: 'Bahasa Indonesia',
    io: 'Ido',
    it: 'Italiano',
--- a/app/javascript/images/elephant-friend-1.png
+++ b/app/javascript/images/elephant-friend-1.png
--- a/app/javascript/images/elephant-friend.png
+++ b/app/javascript/images/elephant-friend.png
--- a/app/javascript/images/elephant_ui_disappointed.svg
+++ b/app/javascript/images/elephant_ui_disappointed.svg
--- a/app/javascript/images/elephant_ui_greeting.svg
+++ b/app/javascript/images/elephant_ui_greeting.svg
--- a/app/javascript/images/elephant_ui_plane.svg
+++ b/app/javascript/images/elephant_ui_plane.svg
--- a/app/javascript/images/elephant_ui_working.svg
+++ b/app/javascript/images/elephant_ui_working.svg
--- a/app/javascript/images/icon_cached.svg
+++ b/app/javascript/images/icon_cached.svg
@@ -0,0 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg width="2048" height="1792" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1344 1504q0 13-9.5 22.5t-22.5 9.5h-960q-8 0-13.5-2t-9-7-5.5-8-3-11.5-1-11.5v-600h-192q-26 0-45-19t-19-45q0-24 15-41l320-384q19-22 49-22t49 22l320 384q15 17 15 41 0 26-19 45t-45 19h-192v384h576q16 0 25 11l160 192q7 10 7 21zm640-416q0 24-15 41l-320 384q-20 23-49 23t-49-23l-320-384q-15-17-15-41 0-26 19-45t45-19h192v-384h-576q-16 0-25-12l-160-192q-7-9-7-20 0-13 9.5-22.5t22.5-9.5h960q8 0 13.5 2t9 7 5.5 8 3 11.5 1 11.5v600h192q26 0 45 19t19 45z" fill="#fff"/></svg>
--- a/app/javascript/images/icon_done.svg
+++ b/app/javascript/images/icon_done.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M0 0h24v24H0z" fill="none"/>
    <path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"/>
 </svg>
--- a/app/javascript/images/icon_email.svg
+++ b/app/javascript/images/icon_email.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/>
    <path d="M0 0h24v24H0z" fill="none"/>
 </svg>
--- a/app/javascript/images/icon_grade.svg
+++ b/app/javascript/images/icon_grade.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/>
    <path d="M0 0h24v24H0z" fill="none"/>
 </svg>
--- a/app/javascript/images/icon_lock_open.svg
+++ b/app/javascript/images/icon_lock_open.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M0 0h24v24H0z" fill="none"/>
    <path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z"/>
 </svg>
--- a/app/javascript/images/icon_person_add.svg
+++ b/app/javascript/images/icon_person_add.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M0 0h24v24H0z" fill="none"/>
    <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
 </svg>
--- a/app/javascript/images/icon_reply.svg
+++ b/app/javascript/images/icon_reply.svg
@@ -0,0 +1,4 @@
 <svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
    <path d="M10 9V5l-7 7 7 7v-4.1c5 0 8.5 1.6 11 5.1-1-5-4-10-11-11z"/>
    <path d="M0 0h24v24H0z" fill="none"/>
 </svg>
--- a/app/javascript/images/logo_transparent.svg
+++ b/app/javascript/images/logo_transparent.svg
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#fff"/></svg>
--- a/app/javascript/images/mailer/icon_cached.png
+++ b/app/javascript/images/mailer/icon_cached.png
--- a/app/javascript/images/mailer/icon_done.png
+++ b/app/javascript/images/mailer/icon_done.png
--- a/app/javascript/images/mailer/icon_email.png
+++ b/app/javascript/images/mailer/icon_email.png
--- a/app/javascript/images/mailer/icon_grade.png
+++ b/app/javascript/images/mailer/icon_grade.png
--- a/app/javascript/images/mailer/icon_lock_open.png
+++ b/app/javascript/images/mailer/icon_lock_open.png
--- a/app/javascript/images/mailer/icon_person_add.png
+++ b/app/javascript/images/mailer/icon_person_add.png
--- a/app/javascript/images/mailer/icon_reply.png
+++ b/app/javascript/images/mailer/icon_reply.png
--- a/app/javascript/images/mailer/logo_full.png
+++ b/app/javascript/images/mailer/logo_full.png
--- a/app/javascript/images/mailer/logo_transparent.png
+++ b/app/javascript/images/mailer/logo_transparent.png
--- a/app/javascript/images/mastodon-not-found.png
+++ b/app/javascript/images/mastodon-not-found.png
--- a/app/javascript/images/mastodon-ui.png
+++ b/app/javascript/images/mastodon-ui.png
--- a/app/javascript/images/wave-compose-standalone.png
+++ b/app/javascript/images/wave-compose-standalone.png
--- a/app/javascript/images/wave-drawer.png
+++ b/app/javascript/images/wave-drawer.png
--- a/app/javascript/images/wave-modal.png
+++ b/app/javascript/images/wave-modal.png
--- a/app/javascript/mastodon/actions/push_notifications/registerer.js
+++ b/app/javascript/mastodon/actions/push_notifications/registerer.js
@@ -1,6 +1,7 @@
-import axios from 'axios';
+import api from '../../api';
 import { pushNotificationsSetting } from '../../settings';
 import { setBrowserSupport, setSubscription, clearSubscription } from './setter';
 import { me } from '../../initial_state';
 // Taken from https://www.npmjs.com/package/web-push
 const urlBase64ToUint8Array = (base64String) => {
@@ -35,7 +36,7 @@ const subscribe = (registration) =>
 const unsubscribe = ({ registration, subscription }) =>
  subscription ? subscription.unsubscribe().then(() => registration) : registration;
-const sendSubscriptionToBackend = (subscription, me) => {
+const sendSubscriptionToBackend = (getState, subscription) => {
  const params = { subscription };
  if (me) {
@@ -45,7 +46,7 @@ const sendSubscriptionToBackend = (subscription, me) => {
    }
  }
-  return axios.post('/api/web/push_subscriptions', params).then(response => response.data);
+  return api(getState).post('/api/web/push_subscriptions', params).then(response => response.data);
 };
 // Last one checks for payload support: https://web-push-book.gauntface.com/chapter-06/01-non-standards-browsers/#no-payload
@@ -54,7 +55,6 @@ const supportsPushNotifications = ('serviceWorker' in navigator && 'PushManager'
 export function register () {
  return (dispatch, getState) => {
    dispatch(setBrowserSupport(supportsPushNotifications));
    const me = getState().getIn(['meta', 'me']);
    if (me && !pushNotificationsSetting.get(me)) {
      const alerts = getState().getIn(['push_notifications', 'alerts']);
@@ -85,13 +85,13 @@ export function register () {
            } else {
              // Something went wrong, try to subscribe again
              return unsubscribe({ registration, subscription }).then(subscribe).then(
-                subscription => sendSubscriptionToBackend(subscription, me));
+                subscription => sendSubscriptionToBackend(getState, subscription));
            }
          }
          // No subscription, try to subscribe
          return subscribe(registration).then(
-            subscription => sendSubscriptionToBackend(subscription, me));
+            subscription => sendSubscriptionToBackend(getState, subscription));
        })
        .then(subscription => {
          // If we got a PushSubscription (and not a subscription object from the backend)
@@ -137,10 +137,9 @@ export function saveSettings() {
    const alerts = state.get('alerts');
    const data = { alerts };
-    axios.put(`/api/web/push_subscriptions/${subscription.get('id')}`, {
+    api(getState).put(`/api/web/push_subscriptions/${subscription.get('id')}`, {
      data,
    }).then(() => {
      const me = getState().getIn(['meta', 'me']);
      if (me) {
        pushNotificationsSetting.set(me, data);
      }
--- a/app/javascript/mastodon/actions/settings.js
+++ b/app/javascript/mastodon/actions/settings.js
@@ -1,4 +1,4 @@
-import axios from 'axios';
+import api from '../api';
 import { debounce } from 'lodash';
 export const SETTING_CHANGE = 'SETTING_CHANGE';
@@ -23,7 +23,7 @@ const debouncedSave = debounce((dispatch, getState) => {
  const data = getState().get('settings').filter((_, path) => path !== 'saved').toJS();
-  axios.put('/api/web/settings', { data }).then(() => dispatch({ type: SETTING_SAVE }));
+  api(getState).put('/api/web/settings', { data }).then(() => dispatch({ type: SETTING_SAVE }));
 }, 5000, { trailing: true });
 export function saveSettings() {
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -19,13 +19,14 @@ export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONTEXT_UPDATE = 'CONTEXT_UPDATE';
-export function refreshTimelineSuccess(timeline, statuses, skipLoading, next) {
+export function refreshTimelineSuccess(timeline, statuses, skipLoading, next, partial) {
  return {
    type: TIMELINE_REFRESH_SUCCESS,
    timeline,
    statuses,
    skipLoading,
    next,
    partial,
  };
 };
@@ -88,7 +89,7 @@ export function refreshTimeline(timelineId, path, params = {}) {
  return function (dispatch, getState) {
    const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
-    if (timeline.get('isLoading') || timeline.get('online')) {
+    if (timeline.get('isLoading') || (timeline.get('online') && !timeline.get('isPartial'))) {
      return;
    }
@@ -104,8 +105,12 @@ export function refreshTimeline(timelineId, path, params = {}) {
    dispatch(refreshTimelineRequest(timelineId, skipLoading));
    api(getState).get(path, { params }).then(response => {
      if (response.status === 206) {
        dispatch(refreshTimelineSuccess(timelineId, [], skipLoading, null, true));
      } else {
        const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(refreshTimelineSuccess(timelineId, response.data, skipLoading, next ? next.uri : null));
+        dispatch(refreshTimelineSuccess(timelineId, response.data, skipLoading, next ? next.uri : null, false));
      }
    }).catch(error => {
      dispatch(refreshTimelineFail(timelineId, error, skipLoading));
    });
--- a/app/javascript/mastodon/api.js
+++ b/app/javascript/mastodon/api.js
@@ -1,4 +1,5 @@
 import axios from 'axios';
 import ready from './ready';
 import LinkHeader from './link_header';
 export const getLinks = response => {
@@ -11,10 +12,17 @@ export const getLinks = response => {
  return LinkHeader.parse(value);
 };
 let csrfHeader = {};
 function setCSRFHeader() {
  const csrfToken = document.querySelector('meta[name=csrf-token]').content;
  csrfHeader['X-CSRF-Token'] = csrfToken;
 }
 ready(setCSRFHeader);
 export default getState => axios.create({
-  headers: {
+  headers: Object.assign(csrfHeader, getState ? {
    'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`,
-  },
+  } : {}),
  transformResponse: [function (data) {
    try {
--- a/app/javascript/mastodon/components/tests/snapshots/display_name-test.js.snap
+++ b/app/javascript/mastodon/components/tests/snapshots/display_name-test.js.snap
@@ -4,6 +4,7 @@ exports[`<DisplayName /> renders display name + account name 1`] = `
 <span
  className="display-name"
 >
  <bdi>
    <strong
      className="display-name__html"
      dangerouslySetInnerHTML={
@@ -12,6 +13,7 @@ exports[`<DisplayName /> renders display name + account name 1`] = `
        }
      }
    />
  </bdi>
  <span
    className="display-name__account"
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -93,7 +93,7 @@ export default class Account extends ImmutablePureComponent {
            {hidingNotificationsButton}
          </Fragment>
        );
-      } else if (!account.get('moved')) {
+      } else if (!account.get('moved') || following) {
        buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
      }
    }
--- a/app/javascript/mastodon/components/attachment_list.js
+++ b/app/javascript/mastodon/components/attachment_list.js
@@ -20,11 +20,11 @@ export default class AttachmentList extends ImmutablePureComponent {
        </div>
        <ul className='attachment-list__list'>
-          {media.map(attachment =>
+          {media.map(attachment => (
            <li key={attachment.get('id')}>
              <a href={attachment.get('remote_url')} target='_blank' rel='noopener'>{filename(attachment.get('remote_url'))}</a>
            </li>
-          )}
+          ))}
        </ul>
      </div>
    );
--- a/app/javascript/mastodon/components/collapsable.js
+++ b/app/javascript/mastodon/components/collapsable.js
@@ -5,11 +5,11 @@ import PropTypes from 'prop-types';
 const Collapsable = ({ fullHeight, isVisible, children }) => (
  <Motion defaultStyle={{ opacity: !isVisible ? 0 : 100, height: isVisible ? fullHeight : 0 }} style={{ opacity: spring(!isVisible ? 0 : 100), height: spring(!isVisible ? 0 : fullHeight) }}>
-    {({ opacity, height }) =>
+    {({ opacity, height }) => (
      <div style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100, display: Math.floor(opacity) === 0 ? 'none' : 'block' }}>
        {children}
      </div>
-    }
+    )}
  </Motion>
 );
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -23,7 +23,6 @@ export default class ColumnHeader extends React.PureComponent {
    icon: PropTypes.string.isRequired,
    active: PropTypes.bool,
    multiColumn: PropTypes.bool,
    focusable: PropTypes.bool,
    showBackButton: PropTypes.bool,
    children: PropTypes.node,
    pinned: PropTypes.bool,
@@ -32,10 +31,6 @@ export default class ColumnHeader extends React.PureComponent {
    onClick: PropTypes.func,
  };
  static defaultProps = {
    focusable: true,
  }
  state = {
    collapsed: true,
    animating: false,
@@ -68,7 +63,7 @@ export default class ColumnHeader extends React.PureComponent {
  }
  render () {
-    const { title, icon, active, children, pinned, onPin, multiColumn, focusable, showBackButton, intl: { formatMessage } } = this.props;
+    const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage } } = this.props;
    const { collapsed, animating } = this.state;
    const wrapperClassName = classNames('column-header__wrapper', {
@@ -135,11 +130,13 @@ export default class ColumnHeader extends React.PureComponent {
    return (
      <div className={wrapperClassName}>
-        <h1 tabIndex={focusable ? 0 : null} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
+        <h1 className={buttonClassName}>
          <button onClick={this.handleTitleClick}>
            <i className={`fa fa-fw fa-${icon} column-header__icon`} />
            <span className='column-header__title'>
              {title}
            </span>
          </button>
          <div className='column-header__buttons'>
            {backButton}
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -12,7 +12,7 @@ export default class DisplayName extends React.PureComponent {
    return (
      <span className='display-name'>
-        <strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
+        <bdi><strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /></bdi> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
      </span>
    );
  }
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -93,7 +93,7 @@ export default class IconButton extends React.PureComponent {
    return (
      <Motion defaultStyle={{ rotate: active ? -360 : 0 }} style={{ rotate: animate ? spring(active ? -360 : 0, { stiffness: 120, damping: 7 }) : 0 }}>
-        {({ rotate }) =>
+        {({ rotate }) => (
          <button
            aria-label={title}
            aria-pressed={pressed}
@@ -106,7 +106,7 @@ export default class IconButton extends React.PureComponent {
          >
            <i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${icon}`} aria-hidden='true' />
          </button>
-        }
+        )}
      </Motion>
    );
  }
--- a/app/javascript/mastodon/components/missing_indicator.js
+++ b/app/javascript/mastodon/components/missing_indicator.js
@@ -2,9 +2,14 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 const MissingIndicator = () => (
-  <div className='missing-indicator'>
+  <div className='regeneration-indicator missing-indicator'>
    <div>
-      <FormattedMessage id='missing_indicator.label' defaultMessage='Not found' />
+      <div className='regeneration-indicator__figure' />
      <div className='regeneration-indicator__label'>
        <FormattedMessage id='missing_indicator.label' tagName='strong' defaultMessage='Not found' />
        <FormattedMessage id='missing_indicator.sublabel' defaultMessage='This resource could not be found' />
      </div>
    </div>
  </div>
 );
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -162,7 +162,7 @@ export default class Status extends ImmutablePureComponent {
      prepend = (
        <div className='status__prepend'>
          <div className='status__prepend-icon-wrapper'><i className='fa fa-fw fa-retweet status__prepend-icon' /></div>
-          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><strong dangerouslySetInnerHTML={display_name_html} /></a> }} />
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
        </div>
      );
@@ -178,14 +178,16 @@ export default class Status extends ImmutablePureComponent {
        media = (
          <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
-            {Component => <Component
+            {Component => (
              <Component
                preview={video.get('preview_url')}
                src={video.get('url')}
                width={239}
                height={110}
                sensitive={status.get('sensitive')}
                onOpenVideo={this.handleOpenVideo}
-            />}
+              />
            )}
          </Bundle>
        );
      } else {
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import StatusContainer from '../containers/status_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import ScrollableList from './scrollable_list';
 import { FormattedMessage } from 'react-intl';
 export default class StatusList extends ImmutablePureComponent {
@@ -16,6 +17,7 @@ export default class StatusList extends ImmutablePureComponent {
    trackScroll: PropTypes.bool,
    shouldUpdateScroll: PropTypes.func,
    isLoading: PropTypes.bool,
    isPartial: PropTypes.bool,
    hasMore: PropTypes.bool,
    prepend: PropTypes.node,
    emptyMessage: PropTypes.node,
@@ -49,7 +51,22 @@ export default class StatusList extends ImmutablePureComponent {
  render () {
    const { statusIds, ...other }  = this.props;
-    const { isLoading } = other;
+    const { isLoading, isPartial } = other;
    if (isPartial) {
      return (
        <div className='regeneration-indicator'>
          <div>
            <div className='regeneration-indicator__figure' />
            <div className='regeneration-indicator__label'>
              <FormattedMessage id='regeneration_indicator.label' tagName='strong' defaultMessage='Loading&hellip;' />
              <FormattedMessage id='regeneration_indicator.sublabel' defaultMessage='Your home feed is being prepared!' />
            </div>
          </div>
        </div>
      );
    }
    const scrollableContent = (isLoading || statusIds.size > 0) ? (
      statusIds.map((statusId) => (
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -41,7 +41,7 @@ class Avatar extends ImmutablePureComponent {
    return (
      <Motion defaultStyle={{ radius: 90 }} style={{ radius: spring(isHovered ? 30 : 90, { stiffness: 180, damping: 12 }) }}>
-        {({ radius }) =>
+        {({ radius }) => (
          <a
            href={account.get('url')}
            className='account__header__avatar'
@@ -56,7 +56,7 @@ class Avatar extends ImmutablePureComponent {
          >
            <span style={{ display: 'none' }}>{account.get('acct')}</span>
          </a>
-        }
+        )}
      </Motion>
    );
  }
@@ -103,7 +103,7 @@ export default class Header extends ImmutablePureComponent {
      }
    }
-    if (account.get('moved')) {
+    if (account.get('moved') && !account.getIn(['relationship', 'following'])) {
      actionBtn = '';
    }
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -94,12 +94,12 @@ export default class AccountGallery extends ImmutablePureComponent {
            </div>
            <div className='account-gallery__container'>
-              {medias.map(media =>
+              {medias.map(media => (
                <MediaItem
                  key={media.get('id')}
                  media={media}
                />
-              )}
+              ))}
              {loadMore}
            </div>
          </div>
--- a/app/javascript/mastodon/features/account_timeline/components/moved_note.js
+++ b/app/javascript/mastodon/features/account_timeline/components/moved_note.js
@@ -34,7 +34,7 @@ export default class MovedNote extends ImmutablePureComponent {
      <div className='account__moved-note'>
        <div className='account__moved-note__message'>
          <div className='account__moved-note__icon-wrapper'><i className='fa fa-fw fa-suitcase account__moved-note__icon' /></div>
-          <FormattedMessage id='account.moved_to' defaultMessage='{name} has moved to:' values={{ name: <strong dangerouslySetInnerHTML={displayNameHtml} /> }} />
+          <FormattedMessage id='account.moved_to' defaultMessage='{name} has moved to:' values={{ name: <bdi><strong dangerouslySetInnerHTML={displayNameHtml} /></bdi> }} />
        </div>
        <a href={to.get('url')} onClick={this.handleAccountClick} className='detailed-status__display-name'>
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -72,7 +72,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
      <Motion defaultStyle={{ opacity: 0, scaleX: 0.85, scaleY: 0.75 }} style={{ opacity: spring(1, { damping: 35, stiffness: 400 }), scaleX: spring(1, { damping: 35, stiffness: 400 }), scaleY: spring(1, { damping: 35, stiffness: 400 }) }}>
        {({ opacity, scaleX, scaleY }) => (
          <div className='privacy-dropdown__dropdown' style={{ ...style, opacity: opacity, transform: `scale(${scaleX}, ${scaleY})` }} ref={this.setRef}>
-            {items.map(item =>
+            {items.map(item => (
              <div role='button' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleClick} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })}>
                <div className='privacy-dropdown__option__icon'>
                  <i className={`fa fa-fw fa-${item.icon}`} />
@@ -83,7 +83,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
                  {item.meta}
                </div>
              </div>
-            )}
+            ))}
          </div>
        )}
      </Motion>
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -40,11 +40,11 @@ export default class SearchResults extends ImmutablePureComponent {
      count += results.get('hashtags').size;
      hashtags = (
        <div className='search-results__section'>
-          {results.get('hashtags').map(hashtag =>
+          {results.get('hashtags').map(hashtag => (
            <Link key={hashtag} className='search-results__hashtag' to={`/timelines/tag/${hashtag}`}>
              #{hashtag}
            </Link>
-          )}
+          ))}
        </div>
      );
    }
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -94,15 +94,15 @@ export default class Compose extends React.PureComponent {
          <div className='drawer__inner' onFocus={this.onFocus}>
            <NavigationContainer onClose={this.onBlur} />
            <ComposeFormContainer />
-            <div className='mastodon' />
+            {multiColumn && <div className='mastodon' />}
          </div>
          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
-            {({ x }) =>
+            {({ x }) => (
              <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
                <SearchResultsContainer />
              </div>
-            }
+            )}
          </Motion>
        </div>
      </div>
--- a/app/javascript/mastodon/features/compose/util/url_regex.js
+++ b/app/javascript/mastodon/features/compose/util/url_regex.js
@@ -168,8 +168,8 @@ export const urlRegex = (function() {
          '#{validGeneralUrlPathChars}*'    +
        ')'                                 +
      ')'                                   +
-    '\\)'
+    '\\)',
-  , 'i');
+    'i');
  // Valid end-of-path chracters (so /foo. does not gobble the period).
  // 1. Allow =&# for empty URL parameters and other URL-join artifacts
  regexen.validUrlPathEndingChars = regexSupplant(/[^#{spaces_group}\(\)\?!\*';:=\,\.\$%\[\]#{pd}~&\|@]|(?:#{validUrlBalancedParens})/i);
@@ -190,7 +190,7 @@ export const urlRegex = (function() {
      '(?::(#{validPortNumber}))?'                               + // $4 Port number (optional)
      '(\\/#{validUrlPath}*)?'                                   + // $5 URL Path
      '(\\?#{validUrlQueryChars}*#{validUrlQueryEndingChars})?'  + // $6 Query String
-    ')'
+    ')',
-  , 'gi');
+    'gi');
  return regexen.validUrl;
 }());
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -8,6 +8,8 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me } from '../../initial_state';
 import { fetchFollowRequests } from '../../actions/accounts';
 import { List as ImmutableList } from 'immutable';
 const messages = defineMessages({
  heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -32,9 +34,25 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
  myAccount: state.getIn(['accounts', me]),
  columns: state.getIn(['settings', 'columns']),
  unreadFollowRequests: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
  unreadNotifications: state.getIn(['notifications', 'unread']),
 });
-@connect(mapStateToProps)
+const mapDispatchToProps = dispatch => ({
  fetchFollowRequests: () => dispatch(fetchFollowRequests()),
 });
 const badgeDisplay = (number, limit) => {
  if (number === 0) {
    return undefined;
  } else if (limit && number >= limit) {
    return `${limit}+`;
  } else {
    return number;
  }
 };
@connect(mapStateToProps, mapDispatchToProps)
@injectIntl
 export default class GettingStarted extends ImmutablePureComponent {
@@ -43,10 +61,21 @@ export default class GettingStarted extends ImmutablePureComponent {
    myAccount: ImmutablePropTypes.map.isRequired,
    columns: ImmutablePropTypes.list,
    multiColumn: PropTypes.bool,
    fetchFollowRequests: PropTypes.func.isRequired,
    unreadFollowRequests: PropTypes.number,
    unreadNotifications: PropTypes.number,
  };
  componentDidMount () {
    const { myAccount, fetchFollowRequests } = this.props;
    if (myAccount.get('locked')) {
      fetchFollowRequests();
    }
  }
  render () {
-    const { intl, myAccount, columns, multiColumn } = this.props;
+    const { intl, myAccount, columns, multiColumn, unreadFollowRequests, unreadNotifications } = this.props;
    const navItems = [];
@@ -56,7 +85,7 @@ export default class GettingStarted extends ImmutablePureComponent {
      }
      if (!columns.find(item => item.get('id') === 'NOTIFICATIONS')) {
-        navItems.push(<ColumnLink key='1' icon='bell' text={intl.formatMessage(messages.notifications)} to='/notifications' />);
+        navItems.push(<ColumnLink key='1' icon='bell' text={intl.formatMessage(messages.notifications)} badge={badgeDisplay(unreadNotifications)} to='/notifications' />);
      }
      if (!columns.find(item => item.get('id') === 'COMMUNITY')) {
@@ -74,7 +103,7 @@ export default class GettingStarted extends ImmutablePureComponent {
    );
    if (myAccount.get('locked')) {
-      navItems.push(<ColumnLink key='6' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />);
+      navItems.push(<ColumnLink key='6' icon='users' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
    }
    if (multiColumn) {
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { expandHomeTimeline } from '../../actions/timelines';
+import { expandHomeTimeline, refreshHomeTimeline } from '../../actions/timelines';
 import PropTypes from 'prop-types';
 import StatusListContainer from '../ui/containers/status_list_container';
 import Column from '../../components/column';
@@ -16,6 +16,7 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
  hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
  isPartial: state.getIn(['timelines', 'home', 'isPartial'], false),
 });
@connect(mapStateToProps)
@@ -26,6 +27,7 @@ export default class HomeTimeline extends React.PureComponent {
    dispatch: PropTypes.func.isRequired,
    intl: PropTypes.object.isRequired,
    hasUnread: PropTypes.bool,
    isPartial: PropTypes.bool,
    columnId: PropTypes.string,
    multiColumn: PropTypes.bool,
  };
@@ -57,6 +59,39 @@ export default class HomeTimeline extends React.PureComponent {
    this.props.dispatch(expandHomeTimeline());
  }
  componentDidMount () {
    this._checkIfReloadNeeded(false, this.props.isPartial);
  }
  componentDidUpdate (prevProps) {
    this._checkIfReloadNeeded(prevProps.isPartial, this.props.isPartial);
  }
  componentWillUnmount () {
    this._stopPolling();
  }
  _checkIfReloadNeeded (wasPartial, isPartial) {
    const { dispatch } = this.props;
    if (wasPartial === isPartial) {
      return;
    } else if (!wasPartial && isPartial) {
      this.polling = setInterval(() => {
        dispatch(refreshHomeTimeline());
      }, 3000);
    } else if (wasPartial && !isPartial) {
      this._stopPolling();
    }
  }
  _stopPolling () {
    if (this.polling) {
      clearInterval(this.polling);
      this.polling = null;
    }
  }
  render () {
    const { intl, hasUnread, columnId, multiColumn } = this.props;
    const pinned = !!columnId;
--- a/app/javascript/mastodon/features/list_editor/index.js
+++ b/app/javascript/mastodon/features/list_editor/index.js
@@ -66,11 +66,11 @@ export default class ListEditor extends ImmutablePureComponent {
          {showSearch && <div role='button' tabIndex='-1' className='drawer__backdrop' onClick={onClear} />}
          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
-            {({ x }) =>
+            {({ x }) => (
              <div className='drawer__inner backdrop' style={{ transform: x === 0 ? null : `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
                {searchAccountIds.map(accountId => <Account key={accountId} accountId={accountId} />)}
              </div>
-            }
+            )}
          </Motion>
        </div>
      </div>
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -120,13 +120,17 @@ export default class ListTimeline extends React.PureComponent {
    if (typeof list === 'undefined') {
      return (
        <Column>
          <div className='scrollable'>
            <LoadingIndicator />
          </div>
        </Column>
      );
    } else if (list === false) {
      return (
        <Column>
          <div className='scrollable'>
            <MissingIndicator />
          </div>
        </Column>
      );
    }
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -133,7 +133,7 @@ export default class Notification extends ImmutablePureComponent {
    const { notification } = this.props;
    const account          = notification.get('account');
    const displayNameHtml  = { __html: account.get('display_name_html') };
-    const link             = <Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHtml} />;
+    const link             = <bdi><Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
    switch(notification.get('type')) {
    case 'follow':
--- a/app/javascript/mastodon/features/ui/components/tests/column-test.js
+++ b/app/javascript/mastodon/features/ui/components/tests/column-test.js
@@ -21,13 +21,13 @@ describe('<Column />', () => {
          <div className='scrollable' />
        </Column>
      );
-      wrapper.find(ColumnHeader).simulate('click');
+      wrapper.find(ColumnHeader).find('button').simulate('click');
      expect(global.requestAnimationFrame.mock.calls.length).toEqual(1);
    });
    it('does not try to scroll if there is no scrollable content', () => {
      const wrapper = mount(<Column heading='notifications' />);
-      wrapper.find(ColumnHeader).simulate('click');
+      wrapper.find(ColumnHeader).find('button').simulate('click');
      expect(global.requestAnimationFrame.mock.calls.length).toEqual(0);
    });
  });
--- a/app/javascript/mastodon/features/ui/components/column_header.js
+++ b/app/javascript/mastodon/features/ui/components/column_header.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 export default class ColumnHeader extends React.PureComponent {
@@ -16,19 +17,20 @@ export default class ColumnHeader extends React.PureComponent {
  }
  render () {
-    const { type, active, columnHeaderId } = this.props;
+    const { icon, type, active, columnHeaderId } = this.props;
    let iconElement = '';
-    let icon = '';
+    if (icon) {
-
+      iconElement = <i className={`fa fa-fw fa-${icon} column-header__icon`} />;
    if (this.props.icon) {
      icon = <i className={`fa fa-fw fa-${this.props.icon} column-header__icon`} />;
    }
    return (
-      <div role='heading' tabIndex='0' className={`column-header ${active ? 'active' : ''}`} onClick={this.handleClick} id={columnHeaderId || null}>
+      <h1 className={classNames('column-header', { active })} id={columnHeaderId || null}>
-        {icon}
+        <button onClick={this.handleClick}>
          {iconElement}
          {type}
-      </div>
+        </button>
      </h1>
    );
  }
--- a/app/javascript/mastodon/features/ui/components/column_link.js
+++ b/app/javascript/mastodon/features/ui/components/column_link.js
@@ -2,12 +2,15 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-const ColumnLink = ({ icon, text, to, href, method }) => {
+const ColumnLink = ({ icon, text, to, href, method, badge }) => {
  const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
  if (href) {
    return (
      <a href={href} className='column-link' data-method={method}>
        <i className={`fa fa-fw fa-${icon} column-link__icon`} />
        {text}
        {badgeElement}
      </a>
    );
  } else {
@@ -15,6 +18,7 @@ const ColumnLink = ({ icon, text, to, href, method }) => {
      <Link to={to} className='column-link'>
        <i className={`fa fa-fw fa-${icon} column-link__icon`} />
        {text}
        {badgeElement}
      </Link>
    );
  }
@@ -26,6 +30,7 @@ ColumnLink.propTypes = {
  to: PropTypes.string,
  href: PropTypes.string,
  method: PropTypes.string,
  badge: PropTypes.node,
 };
 export default ColumnLink;
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -37,6 +37,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
  static propTypes = {
    intl: PropTypes.object.isRequired,
    columns: ImmutablePropTypes.list.isRequired,
    isModalOpen: PropTypes.bool.isRequired,
    singleColumn: PropTypes.bool,
    children: PropTypes.node,
  };
@@ -144,7 +145,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
  }
  render () {
-    const { columns, children, singleColumn } = this.props;
+    const { columns, children, singleColumn, isModalOpen } = this.props;
    const { shouldAnimate } = this.state;
    const columnIndex = getIndex(this.context.router.history.location.pathname);
@@ -159,7 +160,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
    }
    return (
-      <div className='columns-area' ref={this.setRef}>
+      <div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
        {columns.map(column => {
          const params = column.get('params', null) === null ? null : column.get('params').toJS();
--- a/app/javascript/mastodon/features/ui/components/embed_modal.js
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage, injectIntl } from 'react-intl';
-import axios from 'axios';
+import api from '../../../api';
@injectIntl
 export default class EmbedModal extends ImmutablePureComponent {
@@ -23,7 +23,7 @@ export default class EmbedModal extends ImmutablePureComponent {
    this.setState({ loading: true });
-    axios.post('/api/web/embed', { url }).then(res => {
+    api().post('/api/web/embed', { url }).then(res => {
      this.setState({ loading: false, oembed: res.data });
      const iframeDocument = this.iframe.contentWindow.document;
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -113,13 +113,11 @@ export default class ModalRoot extends React.PureComponent {
        <div style={{ pointerEvents: visible ? 'auto' : 'none' }}>
          <div role='presentation' className='modal-root__overlay' onClick={onClose} />
          <div role='dialog' className='modal-root__container'>
-            {
+            {visible && (
-              visible ?
+              <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
                (<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
                {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />}
-                </BundleContainer>) :
+              </BundleContainer>
-              null
+            )}
            }
          </div>
        </div>
      </div>
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -24,14 +24,23 @@ const messages = defineMessages({
 const PageOne = ({ acct, domain }) => (
  <div className='onboarding-modal__page onboarding-modal__page-one'>
-    <div style={{ flex: '0 0 auto' }}>
+    <div className='onboarding-modal__page-one__lead'>
      <div className='onboarding-modal__page-one__elephant-friend' />
    </div>
    <div>
      <h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1>
      <p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.' /></p>
-      <p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, so your full handle is {handle}' values={{ domain, handle: <strong>@{acct}@{domain}</strong> }} /></p>
+    </div>
    <div className='onboarding-modal__page-one__extra'>
      <div className='display-case'>
        <div className='display-case__label'>
          <FormattedMessage id='onboarding.page_one.full_handle' defaultMessage='Your full handle' />
        </div>
        <div className='display-case__case'>
          @{acct}@{domain}
        </div>
      </div>
      <p><FormattedMessage id='onboarding.page_one.handle_hint' defaultMessage='This is what you would tell your friends to search for.' /></p>
    </div>
  </div>
 );
@@ -46,7 +55,7 @@ const PageTwo = ({ myAccount }) => (
    <div className='figure non-interactive'>
      <div className='pseudo-drawer'>
        <NavigationBar account={myAccount} />
-      </div>
+
        <ComposeForm
          text='Awoo! #introductions'
          suggestions={ImmutableList()}
@@ -63,6 +72,7 @@ const PageTwo = ({ myAccount }) => (
          showSearch
        />
      </div>
    </div>
    <p><FormattedMessage id='onboarding.page_two.compose' defaultMessage='Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.' /></p>
  </div>
@@ -251,18 +261,12 @@ export default class OnboardingModal extends React.PureComponent {
    const hasMore = currentIndex < pages.length - 1;
    const nextOrDoneBtn = hasMore ? (
-      <button
+      <button onClick={this.handleNext} className='onboarding-modal__nav onboarding-modal__next shake-bottom'>
-        onClick={this.handleNext}
+        <FormattedMessage id='onboarding.next' defaultMessage='Next' /> <i className='fa fa-fw fa-chevron-right' />
        className='onboarding-modal__nav onboarding-modal__next'
      >
        <FormattedMessage id='onboarding.next' defaultMessage='Next' />
      </button>
    ) : (
-      <button
+      <button onClick={this.handleClose} className='onboarding-modal__nav onboarding-modal__done shake-bottom'>
-        onClick={this.handleClose}
+        <FormattedMessage id='onboarding.done' defaultMessage='Done' /> <i className='fa fa-fw fa-check' />
        className='onboarding-modal__nav onboarding-modal__done'
      >
        <FormattedMessage id='onboarding.done' defaultMessage='Done' />
      </button>
    );
@@ -270,9 +274,10 @@ export default class OnboardingModal extends React.PureComponent {
      <div className='modal-root__modal onboarding-modal'>
        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='onboarding-modal__pager'>
          {pages.map((page, i) => {
-            const className = classNames('onboarding-modal__page__wrapper', {
+            const className = classNames('onboarding-modal__page__wrapper', `onboarding-modal__page__wrapper-${i}`, {
              'onboarding-modal__page__wrapper--active': i === currentIndex,
            });
            return (
              <div key={i} className={className}>{page}</div>
            );
@@ -294,6 +299,7 @@ export default class OnboardingModal extends React.PureComponent {
              const className = classNames('onboarding-modal__dot', {
                active: i === currentIndex,
              });
              return (
                <div
                  key={`dot-${i}`}
--- a/app/javascript/mastodon/features/ui/components/upload_area.js
+++ b/app/javascript/mastodon/features/ui/components/upload_area.js
@@ -37,14 +37,14 @@ export default class UploadArea extends React.PureComponent {
    return (
      <Motion defaultStyle={{ backgroundOpacity: 0, backgroundScale: 0.95 }} style={{ backgroundOpacity: spring(active ? 1 : 0, { stiffness: 150, damping: 15 }), backgroundScale: spring(active ? 1 : 0.95, { stiffness: 200, damping: 3 }) }}>
-        {({ backgroundOpacity, backgroundScale }) =>
+        {({ backgroundOpacity, backgroundScale }) => (
          <div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}>
            <div className='upload-area__drop'>
              <div className='upload-area__background' style={{ transform: `scale(${backgroundScale})` }} />
              <div className='upload-area__content'><FormattedMessage id='upload_area.title' defaultMessage='Drag & drop to upload' /></div>
            </div>
          </div>
-        }
+        )}
      </Motion>
    );
  }
--- a/app/javascript/mastodon/features/ui/containers/columns_area_container.js
+++ b/app/javascript/mastodon/features/ui/containers/columns_area_container.js
@@ -3,6 +3,7 @@ import ColumnsArea from '../components/columns_area';
 const mapStateToProps = state => ({
  columns: state.getIn(['settings', 'columns']),
  isModalOpen: !!state.get('modal').modalType,
 });
 export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea);
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -47,6 +47,7 @@ const makeMapStateToProps = () => {
  const mapStateToProps = (state, { timelineId }) => ({
    statusIds: getStatusIds(state, { type: timelineId }),
    isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
    isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false),
    hasMore: !!state.getIn(['timelines', timelineId, 'next']),
  });
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -67,7 +67,7 @@
  "confirmations.delete_list.confirm": "Delete",
  "confirmations.delete_list.message": "هل تود حقا حذف هذه القائمة ؟",
  "confirmations.domain_block.confirm": "إخفاء إسم النطاق كاملا",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
+  "confirmations.domain_block.message": "متأكد من أنك تود حظر إسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.",
  "confirmations.mute.confirm": "أكتم",
  "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
  "confirmations.unfollow.confirm": "إلغاء المتابعة",
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "ليس هناك بعدُ أي محتوى ذو علاقة بهذا الوسم.",
  "empty_column.home": "إنك لا تتبع بعد أي شخص إلى حد الآن. زر {public} أو استخدام حقل البحث لكي تبدأ على التعرف على مستخدمين آخرين.",
  "empty_column.home.public_timeline": "الخيط العام",
-  "empty_column.list": "هذه القائمة فارغة.",
+  "empty_column.list": "هذه القائمة فارغة مؤقتا و لكن سوف تمتلئ تدريجيا عندما يبدأ الأعضاء المُنتَمين إليها بنشر تبويقات.",
  "empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
  "empty_column.public": "لا يوجد أي شيء هنا ! قم بنشر شيء ما للعامة، أو إتبع مستخدمين آخرين في الخوادم المثيلة الأخرى لملء خيط المحادثات العام",
  "follow_request.authorize": "ترخيص",
@@ -123,7 +123,7 @@
  "keyboard_shortcuts.reply": "للردّ",
  "keyboard_shortcuts.search": "للتركيز على البحث",
  "keyboard_shortcuts.toot": "لتحرير تبويق جديد",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث",
  "keyboard_shortcuts.up": "للإنتقال إلى أعلى القائمة",
  "lightbox.close": "إغلاق",
  "lightbox.next": "التالي",
@@ -139,6 +139,7 @@
  "loading_indicator.label": "تحميل ...",
  "media_gallery.toggle_visible": "عرض / إخفاء",
  "missing_indicator.label": "تعذر العثور عليه",
  "missing_indicator.sublabel": "تعذر العثور على هذا المورد",
  "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
  "navigation_bar.blocks": "الحسابات المحجوبة",
  "navigation_bar.community_timeline": "الخيط العام المحلي",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "تعرض الصفحة الرئيسية منشورات جميع الأشخاص الذين تتابعهم.",
  "onboarding.page_four.notifications": "فعندما يتفاعل شخص ما معك، عمود الإخطارات يخبرك.",
  "onboarding.page_one.federation": "ماستدون شبكة من خوادم مستقلة متلاحمة تهدف إلى إنشاء أكبر شبكة اجتماعية موحدة. تسمى هذه السرفيرات بمثيلات خوادم.",
-  "onboarding.page_one.handle": "أنت الآن على {domain}، واحد من مجموع مثيلات الخوادم المستقلة. اسم المستخدم الكامل الخاص بك هو {handle}",
+  "onboarding.page_one.full_handle": "عنوانك الكامل",
  "onboarding.page_one.handle_hint": "هذا هو ما يجب عليك توصيله لأصدقائك للبحث عنه.",
  "onboarding.page_one.welcome": "مرحبا بك في ماستدون !",
  "onboarding.page_six.admin": "مدير(ة) مثيل الخادم هذا {admin}.",
  "onboarding.page_six.almost_done": "أنهيت تقريبا ...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "للعامة",
  "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
  "privacy.unlisted.short": "غير مدرج",
  "regeneration_indicator.label": "جارٍ التحميل …",
  "regeneration_indicator.sublabel": "جارٍ تجهيز تغذية صفحتك الرئيسية !",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "الآن",
@@ -223,7 +227,7 @@
  "status.media_hidden": "الصورة مستترة",
  "status.mention": "أذكُر @{name}",
  "status.more": "المزيد",
-  "status.mute": "Mute @{name}",
+  "status.mute": "أكتم @{name}",
  "status.mute_conversation": "كتم المحادثة",
  "status.open": "وسع هذه المشاركة",
  "status.pin": "تدبيس على الملف الشخصي",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Зареждане...",
  "media_gallery.toggle_visible": "Toggle visibility",
  "missing_indicator.label": "Not found",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Hide notifications from this user?",
  "navigation_bar.blocks": "Blocked users",
  "navigation_bar.community_timeline": "Local timeline",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "Welcome to Mastodon!",
  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
  "onboarding.page_six.almost_done": "Almost done...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Public",
  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "now",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -50,7 +50,7 @@
  "column_header.unpin": "Deslligar",
  "column_subheading.navigation": "Navegació",
  "column_subheading.settings": "Configuració",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "Aquest toot no es mostrarà en cap etiqueta ja que no està llistat. Només els toots públics poden ser cercats per etiqueta.",
  "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.",
  "compose_form.lock_disclaimer.lock": "bloquejat",
  "compose_form.placeholder": "En què estàs pensant?",
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "Encara no hi ha res amb aquesta etiqueta.",
  "empty_column.home": "Encara no segueixes ningú. Visita {public} o fes cerca per començar i conèixer altres usuaris.",
  "empty_column.home.public_timeline": "la línia de temps pública",
-  "empty_column.list": "Encara no hi ha res en aquesta llista.",
+  "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin nous estats, apareixeran aquí.",
  "empty_column.notifications": "Encara no tens notificacions. Interactua amb altres per iniciar la conversa.",
  "empty_column.public": "No hi ha res aquí! Escriu alguna cosa públicament o segueix manualment usuaris d'altres instàncies per omplir-ho",
  "follow_request.authorize": "Autoritzar",
@@ -100,7 +100,7 @@
  "getting_started.appsshort": "Aplicacions",
  "getting_started.faq": "PMF",
  "getting_started.heading": "Començant",
-  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir o informar de problemes a GitHub de {github}.",
+  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir o informar de problemes a GitHub a {github}.",
  "getting_started.userguide": "Guia de l'usuari",
  "home.column_settings.advanced": "Avançat",
  "home.column_settings.basic": "Bàsic",
@@ -114,7 +114,7 @@
  "keyboard_shortcuts.compose": "per centrar l'area de composició de text",
  "keyboard_shortcuts.description": "Description",
  "keyboard_shortcuts.down": "per baixar en la llista",
-  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.enter": "ampliar estat",
  "keyboard_shortcuts.favourite": "afavorir",
  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
  "keyboard_shortcuts.hotkey": "Tecla d'accés directe",
@@ -133,12 +133,13 @@
  "lists.delete": "Delete list",
  "lists.edit": "Editar llista",
  "lists.new.create": "Afegir llista",
-  "lists.new.title_placeholder": "Nou títol de llista",
+  "lists.new.title_placeholder": "Nova llista",
  "lists.search": "Cercar entre les persones que segueixes",
  "lists.subheading": "Les teves llistes",
  "loading_indicator.label": "Carregant...",
  "media_gallery.toggle_visible": "Alternar visibilitat",
  "missing_indicator.label": "No trobat",
  "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
  "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
  "navigation_bar.blocks": "Usuaris bloquejats",
  "navigation_bar.community_timeline": "Línia de temps Local",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "La línia de temps d'Inici mostra missatges de les persones que segueixes.",
  "onboarding.page_four.notifications": "La columna Notificacions mostra quan algú interactua amb tu.",
  "onboarding.page_one.federation": "Mastodon és una xarxa de servidors independents que s'uneixen per fer una més gran xarxa social. A aquests servidors els hi diem instàncies.",
-  "onboarding.page_one.handle": "Ets a {domain}, per tant el teu usuari complert és {handle}",
+  "onboarding.page_one.full_handle": "El teu usuari complet",
  "onboarding.page_one.handle_hint": "Això és el que els hi diries als teus amics que cerquin.",
  "onboarding.page_one.welcome": "Benvingut a Mastodon!",
  "onboarding.page_six.admin": "L'administrador de la teva instància és {admin}.",
  "onboarding.page_six.almost_done": "Quasi fet...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Públic",
  "privacy.unlisted.long": "No publicar en línies de temps públiques",
  "privacy.unlisted.short": "No llistat",
  "regeneration_indicator.label": "Carregant…",
  "regeneration_indicator.sublabel": "S'està preparant la línia de temps Inici!",
  "relative_time.days": "fa {number} dies",
  "relative_time.hours": "fa {number} hores",
  "relative_time.just_now": "ara",
@@ -223,7 +227,7 @@
  "status.media_hidden": "Multimèdia amagat",
  "status.mention": "Esmentar @{name}",
  "status.more": "Més",
-  "status.mute": "Mute @{name}",
+  "status.mute": "Silenciar @{name}",
  "status.mute_conversation": "Silenciar conversació",
  "status.open": "Ampliar aquest estat",
  "status.pin": "Fixat en el perfil",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.",
  "empty_column.home": "Deine Startseite ist leer! Besuche {public} oder nutze die Suche, um loszulegen und andere Leute zu finden.",
  "empty_column.home.public_timeline": "die öffentliche Zeitleiste",
-  "empty_column.list": "Diese Liste ist derzeit leer.",
+  "empty_column.list": "Diese Liste ist derzeit leer. Wenn Wesen auf dieser Liste neue Beiträge veröffentlichen werden sie hier erscheinen.",
  "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
  "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Instanzen, um die Zeitleiste aufzufüllen",
  "follow_request.authorize": "Erlauben",
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Wird geladen …",
  "media_gallery.toggle_visible": "Sichtbarkeit umschalten",
  "missing_indicator.label": "Nicht gefunden",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
  "navigation_bar.blocks": "Blockierte Profile",
  "navigation_bar.community_timeline": "Lokale Zeitleiste",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "Die Startseite zeigt dir Beiträge von Leuten, denen du folgst.",
  "onboarding.page_four.notifications": "Wenn jemand mit dir interagiert, bekommst du eine Mitteilung.",
  "onboarding.page_one.federation": "Mastodon ist ein soziales Netzwerk, das aus unabhängigen Servern besteht. Diese Server nennen wir auch Instanzen.",
-  "onboarding.page_one.handle": "Du bist auf der Instanz {domain}, also ist dein vollständiger Profilname im Netzwerk {handle}",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "Willkommen bei Mastodon!",
  "onboarding.page_six.admin": "Für deine Instanz ist {admin} zuständig.",
  "onboarding.page_six.almost_done": "Fast fertig …",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Öffentlich",
  "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
  "privacy.unlisted.short": "Nicht gelistet",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "now",
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -136,6 +136,10 @@
      {
        "defaultMessage": "Not found",
        "id": "missing_indicator.label"
      },
      {
        "defaultMessage": "This resource could not be found",
        "id": "missing_indicator.sublabel"
      }
    ],
    "path": "app/javascript/mastodon/components/missing_indicator.json"
@@ -255,6 +259,19 @@
    ],
    "path": "app/javascript/mastodon/components/status_content.json"
  },
  {
    "descriptors": [
      {
        "defaultMessage": "Loading…",
        "id": "regeneration_indicator.label"
      },
      {
        "defaultMessage": "Your home feed is being prepared!",
        "id": "regeneration_indicator.sublabel"
      }
    ],
    "path": "app/javascript/mastodon/components/status_list.json"
  },
  {
    "descriptors": [
      {
@@ -1446,8 +1463,12 @@
        "id": "onboarding.page_one.federation"
      },
      {
-        "defaultMessage": "You are on {domain}, so your full handle is {handle}",
+        "defaultMessage": "Your full handle",
-        "id": "onboarding.page_one.handle"
+        "id": "onboarding.page_one.full_handle"
      },
      {
        "defaultMessage": "This is what you would tell your friends to search for.",
        "id": "onboarding.page_one.handle_hint"
      },
      {
        "defaultMessage": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Loading...",
  "media_gallery.toggle_visible": "Toggle visibility",
  "missing_indicator.label": "Not found",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Hide notifications from this user?",
  "navigation_bar.blocks": "Blocked users",
  "navigation_bar.community_timeline": "Local timeline",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "Welcome to Mastodon!",
  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
  "onboarding.page_six.almost_done": "Almost done...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Public",
  "privacy.unlisted.long": "Do not post to public timelines",
  "privacy.unlisted.short": "Unlisted",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "now",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -7,22 +7,22 @@
  "account.followers": "Sekvantoj",
  "account.follows": "Sekvatoj",
  "account.follows_you": "Sekvas vin",
-  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.hide_reblogs": "Maski diskonigitaĵojn de @{name}",
  "account.media": "Sonbildaĵoj",
  "account.mention": "Mencii @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} movis al:",
  "account.mute": "Silentigi @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.mute_notifications": "Silentigi sciigojn el @{name}",
  "account.posts": "Mesaĝoj",
  "account.report": "Signali @{name}",
  "account.requested": "Atendas aprobon",
  "account.share": "Diskonigi la profilon de @{name}",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.show_reblogs": "Montri diskonigaĵojn de @{name}",
  "account.unblock": "Malbloki @{name}",
  "account.unblock_domain": "Malkaŝi {domain}",
  "account.unfollow": "Ne plus sekvi",
  "account.unmute": "Malsilentigi @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
  "account.view_full_profile": "Vidi plenan profilon",
  "boost_modal.combo": "La proksiman fojon, premu {combo} por pasigi",
  "bundle_column_error.body": "Io malfunkciis ŝargante tiun ĉi komponanton.",
@@ -36,7 +36,7 @@
  "column.favourites": "Favoritoj",
  "column.follow_requests": "Abonpetoj",
  "column.home": "Hejmo",
-  "column.lists": "Lists",
+  "column.lists": "Listoj",
  "column.mutes": "Silentigitaj uzantoj",
  "column.notifications": "Sciigoj",
  "column.pins": "Alpinglitaj pepoj",
@@ -50,7 +50,7 @@
  "column_header.unpin": "Depingli",
  "column_subheading.navigation": "Navigado",
  "column_subheading.settings": "Agordoj",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "Ĉi tiu pepo ne estos listigita en iu ajn kradvorta listo pro ĝia videbleco estas “eksterlista”. Nur publikaj pepoj povas esti kradvorte trovitaj.",
  "compose_form.lock_disclaimer": "Via konta ne estas ŝlosita. Iu ajn povas sekvi vin por vidi viajn privatajn pepojn.",
  "compose_form.lock_disclaimer.lock": "ŝlosita",
  "compose_form.placeholder": "Pri kio vi pensas?",
@@ -65,7 +65,7 @@
  "confirmations.delete.confirm": "Malaperigi",
  "confirmations.delete.message": "Ĉu vi konfirmas la malaperigon de tiun pepon?",
  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.delete_list.message": "Ĉu vi certas forviŝi ĉi tiun liston por ĉiam?",
  "confirmations.domain_block.confirm": "Kaŝi la tutan reton",
  "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas bloki {domain} tute? Plej ofte, kelkaj celitaj blokadoj aŭ silentigoj estas sufiĉaj kaj preferindaj.",
  "confirmations.mute.confirm": "Silentigi",
@@ -92,9 +92,9 @@
  "empty_column.hashtag": "Ĝise, neniu enhavo estas asociita kun 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 publika tempolinio",
-  "empty_column.list": "There is nothing in this list yet.",
+  "empty_column.list": "Estas ankoraŭ nenio en ĉi tiu listo. Tuj kiam anoj de ĉi tiu listo publikigos, ties pepoj aperos ĉi tie.",
  "empty_column.notifications": "Vi dume ne havas sciigojn. Interagi kun aliajn uzantojn por komenci la konversacion.",
-  "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj instancoj por plenigi la publikan tempolinion.",
+  "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj instancoj por plenigi la publikan tempolinion",
  "follow_request.authorize": "Akcepti",
  "follow_request.reject": "Rifuzi",
  "getting_started.appsshort": "Aplikaĵoj",
@@ -108,46 +108,47 @@
  "home.column_settings.show_reblogs": "Montri diskonigojn",
  "home.column_settings.show_replies": "Montri respondojn",
  "home.settings": "Agordoj de la kolumno",
-  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.back": "reeniri",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "diskonigi",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.column": "fokusigi statuson en unu el la columnoj",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.compose": "por fokusigi la redaktujon",
  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.down": "subenmovi en la listo",
  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourite": "ŝatitaren",
  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.hotkey": "Rapidklavo",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "por montri ĉi tiun legendon",
-  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.mention": "por sciigi ties aŭtoron",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.reply": "por respondi",
-  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.search": "por fokusigi la serĉadon",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toot": "por ekredakti tute novan pepon",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "por malfokusigi la redaktujon aŭ la serĉilon",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.up": "por suprenmovi en la listo",
  "lightbox.close": "Fermi",
  "lightbox.next": "Malantaŭa",
  "lightbox.previous": "Antaŭa",
-  "lists.account.add": "Add to list",
+  "lists.account.add": "Aldoni al la listo",
-  "lists.account.remove": "Remove from list",
+  "lists.account.remove": "Forviŝi de la listo",
  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
+  "lists.edit": "Redakti la liston",
-  "lists.new.create": "Add list",
+  "lists.new.create": "Aldoni liston",
-  "lists.new.title_placeholder": "New list title",
+  "lists.new.title_placeholder": "Titulo de la nova listo",
-  "lists.search": "Search among people you follow",
+  "lists.search": "Serĉi el la homoj kiujn vi sekvas",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "Viaj listoj",
  "loading_indicator.label": "Ŝarganta…",
  "media_gallery.toggle_visible": "Baskuli videblecon",
  "missing_indicator.label": "Ne trovita",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "missing_indicator.sublabel": "Ĉi tiu rimedo ne troviĝis",
  "mute_modal.hide_notifications": "Ĉu kaŝi sciigojn el tiu ĉi uzanto?",
  "navigation_bar.blocks": "Blokitaj uzantoj",
  "navigation_bar.community_timeline": "Loka tempolinio",
  "navigation_bar.edit_profile": "Redakti la profilon",
  "navigation_bar.favourites": "Favoritaj",
  "navigation_bar.follow_requests": "Abonpetoj",
  "navigation_bar.info": "Plia informo",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
+  "navigation_bar.keyboard_shortcuts": "Klavmallongigo",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.lists": "Listoj",
  "navigation_bar.logout": "Elsaluti",
  "navigation_bar.mutes": "Silentigitaj uzantoj",
  "navigation_bar.pins": "Alpinglitaj pepoj",
@@ -174,12 +175,13 @@
  "onboarding.page_four.home": "La hejma tempolinio enhavas la mesaĝojn de ĉiuj uzantoj, kiuj vi sekvas.",
  "onboarding.page_four.notifications": "La sciiga kolumno informas vin kiam iu interagas kun vi.",
  "onboarding.page_one.federation": "Mastodono estas reto de nedependaj serviloj, unuiĝintaj por krei pligrandan socian retejon. Ni nomas tiujn servilojn instancoj.",
-  "onboarding.page_one.handle": "Vi estas ĉe {domain}, unu el la multaj instancoj de Mastodono. Via kompleta uznomo do estas {handle}",
+  "onboarding.page_one.full_handle": "Via tuta uzantnomo",
  "onboarding.page_one.handle_hint": "Jen kion vi dirintus al viaj amikoj por serĉi.",
  "onboarding.page_one.welcome": "Bonvenon al Mastodono!",
  "onboarding.page_six.admin": "Via instancestro estas {admin}.",
  "onboarding.page_six.almost_done": "Estas preskaŭ finita…",
  "onboarding.page_six.appetoot": "Bonan a‘pepi’ton!",
-  "onboarding.page_six.apps_available": "{apps} estas elŝuteblaj por iOS, Androido kaj alioj. Kaj nun… bonan a‘pepi’ton!",
+  "onboarding.page_six.apps_available": "{apps} estas elŝuteblaj por iOS, Androido kaj alioj.",
  "onboarding.page_six.github": "Mastodono estas libera, senpaga kaj malfermkoda programaro. Vi povas signali cimojn, proponi funkciojn aŭ kontribui al gîa kreskado ĉe {github}.",
  "onboarding.page_six.guidelines": "komunreguloj",
  "onboarding.page_six.read_guidelines": "Ni petas vin: ne forgesu legi la {guidelines}n de {domain}!",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Publika",
  "privacy.unlisted.long": "Ne vidigi en publikaj tempolinioj",
  "privacy.unlisted.short": "Nelistigita",
  "regeneration_indicator.label": "Elŝultanta…",
  "regeneration_indicator.sublabel": "Via ĉefpaĝo estas preparanta!",
  "relative_time.days": "{number}t",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "nun",
@@ -210,7 +214,7 @@
  "search_popout.search_format": "Detala serĉo",
  "search_popout.tips.hashtag": "kradvorto",
  "search_popout.tips.status": "statkonigo",
-  "search_popout.tips.text": "Simpla teksto eligas la kongruajn afiŝnomojn, uznomojn kaj kradvortojn.",
+  "search_popout.tips.text": "Simpla teksto eligas la kongruajn afiŝnomojn, uznomojn kaj kradvortojn",
  "search_popout.tips.user": "uzanto",
  "search_results.total": "{count, number} {count, plural, one {rezultato} other {rezultatoj}}",
  "standalone.public_title": "Rigardeti…",
@@ -223,7 +227,7 @@
  "status.media_hidden": "Sonbildaĵo kaŝita",
  "status.mention": "Mencii @{name}",
  "status.more": "Pli",
-  "status.mute": "Mute @{name}",
+  "status.mute": "Silentigi @{name}",
  "status.mute_conversation": "Silentigi konversacion",
  "status.open": "Disfaldi statkonigon",
  "status.pin": "Pingli al la profilo",
@@ -244,7 +248,7 @@
  "tabs_bar.home": "Hejmo",
  "tabs_bar.local_timeline": "Loka tempolinio",
  "tabs_bar.notifications": "Sciigoj",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",
  "upload_area.title": "Algliti por alŝuti",
  "upload_button.label": "Aldoni sonbildaĵon",
  "upload_form.description": "Priskribi por la misvidantaj",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -36,7 +36,7 @@
  "column.favourites": "Favoritos",
  "column.follow_requests": "Solicitudes de seguimiento",
  "column.home": "Inicio",
-  "column.lists": "Lists",
+  "column.lists": "Listas",
  "column.mutes": "Usuarios silenciados",
  "column.notifications": "Notificaciones",
  "column.pins": "Toot fijado",
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "No hay nada en este hashtag aún.",
  "empty_column.home": "No estás siguiendo a nadie aún. Visita {public} o haz búsquedas para empezar y conocer gente nueva.",
  "empty_column.home.public_timeline": "la línea de tiempo pública",
-  "empty_column.list": "No hay nada en esta lista aún.",
+  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
  "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
  "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
  "follow_request.authorize": "Autorizar",
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Cargando…",
  "media_gallery.toggle_visible": "Cambiar visibilidad",
  "missing_indicator.label": "No encontrado",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
  "navigation_bar.blocks": "Usuarios bloqueados",
  "navigation_bar.community_timeline": "Historia local",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "La línea de tiempo principal muestra toots de gente que sigues.",
  "onboarding.page_four.notifications": "Las notificaciones se muestran cuando alguien interactúa contigo.",
  "onboarding.page_one.federation": "Mastodon es una red de servidores federados que conforman una red social aún más grande. Llamamos a estos servidores instancias.",
-  "onboarding.page_one.handle": "Estás en {domain}, así que tu nombre de usuario completo es {handle}",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "¡Bienvenido a Mastodon!",
  "onboarding.page_six.admin": "El administrador de tu instancia es {admin}.",
  "onboarding.page_six.almost_done": "Ya casi…",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Público",
  "privacy.unlisted.long": "No mostrar en la historia federada",
  "privacy.unlisted.short": "Sin federar",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "ahora",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -7,22 +7,22 @@
  "account.followers": "پیگیران",
  "account.follows": "پی می‌گیرد",
  "account.follows_you": "پیگیر شماست",
-  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.hide_reblogs": "پنهان کردن بازبوق‌های @{name}",
  "account.media": "رسانه",
  "account.mention": "نام‌بردن از @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} منتقل شده است به:",
  "account.mute": "بی‌صدا کردن @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.mute_notifications": "بی‌صداکردن اعلان‌ها از طرف @{name}",
  "account.posts": "نوشته‌ها",
  "account.report": "گزارش @{name}",
  "account.requested": "در انتظار پذیرش",
  "account.share": "هم‌رسانی نمایهٔ @{name}",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.show_reblogs": "نشان‌دادن بازبوق‌های  @{name}",
  "account.unblock": "رفع انسداد @{name}",
  "account.unblock_domain": "رفع پنهان‌سازی از {domain}",
  "account.unfollow": "پایان پیگیری",
  "account.unmute": "باصدا کردن @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_notifications": "باصداکردن اعلان‌ها از طرف @{name}",
  "account.view_full_profile": "نمایش نمایهٔ کامل",
  "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
  "bundle_column_error.body": "هنگام بازکردن این بخش خطایی رخ داد.",
@@ -36,7 +36,7 @@
  "column.favourites": "پسندیده‌ها",
  "column.follow_requests": "درخواست‌های پیگیری",
  "column.home": "خانه",
-  "column.lists": "Lists",
+  "column.lists": "فهرست‌ها",
  "column.mutes": "کاربران بی‌صداشده",
  "column.notifications": "اعلان‌ها",
  "column.pins": "نوشته‌های ثابت",
@@ -65,7 +65,7 @@
  "confirmations.delete.confirm": "پاک کن",
  "confirmations.delete.message": "آیا واقعاً می‌خواهید این نوشته را پاک کنید؟",
  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.delete_list.message": "آیا واقعاً می‌خواهید این فهرست را برای همیشه پاک کنید؟",
  "confirmations.domain_block.confirm": "پنهان‌سازی کل دامین",
  "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید کل دامین {domain} را مسدود کنید؟ بیشتر وقت‌ها مسدودکردن یا بی‌صداکردن چند حساب کاربری خاص کافی است و توصیه می‌شود.",
  "confirmations.mute.confirm": "بی‌صدا کن",
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "هنوز هیچ چیزی با این هشتگ نیست.",
  "empty_column.home": "شما هنوز پیگیر کسی نیستید. {public} را ببینید یا چیزی را جستجو کنید تا کاربران دیگر را ببینید.",
  "empty_column.home.public_timeline": "فهرست نوشته‌های همه‌جا",
-  "empty_column.list": "There is nothing in this list yet.",
+  "empty_column.list": "در این فهرست هنوز چیزی نیست. وقتی اعضای این فهرست چیزی بنویسند، این‌جا ظاهر خواهد شد.",
  "empty_column.notifications": "هنوز هیچ اعلانی ندارید. به نوشته‌های دیگران واکنش نشان دهید تا گفتگو آغاز شود.",
  "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران دیگر را پی بگیرید تا این‌جا پر شود",
  "follow_request.authorize": "اجازه دهید",
@@ -108,46 +108,47 @@
  "home.column_settings.show_reblogs": "نمایش بازبوق‌ها",
  "home.column_settings.show_replies": "نمایش پاسخ‌ها",
  "home.settings": "تنظیمات ستون",
-  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.back": "برای بازگشت",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "برای بازبوقیدن",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.column": "برای برجسته‌کردن یک نوشته در یکی از ستون‌ها",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.compose": "برای فعال‌کردن کادر نوشتهٔ تازه",
  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.down": "برای پایین‌رفتن در فهرست",
  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourite": "برای پسندیدن",
  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.hotkey": "میان‌بر",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "برای نمایش این راهنما",
-  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.mention": "برای نام‌بردن از نویسنده",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.reply": "برای پاسخ‌دادن",
-  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.search": "برای فعال‌کردن جستجو",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toot": "برای آغاز یک بوق تازه",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "برای برداشتن توجه از نوشتن/جستجو",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.up": "برای بالا رفتن در فهرست",
  "lightbox.close": "بستن",
  "lightbox.next": "بعدی",
  "lightbox.previous": "قبلی",
-  "lists.account.add": "Add to list",
+  "lists.account.add": "افزودن به فهرست",
-  "lists.account.remove": "Remove from list",
+  "lists.account.remove": "پاک‌کردن از فهرست",
-  "lists.delete": "Delete list",
+  "lists.delete": "حذف فهرست",
-  "lists.edit": "Edit list",
+  "lists.edit": "ویرایش فهرست",
-  "lists.new.create": "Add list",
+  "lists.new.create": "افزودن فهرست",
-  "lists.new.title_placeholder": "New list title",
+  "lists.new.title_placeholder": "نام فهرست تازه",
-  "lists.search": "Search among people you follow",
+  "lists.search": "بین کسانی که پی می‌گیرید بگردید",
-  "lists.subheading": "Your lists",
+  "lists.subheading": "فهرست‌های شما",
  "loading_indicator.label": "بارگیری...",
  "media_gallery.toggle_visible": "تغییر پیدایی",
  "missing_indicator.label": "پیدا نشد",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "اعلان‌های این کاربر پنهان شود؟",
  "navigation_bar.blocks": "کاربران مسدودشده",
  "navigation_bar.community_timeline": "نوشته‌های محلی",
  "navigation_bar.edit_profile": "ویرایش نمایه",
  "navigation_bar.favourites": "پسندیده‌ها",
  "navigation_bar.follow_requests": "درخواست‌های پیگیری",
  "navigation_bar.info": "اطلاعات تکمیلی",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
+  "navigation_bar.keyboard_shortcuts": "میان‌برهای صفحه‌کلید",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.lists": "فهرست‌ها",
  "navigation_bar.logout": "خروج",
  "navigation_bar.mutes": "کاربران بی‌صداشده",
  "navigation_bar.pins": "نوشته‌های ثابت",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "ستون «خانه» نوشته‌های کسانی را نشان می‌دهد که شما پی می‌گیرید.",
  "onboarding.page_four.notifications": "ستون «اعلان‌ها» ارتباط‌های شما با دیگران را نشان می‌دهد.",
  "onboarding.page_one.federation": "ماستدون شبکه‌ای از سرورهای مستقل است که با پیوستن به یکدیگر یک شبکهٔ اجتماعی بزرگ را تشکیل می‌دهند.",
-  "onboarding.page_one.handle": "شما روی سرور {domain} هستید، بنابراین شناسهٔ کامل شما {handle} است.",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "به ماستدون خوش آمدید!",
  "onboarding.page_six.admin": "نشانی مسئول سرور شما {admin} است.",
  "onboarding.page_six.almost_done": "الان تقریباً آماده‌اید...",
@@ -197,9 +199,11 @@
  "privacy.public.short": "عمومی",
  "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
  "privacy.unlisted.short": "فهرست‌نشده",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "الان",
  "relative_time.minutes": "{number}m",
  "relative_time.seconds": "{number}s",
  "reply_indicator.cancel": "لغو",
@@ -222,7 +226,7 @@
  "status.load_more": "بیشتر نشان بده",
  "status.media_hidden": "تصویر پنهان شده",
  "status.mention": "نام‌بردن از @{name}",
-  "status.more": "More",
+  "status.more": "بیشتر",
  "status.mute": "Mute @{name}",
  "status.mute_conversation": "بی‌صداکردن گفتگو",
  "status.open": "این نوشته را باز کن",
@@ -244,7 +248,7 @@
  "tabs_bar.home": "خانه",
  "tabs_bar.local_timeline": "محلی",
  "tabs_bar.notifications": "اعلان‌ها",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "ui.beforeunload": "اگر از ماستدون خارج شوید پیش‌نویس شما پاک خواهد شد.",
  "upload_area.title": "برای بارگذاری به این‌جا بکشید",
  "upload_button.label": "افزودن تصویر",
  "upload_form.description": "نوشتهٔ توضیحی برای کم‌بینایان و نابینایان",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Ladataan...",
  "media_gallery.toggle_visible": "Toggle visibility",
  "missing_indicator.label": "Not found",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Hide notifications from this user?",
  "navigation_bar.blocks": "Blocked users",
  "navigation_bar.community_timeline": "Paikallinen aikajana",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}",
+  "onboarding.page_one.full_handle": "Your full handle",
  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
  "onboarding.page_one.welcome": "Welcome to Mastodon!",
  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
  "onboarding.page_six.almost_done": "Almost done...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Public",
  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "now",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,6 +1,6 @@
 {
-  "account.block": "Bloquer",
+  "account.block": "Bloquer @{name}",
-  "account.block_domain": "Tout masquer de {domain}",
+  "account.block_domain": "Tout masquer venant de {domain}",
  "account.disclaimer_full": "Les données ci-dessous peuvent ne pas refléter ce profil dans sa totalité.",
  "account.edit_profile": "Modifier le profil",
  "account.follow": "Suivre",
@@ -11,7 +11,7 @@
  "account.media": "Média",
  "account.mention": "Mentionner",
  "account.moved_to": "{name} a déménagé vers :",
-  "account.mute": "Masquer",
+  "account.mute": "Masquer @{name}",
  "account.mute_notifications": "Ignorer les notifications de @{name}",
  "account.posts": "Statuts",
  "account.report": "Signaler",
@@ -36,7 +36,7 @@
  "column.favourites": "Favoris",
  "column.follow_requests": "Demandes de suivi",
  "column.home": "Accueil",
-  "column.lists": "Lists",
+  "column.lists": "Listes",
  "column.mutes": "Comptes masqués",
  "column.notifications": "Notifications",
  "column.pins": "Pouets épinglés",
@@ -50,7 +50,7 @@
  "column_header.unpin": "Retirer",
  "column_subheading.navigation": "Navigation",
  "column_subheading.settings": "Paramètres",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur \"non-listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par hashtag.",
  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.",
  "compose_form.lock_disclaimer.lock": "verrouillé",
  "compose_form.placeholder": "Qu’avez-vous en tête ?",
@@ -73,7 +73,7 @@
  "confirmations.unfollow.confirm": "Ne plus suivre",
  "confirmations.unfollow.message": "Voulez-vous arrêter de suivre {name} ?",
  "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.",
-  "embed.preview": "Il apparaîtra comme cela :",
+  "embed.preview": "Il apparaîtra comme cela :",
  "emoji_button.activity": "Activités",
  "emoji_button.custom": "Personnalisés",
  "emoji_button.flags": "Drapeaux",
@@ -89,12 +89,12 @@
  "emoji_button.symbols": "Symboles",
  "emoji_button.travel": "Lieux et voyages",
  "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag",
+  "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag.",
  "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres utilisateur⋅ice⋅s.",
  "empty_column.home.public_timeline": "le fil public",
  "empty_column.list": "Il n'y a rien dans cette liste pour l'instant. Dès que des personnes de cette liste publierons de nouveaux statuts, ils apparaîtront ici.",
  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres utilisateur⋅ice⋅s pour débuter la conversation.",
-  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice⋅s d’autres instances pour remplir le fil public.",
+  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice·s d’autres instances pour remplir le fil public",
  "follow_request.authorize": "Accepter",
  "follow_request.reject": "Rejeter",
  "getting_started.appsshort": "Applications",
@@ -121,10 +121,10 @@
  "keyboard_shortcuts.legend": "pour afficher cette légende",
  "keyboard_shortcuts.mention": "pour mentionner l'auteur",
  "keyboard_shortcuts.reply": "pour répondre",
-  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.search": "pour cibler la recherche",
  "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "pour recentrer composer textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.up": "pour remonter dans la liste",
  "lightbox.close": "Fermer",
  "lightbox.next": "Suivant",
  "lightbox.previous": "Précédent",
@@ -139,6 +139,7 @@
  "loading_indicator.label": "Chargement…",
  "media_gallery.toggle_visible": "Modifier la visibilité",
  "missing_indicator.label": "Non trouvé",
  "missing_indicator.sublabel": "Ressource introuvable",
  "mute_modal.hide_notifications": "Masquer les notifications de cet utilisateur ?",
  "navigation_bar.blocks": "Comptes bloqués",
  "navigation_bar.community_timeline": "Fil public local",
@@ -154,14 +155,14 @@
  "navigation_bar.preferences": "Préférences",
  "navigation_bar.public_timeline": "Fil public global",
  "notification.favourite": "{name} a ajouté à ses favoris :",
-  "notification.follow": "{name} vous suit.",
+  "notification.follow": "{name} vous suit",
  "notification.mention": "{name} vous a mentionné⋅e :",
  "notification.reblog": "{name} a partagé votre statut :",
  "notifications.clear": "Nettoyer",
  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
  "notifications.column_settings.alert": "Notifications locales",
  "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s :",
+  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e·s :",
  "notifications.column_settings.mention": "Mentions :",
  "notifications.column_settings.push": "Notifications push",
  "notifications.column_settings.push_meta": "Cet appareil",
@@ -171,15 +172,16 @@
  "onboarding.done": "Effectué",
  "onboarding.next": "Suivant",
  "onboarding.page_five.public_timelines": "Le fil public global affiche les posts de tou⋅te⋅s les utilisateur⋅ice⋅s suivi⋅es par les membres de {domain}. Le fil public local est identique mais se limite aux utilisateur⋅ice⋅s de {domain}.",
-  "onboarding.page_four.home": "L’Accueil affiche les posts de tou⋅te⋅s les utilisateur⋅ice⋅s que vous suivez",
+  "onboarding.page_four.home": "L’Accueil affiche les posts de tou⋅te·s les utilisateur⋅ice·s que vous suivez.",
-  "onboarding.page_four.notifications": "Les Notifications vous informent lorsque quelqu’un interagit avec vous",
+  "onboarding.page_four.notifications": "Les Notifications vous informent lorsque quelqu’un interagit avec vous.",
  "onboarding.page_one.federation": "Mastodon est un réseau social qui appartient à tou⋅te⋅s.",
-  "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d’utilisateur⋅ice complet est {handle}",
+  "onboarding.page_one.full_handle": "Votre pleine maîtrise",
  "onboarding.page_one.handle_hint": "C'est ce que vous diriez à vos amis de rechercher.",
  "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
-  "onboarding.page_six.admin": "L’administrateur⋅ice de votre instance est {admin}",
+  "onboarding.page_six.admin": "L’administrateur⋅ice de votre instance est {admin}.",
  "onboarding.page_six.almost_done": "Nous y sommes presque…",
  "onboarding.page_six.appetoot": "Bon appouétit !",
-  "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres. Et maintenant… Bon appouétit !",
+  "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres.",
  "onboarding.page_six.github": "Mastodon est un logiciel libre, gratuit et open-source. Vous pouvez rapporter des bogues, suggérer des fonctionnalités, ou contribuer à son développement sur {github}.",
  "onboarding.page_six.guidelines": "règles de la communauté",
  "onboarding.page_six.read_guidelines": "S’il vous plaît, n’oubliez pas de lire les {guidelines} !",
@@ -189,16 +191,18 @@
  "onboarding.page_two.compose": "Écrivez depuis la colonne de composition. Vous pouvez ajouter des images, changer les réglages de confidentialité, et ajouter des avertissements de contenu (Content Warning) grâce aux icônes en dessous.",
  "onboarding.skip": "Passer",
  "privacy.change": "Ajuster la confidentialité du message",
-  "privacy.direct.long": "N’afficher que pour les personnes mentionnées",
+  "privacy.direct.long": "N'envoyer qu'aux personnes mentionnées",
  "privacy.direct.short": "Direct",
-  "privacy.private.long": "N’afficher que pour vos abonné⋅e⋅s",
+  "privacy.private.long": "N'envoyer qu'à vos abonné⋅e⋅s",
  "privacy.private.short": "Privé",
  "privacy.public.long": "Afficher dans les fils publics",
  "privacy.public.short": "Public",
  "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
  "privacy.unlisted.short": "Non-listé",
-  "relative_time.days": "{number} j",
+  "regeneration_indicator.label": "Chargement…",
-  "relative_time.hours": "{number} h",
+  "regeneration_indicator.sublabel": "Votre page principale est en cours de préparation!",
  "relative_time.days": "{number} j",
  "relative_time.hours": "{number} h",
  "relative_time.just_now": "à l’instant",
  "relative_time.minutes": "{number} min",
  "relative_time.seconds": "{number} s",
@@ -223,7 +227,7 @@
  "status.media_hidden": "Média caché",
  "status.mention": "Mentionner",
  "status.more": "Plus",
-  "status.mute": "Mute @{name}",
+  "status.mute": "Masquer @{name}",
  "status.mute_conversation": "Masquer la conversation",
  "status.open": "Déplier ce statut",
  "status.pin": "Épingler sur le profil",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -50,7 +50,7 @@
  "column_header.unpin": "Soltar",
  "column_subheading.navigation": "Navegación",
  "column_subheading.settings": "Axustes",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "Esta mensaxe non será listada baixo ningunha etiqueta xa que está marcada como non listada. Só os toots públicos poden buscarse por etiquetas.",
  "compose_form.lock_disclaimer": "A súa conta non está {locked}. Calquera pode seguila para ver as súas mensaxes só-para-seguidoras.",
  "compose_form.lock_disclaimer.lock": "bloqueado",
  "compose_form.placeholder": "A qué andas?",
@@ -92,7 +92,7 @@
  "empty_column.hashtag": "Aínda non hai nada con esta etiqueta.",
  "empty_column.home": "A súa liña temporal de inicio está baldeira! Visite {public} ou utilice a busca para atopar outras usuarias.",
  "empty_column.home.public_timeline": "a liña temporal pública",
-  "empty_column.list": "Aínda non hai nada en esta lista.",
+  "empty_column.list": "Aínda non hai nada en esta lista. Cando as usuarias incluídas na lista publiquen mensaxes, aparecerán aquí.",
  "empty_column.notifications": "Aínda non ten notificacións. Interactúe con outras para iniciar unha conversa.",
  "empty_column.public": "Nada por aquí! Escriba algo de xeito público, ou siga manualmente usuarias de outras instancias para ir enchéndoa",
  "follow_request.authorize": "Autorizar",
@@ -109,7 +109,7 @@
  "home.column_settings.show_replies": "Mostrar respostas",
  "home.settings": "Axustes da columna",
  "keyboard_shortcuts.back": "voltar atrás",
-  "keyboard_shortcuts.boost": "repetir",
+  "keyboard_shortcuts.boost": "promover",
  "keyboard_shortcuts.column": "destacar un estado en unha das columnas",
  "keyboard_shortcuts.compose": "Foco no área de escritura",
  "keyboard_shortcuts.description": "Descrición",
@@ -139,8 +139,9 @@
  "loading_indicator.label": "Cargando...",
  "media_gallery.toggle_visible": "Dar visibilidade",
  "missing_indicator.label": "Non atopado",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.hide_notifications": "Esconder notificacións deste usuario?",
-  "navigation_bar.blocks": "Usuarios bloqueados",
+  "navigation_bar.blocks": "Usuarias bloqueadas",
  "navigation_bar.community_timeline": "Liña temporal local",
  "navigation_bar.edit_profile": "Editar perfil",
  "navigation_bar.favourites": "Favoritas",
@@ -156,7 +157,7 @@
  "notification.favourite": "{name} marcou como favorito o seu estado",
  "notification.follow": "{name} está a seguila",
  "notification.mention": "{name} mencionoute",
-  "notification.reblog": "{name} promocionou o seu estado",
+  "notification.reblog": "{name} promoveu o seu estado",
  "notifications.clear": "Limpar notificacións",
  "notifications.clear_confirmation": "Estás seguro de que queres limpar permanentemente todas as túas notificacións?",
  "notifications.column_settings.alert": "Notificacións de escritorio",
@@ -174,7 +175,8 @@
  "onboarding.page_four.home": "A liña de tempo local mostra as publicacións das persoas que segues.",
  "onboarding.page_four.notifications": "A columna de notificacións mostra cando alguén interactúa contigo.",
  "onboarding.page_one.federation": "Mastodon é unha rede de servidores independentes que se unen para facer unha rede social máis grande. Chamamos instancias a estes servidores.",
-  "onboarding.page_one.handle": "Estás en {domain}, polo que o teu nome de usuario completo é {handle}",
+  "onboarding.page_one.full_handle": "O seu alcume completo",
  "onboarding.page_one.handle_hint": "Esto é o que lle debe dicir a quen queira seguila.",
  "onboarding.page_one.welcome": "Benvido a Mastodon!",
  "onboarding.page_six.admin": "O administrador da túa instancia é {admin}.",
  "onboarding.page_six.almost_done": "Case feito...",
@@ -197,6 +199,8 @@
  "privacy.public.short": "Pública",
  "privacy.unlisted.long": "Non publicar en liñas temporais públicas",
  "privacy.unlisted.short": "Non listada",
  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
  "relative_time.just_now": "agora",
@@ -223,12 +227,12 @@
  "status.media_hidden": "Medios ocultos",
  "status.mention": "Mencionar @{name}",
  "status.more": "Máis",
-  "status.mute": "Mute @{name}",
+  "status.mute": "Acalar @{name}",
  "status.mute_conversation": "Acalar conversa",
  "status.open": "Expandir este estado",
  "status.pin": "Fixar no perfil",
-  "status.reblog": "Promocionar",
+  "status.reblog": "Promover",
-  "status.reblogged_by": "{name} promocionado",
+  "status.reblogged_by": "{name} promoveu",
  "status.reply": "Resposta",
  "status.replyAll": "Resposta a conversa",
  "status.report": "Informar @{name}",
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`<?xml version="1.0" encoding="utf-8"?>`
							<svg width="2048" height="1792" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1344 1504q0 13-9.5 22.5t-22.5 9.5h-960q-8 0-13.5-2t-9-7-5.5-8-3-11.5-1-11.5v-600h-192q-26 0-45-19t-19-45q0-24 15-41l320-384q19-22 49-22t49 22l320 384q15 17 15 41 0 26-19 45t-45 19h-192v384h576q16 0 25 11l160 192q7 10 7 21zm640-416q0 24-15 41l-320 384q-20 23-49 23t-49-23l-320-384q-15-17-15-41 0-26 19-45t45-19h192v-384h-576q-16 0-25-12l-160-192q-7-9-7-20 0-13 9.5-22.5t22.5-9.5h960q8 0 13.5 2t9 7 5.5 8 3 11.5 1 11.5v600h192q26 0 45 19t19 45z" fill="#fff"/></svg>
		`@@ -0,0 +1 @@`
							<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#fff"/></svg>