Fix crash in alias settings page (#18004 )

(cherry picked from commit dc50347247)
Customize Content of the tagline, set custom CSS properties
2022-04-27 12:54:10 +02:00 · 2022-04-09 02:11:43 +02:00 · 2022-04-09 02:11:43 +02:00 · 2022-04-09 02:11:43 +02:00 · 2022-04-09 02:11:43 +02:00
364 changed files with 3574 additions and 4931 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,58 +3,6 @@ Changelog

 All notable changes to this project will be documented in this file.

-## [3.5.2] - 2022-05-04
-### Added
-
- Add warning on direct messages screen in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18289))
-  - We already had a warning when composing a direct message, it has now been reworded to be more clear
-  - Same warning is now displayed when viewing sent and received direct messages
- Add ability to set approval-based registration through tootctl ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18248))
- Add pre-filling of domain from search filter in domain allow/block admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18172))
-
-## Changed
-
- Change name of “Direct” visibility to “Mentioned people only” in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18146), [Gargron](https://github.com/mastodon/mastodon/pull/18289), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18291))
- Change trending posts to only show one post from each account ([Gargron](https://github.com/mastodon/mastodon/pull/18181))
- Change half-life of trending posts from 6 hours to 2 hours ([Gargron](https://github.com/mastodon/mastodon/pull/18182))
- Change full-text search feature to also include polls you have voted in ([tribela](https://github.com/mastodon/mastodon/pull/18070))
- Change Redis from using one connection per process, to using a connection pool ([Gargron](https://github.com/mastodon/mastodon/pull/18135), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18160), [Gargron](https://github.com/mastodon/mastodon/pull/18171))
-  - Different threads no longer have to wait on a mutex over a single connection
-  - However, this does increase the number of Redis connections by a fair amount
-  - We are planning to optimize Redis use so that the pool can be made smaller in the future
-
-## Removed
-
- Remove IP matching from e-mail domain blocks ([Gargron](https://github.com/mastodon/mastodon/pull/18190))
-  - The IPs of the blocked e-mail domain or its MX records are no longer checked
-  - Previously it was too easy to block e-mail providers by mistake
-  
-## Fixed
-
- Fix compatibility with Friendica's pinned posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18254), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18260))
- Fix error when looking up handle with surrounding spaces in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18225))
- Fix double render error when authorizing interaction ([Gargron](https://github.com/mastodon/mastodon/pull/18203))
- Fix error when a post references an invalid media attachment ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18211))
- Fix error when trying to revoke OAuth token without supplying a token ([Gargron](https://github.com/mastodon/mastodon/pull/18205))
- Fix error caused by missing subject in Webfinger response ([Gargron](https://github.com/mastodon/mastodon/pull/18204))
- Fix error on attempting to delete an account moderation note ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18196))
- Fix light-mode emoji borders in web UI ([Gaelan](https://github.com/mastodon/mastodon/pull/18131))
- Fix being able to scroll away from the loading bar in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18170))
- Fix error when a bookmark or favorite has been reported and deleted ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18174))
- Fix being offered empty “Server rules violation” report option in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18165))
- Fix temporary network errors preventing from authorizing interactions with remote accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18161))
- Fix incorrect link in "new trending tags" email ([cdzombak](https://github.com/mastodon/mastodon/pull/18156))
- Fix missing indexes on some foreign keys ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18157))
- Fix n+1 query on feed merge and populate operations ([Gargron](https://github.com/mastodon/mastodon/pull/18111))
- Fix feed unmerge worker being exceptionally slow in some conditions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18110))
- Fix PeerTube videos appearing with an erroneous “Edited at” marker ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18100))
- Fix instance actor being created incorrectly when running through migrations ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18109))
- Fix web push notifications containing HTML entities ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18071))
- Fix inconsistent parsing of `TRUSTED_PROXY_IP` ([ykzts](https://github.com/mastodon/mastodon/pull/18051))
- Fix error when fetching pinned posts ([tribela](https://github.com/mastodon/mastodon/pull/18030))
- Fix wrong optimization in feed populate operation ([dogelover911](https://github.com/mastodon/mastodon/pull/18009))
- Fix error in alias settings page ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18004))
-
 ## [3.5.1] - 2022-04-08
 ### Added

--- a/8
+++ b/8
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 source 'https://rubygems.org'
-ruby '>= 2.6.0', '< 3.1.0'
+ruby '>= 2.5.0', '< 3.1.0'

 gem 'pkg-config', '~> 1.4'
 gem 'rexml', '~> 3.2'
@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1'

 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.11.1', require: false
+gem 'bootsnap', '~> 1.10.3', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.2'
@ -79,7 +79,7 @@ gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.6'
 gem 'sidekiq', '~> 6.4'
-gem 'sidekiq-scheduler', '~> 3.2'
+gem 'sidekiq-scheduler', '~> 3.1'
 gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.3'
@ -132,7 +132,7 @@ group :development do
  gem 'letter_opener', '~> 1.8'
  gem 'letter_opener_web', '~> 2.0'
  gem 'memory_profiler'
-  gem 'rubocop', '~> 1.27', require: false
+  gem 'rubocop', '~> 1.26', require: false
  gem 'rubocop-rails', '~> 2.14', require: false
  gem 'brakeman', '~> 5.2', require: false
  gem 'bundler-audit', '~> 0.9', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,40 +1,40 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actioncable (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionmailbox (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
      mail (>= 2.7.1)
-    actionmailer (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      actionview (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionmailer (6.1.5)
+      actionpack (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activesupport (= 6.1.5)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.1.5.1)
-      actionview (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionpack (6.1.5)
+      actionview (= 6.1.5)
+      activesupport (= 6.1.5)
      rack (~> 2.0, >= 2.0.9)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actiontext (6.1.5)
+      actionpack (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
      nokogiri (>= 1.8.5)
-    actionview (6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionview (6.1.5)
+      activesupport (= 6.1.5)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
@ -45,22 +45,22 @@ GEM
      case_transform (>= 0.2)
      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
    active_record_query_trace (1.8)
-    activejob (6.1.5.1)
-      activesupport (= 6.1.5.1)
+    activejob (6.1.5)
+      activesupport (= 6.1.5)
      globalid (>= 0.3.6)
-    activemodel (6.1.5.1)
-      activesupport (= 6.1.5.1)
-    activerecord (6.1.5.1)
-      activemodel (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
-    activestorage (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activerecord (6.1.5)
+      activemodel (= 6.1.5)
+      activesupport (= 6.1.5)
+    activestorage (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activesupport (= 6.1.5)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (6.1.5.1)
+    activesupport (6.1.5)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -81,20 +81,20 @@ GEM
    attr_required (1.0.1)
    awrence (1.1.1)
    aws-eventstream (1.2.0)
-    aws-partitions (1.582.0)
-    aws-sdk-core (3.130.2)
+    aws-partitions (1.558.0)
+    aws-sdk-core (3.127.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.56.0)
+    aws-sdk-kms (1.55.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.2)
+    aws-sdk-s3 (1.113.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
    bcrypt (3.1.17)
    better_errors (2.9.1)
@ -114,9 +114,9 @@ GEM
      debug_inspector (>= 0.0.1)
    blurhash (0.1.6)
      ffi (~> 1.14)
-    bootsnap (1.11.1)
+    bootsnap (1.10.3)
      msgpack (~> 1.2)
-    brakeman (5.2.2)
+    brakeman (5.2.1)
    browser (4.2.0)
    brpoplpush-redis_script (0.1.2)
      concurrent-ruby (~> 1.0, >= 1.0.5)
@ -216,7 +216,7 @@ GEM
      multi_json
    encryptor (3.0.0)
    erubi (1.10.0)
-    et-orbi (1.2.7)
+    et-orbi (1.2.6)
      tzinfo
    excon (0.76.0)
    fabrication (2.28.0)
@ -264,8 +264,8 @@ GEM
      fog-json (>= 1.0)
      ipaddress (>= 0.8)
    formatador (0.2.5)
-    fugit (1.5.3)
-      et-orbi (~> 1, >= 1.2.7)
+    fugit (1.5.2)
+      et-orbi (~> 1.1, >= 1.1.8)
      raabro (~> 1.4)
    fuubar (2.5.1)
      rspec-core (~> 3.0)
@ -307,7 +307,7 @@ GEM
      rainbow (>= 2.0.0)
    i18n (1.10.0)
      concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.9)
+    i18n-tasks (1.0.8)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
      better_html (~> 1.0)
@ -320,7 +320,7 @@ GEM
      terminal-table (>= 1.5.1)
    idn-ruby (0.1.4)
    ipaddress (0.8.3)
-    jmespath (1.6.1)
+    jmespath (1.6.0)
    json (2.5.1)
    json-canonicalization (0.3.0)
    json-jwt (1.13.0)
@ -375,7 +375,7 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.17.0)
+    loofah (2.16.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@ -397,7 +397,7 @@ GEM
    mini_mime (1.1.2)
    mini_portile2 (2.8.0)
    minitest (5.15.0)
-    msgpack (1.5.1)
+    msgpack (1.4.4)
    multi_json (1.15.0)
    multipart-post (2.1.1)
    net-ldap (0.17.0)
@ -405,7 +405,7 @@ GEM
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.3)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    nsa (0.2.8)
@ -448,7 +448,7 @@ GEM
    pastel (0.8.0)
      tty-color (~> 0.5)
    pg (1.3.5)
-    pghero (2.8.3)
+    pghero (2.8.2)
      activerecord (>= 5)
    pkg-config (1.4.7)
    posix-spawn (0.3.15)
@ -476,7 +476,7 @@ GEM
    raabro (1.4.0)
    racc (1.6.0)
    rack (2.2.3)
-    rack-attack (6.6.1)
+    rack-attack (6.6.0)
      rack (>= 1.0, < 3)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
@ -490,20 +490,20 @@ GEM
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.1.5.1)
-      actioncable (= 6.1.5.1)
-      actionmailbox (= 6.1.5.1)
-      actionmailer (= 6.1.5.1)
-      actionpack (= 6.1.5.1)
-      actiontext (= 6.1.5.1)
-      actionview (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activemodel (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    rails (6.1.5)
+      actioncable (= 6.1.5)
+      actionmailbox (= 6.1.5)
+      actionmailer (= 6.1.5)
+      actionpack (= 6.1.5)
+      actiontext (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activemodel (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
      bundler (>= 1.15.0)
-      railties (= 6.1.5.1)
+      railties (= 6.1.5)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -519,9 +519,9 @@ GEM
      railties (>= 6.0.0, < 7)
    rails-settings-cached (0.6.6)
      rails (>= 4.2.0)
-    railties (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    railties (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@ -534,7 +534,7 @@ GEM
    redis (4.5.1)
    redis-namespace (1.8.2)
      redis (>= 3.0.4)
-    regexp_parser (2.3.0)
+    regexp_parser (2.2.1)
    request_store (1.5.1)
      rack (>= 1.4)
    responders (3.0.1)
@ -552,10 +552,10 @@ GEM
    rspec-expectations (3.11.0)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.0)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.11.0)
-    rspec-rails (5.1.2)
+    rspec-rails (5.1.1)
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      railties (>= 5.2)
@ -569,7 +569,7 @@ GEM
    rspec-support (3.11.0)
    rspec_junit_formatter (0.5.1)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.27.0)
+    rubocop (1.26.1)
      parallel (~> 1.10)
      parser (>= 3.1.0.0)
      rainbow (>= 2.2.2, < 4.0)
@ -578,7 +578,7 @@ GEM
      rubocop-ast (>= 1.16.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.16.0)
      parser (>= 3.1.1.0)
    rubocop-rails (2.14.2)
      activesupport (>= 4.2.0)
@ -607,14 +607,14 @@ GEM
      redis (>= 4.2.0)
    sidekiq-bulk (0.2.0)
      sidekiq
-    sidekiq-scheduler (3.2.0)
+    sidekiq-scheduler (3.1.1)
      e2mmap
      redis (>= 3, < 5)
      rufus-scheduler (~> 3.2)
      sidekiq (>= 3)
      thwait
      tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.21)
+    sidekiq-unique-jobs (7.1.16)
      brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
      concurrent-ruby (~> 1.0, >= 1.0.5)
      sidekiq (>= 5.0, < 8.0)
@ -738,7 +738,7 @@ DEPENDENCIES
  better_errors (~> 2.9)
  binding_of_caller (~> 1.0)
  blurhash (~> 0.1)
-  bootsnap (~> 1.11.1)
+  bootsnap (~> 1.10.3)
  brakeman (~> 5.2)
  browser
  bullet (~> 7.0)
@ -825,14 +825,14 @@ DEPENDENCIES
  rspec-rails (~> 5.1)
  rspec-sidekiq (~> 3.1)
  rspec_junit_formatter (~> 0.5)
-  rubocop (~> 1.27)
+  rubocop (~> 1.26)
  rubocop-rails (~> 2.14)
  ruby-progressbar (~> 1.11)
  sanitize (~> 6.0)
  scenic (~> 1.6)
  sidekiq (~> 6.4)
  sidekiq-bulk (~> 0.2.0)
-  sidekiq-scheduler (~> 3.2)
+  sidekiq-scheduler (~> 3.1)
  sidekiq-unique-jobs (~> 7.1)
  simple-navigation (~> 4.3)
  simple_form (~> 5.1)
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@ -55,11 +55,6 @@ class StatusesIndex < Chewy::Index
    data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
  end

-  crutch :votes do |collection|
-    data = ::PollVote.joins(:poll).where(poll: { status_id: collection.map(&:id) }).where(account: Account.local).pluck(:status_id, :account_id)
-    data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
-  end
-
  root date_detection: false do
    field :id, type: 'long'
    field :account_id, type: 'long'
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@ -2,8 +2,6 @@

 module Admin
  class DashboardController < BaseController
-    include Redisable
-
    def index
      @system_checks         = Admin::SystemCheck.perform
      @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
@ -17,10 +15,10 @@ module Admin

    def redis_info
      @redis_info ||= begin
-        if redis.is_a?(Redis::Namespace)
-          redis.redis.info
+        if Redis.current.is_a?(Redis::Namespace)
+          Redis.current.redis.info
        else
-          redis.info
+          Redis.current.info
        end
      end
    end
--- a/app/controllers/api/v1/accounts/lookup_controller.rb
+++ b/app/controllers/api/v1/accounts/lookup_controller.rb
@ -12,7 +12,5 @@ class Api::V1::Accounts::LookupController < Api::BaseController

  def set_account
    @account = ResolveAccountService.new.call(params[:acct], skip_webfinger: true) || raise(ActiveRecord::RecordNotFound)
-  rescue Addressable::URI::InvalidURIError
-    raise(ActiveRecord::RecordNotFound)
  end
 end
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@ -21,7 +21,7 @@ class Api::V1::BookmarksController < Api::BaseController
  end

  def results
-    @_results ||= account_bookmarks.joins(:status).eager_load(:status).to_a_paginated_by_id(
+    @_results ||= account_bookmarks.eager_load(:status).to_a_paginated_by_id(
      limit_param(DEFAULT_STATUSES_LIMIT),
      params_slice(:max_id, :since_id, :min_id)
    )
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@ -21,7 +21,7 @@ class Api::V1::FavouritesController < Api::BaseController
  end

  def results
-    @_results ||= account_favourites.joins(:status).eager_load(:status).to_a_paginated_by_id(
+    @_results ||= account_favourites.eager_load(:status).to_a_paginated_by_id(
      limit_param(DEFAULT_STATUSES_LIMIT),
      params_slice(:max_id, :since_id, :min_id)
    )
--- a/app/controllers/authorize_interactions_controller.rb
+++ b/app/controllers/authorize_interactions_controller.rb
@ -13,7 +13,7 @@ class AuthorizeInteractionsController < ApplicationController
    if @resource.is_a?(Account)
      render :show
    elsif @resource.is_a?(Status)
-      redirect_to web_url("@#{@resource.account.pretty_acct}/#{@resource.id}")
+      redirect_to web_url("statuses/#{@resource.id}")
    else
      render :error
    end
@ -25,17 +25,15 @@ class AuthorizeInteractionsController < ApplicationController
    else
      render :error
    end
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
    render :error
  end

  private

  def set_resource
-    @resource = located_resource
+    @resource = located_resource || render(:error)
    authorize(@resource, :show?) if @resource.is_a?(Status)
-  rescue Mastodon::NotPermittedError
-    not_found
  end

  def located_resource
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@ -21,10 +21,7 @@ class FollowingAccountsController < ApplicationController
      end

      format.json do
-        if page_requested? && @account.hide_collections?
-          forbidden
-          next
-        end
+        raise Mastodon::NotPermittedError if page_requested? && @account.hide_collections?

        expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?)

--- a/app/controllers/media_proxy_controller.rb
+++ b/app/controllers/media_proxy_controller.rb
@ -3,7 +3,6 @@
 class MediaProxyController < ApplicationController
  include RoutingHelper
  include Authorization
-  include Redisable

  skip_before_action :store_current_location
  skip_before_action :require_functional!
@ -46,7 +45,7 @@ class MediaProxyController < ApplicationController
  end

  def lock_options
-    { redis: redis, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds }
+    { redis: Redis.current, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds }
  end

  def reject_media?
--- a/app/controllers/oauth/tokens_controller.rb
+++ b/app/controllers/oauth/tokens_controller.rb
@ -2,8 +2,7 @@

 class Oauth::TokensController < Doorkeeper::TokensController
  def revoke
-    unsubscribe_for_token if token.present? && authorized? && token.accessible?
-
+    unsubscribe_for_token if authorized? && token.accessible?
    super
  end

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

 class Settings::ExportsController < Settings::BaseController
  include Authorization
-  include Redisable

  skip_before_action :require_functional!

@ -29,6 +28,6 @@ class Settings::ExportsController < Settings::BaseController
  end

  def lock_options
-    { redis: redis, key: "backup:#{current_user.id}" }
+    { redis: Redis.current, key: "backup:#{current_user.id}" }
  end
 end
--- a/app/javascript/mastodon/components/common_counter.js
+++ b/app/javascript/mastodon/components/common_counter.js
@ -25,7 +25,7 @@ export function counterRenderer(counterType, isBold = true) {
    return (displayNumber, pluralReady) => (
      <FormattedMessage
        id='account.statuses_counter'
-        defaultMessage='{count, plural, one {{counter} Post} other {{counter} Posts}}'
+        defaultMessage='{count, plural, one {{counter} Toot} other {{counter} Toots}}'
        values={{
          count: pluralReady,
          counter: renderCounter(displayNumber),
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@ -56,7 +56,7 @@ const messages = defineMessages({
  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
  edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });

@ -349,7 +349,7 @@ class Status extends ImmutablePureComponent {
      prepend = (
        <div className='status__prepend'>
          <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' className='status__prepend-icon' fixedWidth /></div>
-          <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
+          <FormattedMessage id='status.pinned' defaultMessage='Pinned toot' />
        </div>
      );
    } else if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -38,7 +38,7 @@ const messages = defineMessages({
  showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
  enableNotifications: { id: 'account.enable_notifications', defaultMessage: 'Notify me when @{name} posts' },
  disableNotifications: { id: 'account.disable_notifications', defaultMessage: 'Stop notifying me when @{name} posts' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@ -121,8 +121,8 @@ export default class Header extends ImmutablePureComponent {

        {!hideTabs && (
          <div className='account__section-headline'>
-            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
-            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots and replies' /></NavLink>
            <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
          </div>
        )}
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@ -45,7 +45,7 @@ const mapStateToProps = (state, { params: { acct, id }, withReplies = false }) =
 };

 const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older posts' />} />
+  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older toots' />} />
 );

 RemoteHint.propTypes = {
@ -156,7 +156,7 @@ class AccountTimeline extends ImmutablePureComponent {
    } else if (remote && statusIds.isEmpty()) {
      emptyMessage = <RemoteHint url={remoteUrl} />;
    } else {
-      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No posts found' />;
+      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />;
    }

    const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.js
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.js
@ -70,7 +70,7 @@ class Bookmarks extends ImmutablePureComponent {
    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
    const pinned = !!columnId;

-    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked posts yet. When you bookmark one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked toots yet. When you bookmark one, it will show up here." />;

    return (
      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl';

 const messages = defineMessages({
  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@ -11,12 +11,12 @@ import Icon from 'mastodon/components/icon';

 const messages = defineMessages({
  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all, shown in public timelines' },
  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but not in public timelines' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
@ -242,7 +242,7 @@ class PrivacyDropdown extends React.PureComponent {

    if (!this.props.noDirect) {
      this.options.push(
-        { icon: 'at', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+        { icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
      );
    }
  }
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@ -91,7 +91,7 @@ class SearchResults extends ImmutablePureComponent {
      count   += results.get('statuses').size;
      statuses = (
        <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>

          {results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}

@ -101,10 +101,10 @@ class SearchResults extends ImmutablePureComponent {
    } else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
      statuses = (
        <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>

          <div className='search-results__info'>
-            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching posts by their content is not enabled on this Mastodon server.' />
+            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
          </div>
        </div>
      );
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@ -42,13 +42,13 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
  }

  if (hashtagWarning) {
-    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag." />} />;
+    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag." />} />;
  }

  if (directMessageWarning) {
    const message = (
      <span>
-        <FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
+        <FormattedMessage id='compose_form.direct_message_warning' defaultMessage='This toot will only be sent to all the mentioned users.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
      </span>
    );

--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@ -26,7 +26,7 @@ const messages = defineMessages({
  community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
-  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
+  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new toot' },
  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@ -76,7 +76,7 @@ class DirectTimeline extends React.PureComponent {
    return (
      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
        <ColumnHeader
-          icon='at'
+          icon='envelope'
          active={hasUnread}
          title={intl.formatMessage(messages.title)}
          onPin={this.handlePin}
@ -91,7 +91,6 @@ class DirectTimeline extends React.PureComponent {
          scrollKey={`direct_timeline-${columnId}`}
          timelineId='direct'
          onLoadMore={this.handleLoadMore}
-          prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />}
        />
      </Column>
--- a/app/javascript/mastodon/features/directory/components/account_card.js
+++ b/app/javascript/mastodon/features/directory/components/account_card.js
@ -191,7 +191,7 @@ class AccountCard extends ImmutablePureComponent {
            <div className='account-card__counters__item'>
              <ShortNumber value={account.get('statuses_count')} />
              <small>
-                <FormattedMessage id='account.posts' defaultMessage='Posts' />
+                <FormattedMessage id='account.posts' defaultMessage='Toots' />
              </small>
            </div>

--- a/app/javascript/mastodon/features/explore/results.js
+++ b/app/javascript/mastodon/features/explore/results.js
@ -100,7 +100,7 @@ class Results extends React.PureComponent {
          <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
          <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='People' /></button>
          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
-          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></button>
        </div>

        <div className='explore__search-results'>
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@ -70,7 +70,7 @@ class Favourites extends ImmutablePureComponent {
    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
    const pinned = !!columnId;

-    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite posts yet. When you favourite one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite toots yet. When you favourite one, it will show up here." />;

    return (
      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@ -59,7 +59,7 @@ class Favourites extends ImmutablePureComponent {
      );
    }

-    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this post yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this toot yet. When someone does, they will show up here.' />;

    return (
      <Column bindToDocument={!multiColumn}>
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@ -30,7 +30,7 @@ const messages = defineMessages({
  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
  discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
  personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
@ -130,7 +130,7 @@ class GettingStarted extends ImmutablePureComponent {
    }

    navItems.push(
-      <ColumnLink key='direct' icon='at' text={intl.formatMessage(messages.direct)} to='/conversations' />,
+      <ColumnLink key='direct' icon='envelope' text={intl.formatMessage(messages.direct)} to='/conversations' />,
      <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
      <ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
      <ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@ -86,7 +86,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
              </tr>
              <tr>
                <td><kbd>alt</kbd>+<kbd>n</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new post' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new toot' /></td>
              </tr>
              <tr>
                <td><kbd>alt</kbd>+<kbd>x</kbd></td>
@ -134,7 +134,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
              </tr>
              <tr>
                <td><kbd>g</kbd>+<kbd>p</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned toots list' /></td>
              </tr>
              <tr>
                <td><kbd>g</kbd>+<kbd>u</kbd></td>
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@ -145,7 +145,7 @@ export default class ColumnSettings extends React.PureComponent {
        </div>

        <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
+          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New toots:' /></span>

          <div className='column-settings__row'>
            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
--- a/app/javascript/mastodon/features/pinned_statuses/index.js
+++ b/app/javascript/mastodon/features/pinned_statuses/index.js
@ -10,7 +10,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';

 const messages = defineMessages({
-  heading: { id: 'column.pins', defaultMessage: 'Pinned post' },
+  heading: { id: 'column.pins', defaultMessage: 'Pinned toot' },
 });

 const mapStateToProps = state => ({
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@ -59,7 +59,7 @@ class Reblogs extends ImmutablePureComponent {
      );
    }

-    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this post yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this toot yet. When someone does, they will show up here.' />;

    return (
      <Column bindToDocument={!multiColumn}>
--- a/app/javascript/mastodon/features/report/category.js
+++ b/app/javascript/mastodon/features/report/category.js
@ -1,7 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Button from 'mastodon/components/button';
 import Option from './components/option';
@ -19,17 +17,11 @@ const messages = defineMessages({
  account: { id: 'report.category.title_account', defaultMessage: 'profile' },
 });

-const mapStateToProps = state => ({
-  rules: state.get('rules'),
-});
-
-export default @connect(mapStateToProps)
-@injectIntl
+export default @injectIntl
 class Category extends React.PureComponent {

  static propTypes = {
    onNextStep: PropTypes.func.isRequired,
-    rules: ImmutablePropTypes.list,
    category: PropTypes.string,
    onChangeCategory: PropTypes.func.isRequired,
    startedFrom: PropTypes.oneOf(['status', 'account']),
@ -61,17 +53,13 @@ class Category extends React.PureComponent {
  };

  render () {
-    const { category, startedFrom, rules, intl } = this.props;
+    const { category, startedFrom, intl } = this.props;

-    const options = rules.size > 0 ? [
+    const options = [
      'dislike',
      'spam',
      'violation',
      'other',
-    ] : [
-      'dislike',
-      'spam',
-      'other',
    ];

    return (
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@ -220,6 +220,7 @@ class ActionBar extends React.PureComponent {
      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
    } else {
      menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
+      menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick });
      menu.push(null);

      if (relationship && relationship.get('muting')) {
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@ -16,7 +16,7 @@ const NavigationPanel = () => (
    <NavLink className='column-link column-link--transparent' to='/explore' data-preview-title-id='explore.title' data-preview-icon='hashtag'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='explore.title' defaultMessage='Explore' /></NavLink>
    <NavLink className='column-link column-link--transparent' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
    <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='at' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
    <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
    <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@ -14,7 +14,6 @@ import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../act
 import { expandHomeTimeline } from '../../actions/timelines';
 import { expandNotifications } from '../../actions/notifications';
 import { fetchFilters } from '../../actions/filters';
-import { fetchRules } from '../../actions/rules';
 import { clearHeight } from '../../actions/height_cache';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
@ -369,7 +368,6 @@ class UI extends React.PureComponent {
    this.props.dispatch(expandHomeTimeline());
    this.props.dispatch(expandNotifications());
    setTimeout(() => this.props.dispatch(fetchFilters()), 500);
-    setTimeout(() => this.props.dispatch(fetchRules()), 3000);

    this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@ -1,59 +1,59 @@
 {
-  "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
  "account.badges.bot": "Bot",
-  "account.badges.group": "Groep",
-  "account.block": "Blok @{name}",
-  "account.block_domain": "Blokeer alles van {domain}",
-  "account.blocked": "Geblok",
-  "account.browse_more_on_origin_server": "Snuffel rond op oorspronklike profiel",
-  "account.cancel_follow_request": "Kanselleer volgversoek",
-  "account.direct": "Stuur direkte boodskap aan @{name}",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Cancel follow request",
+  "account.direct": "Direct message @{name}",
  "account.disable_notifications": "Stop notifying me when @{name} posts",
  "account.domain_blocked": "Domain blocked",
-  "account.edit_profile": "Redigeer profiel",
-  "account.enable_notifications": "Stel my in kennis wanneer @{name} plasings maak",
-  "account.endorse": "Beklemtoon op profiel",
-  "account.follow": "Volg",
-  "account.followers": "Volgelinge",
-  "account.followers.empty": "Niemand volg tans hierdie gebruiker nie.",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
  "account.following": "Following",
  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Volg jou",
-  "account.hide_reblogs": "Versteek hupstoot vanaf @{name}",
-  "account.joined": "{date} aangesluit",
-  "account.link_verified_on": "Eienaarskap van die skakel was getoets op {date}",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined": "Joined {date}",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
  "account.media": "Media",
-  "account.mention": "Noem @{name}",
-  "account.moved_to": "{name} is geskuif na:",
-  "account.mute": "Demp @{name}",
-  "account.mute_notifications": "Demp kennisgewings van @{name}",
-  "account.muted": "Gedemp",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
  "account.posts": "Toots",
  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Rapporteer @{name}",
+  "account.report": "Report @{name}",
  "account.requested": "Awaiting approval",
-  "account.share": "Deel @{name} se profiel",
-  "account.show_reblogs": "Wys hupstote vanaf @{name}",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Ontblok @{name}",
-  "account.unblock_domain": "Ontblok domein {domain}",
-  "account.unblock_short": "Ontblok",
-  "account.unendorse": "Moenie beklemtoon op profiel nie",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
  "account.unfollow": "Unfollow",
-  "account.unmute": "Ontdemp @{name}",
-  "account.unmute_notifications": "Ontdemp kennisgewings vanaf @{name}",
-  "account.unmute_short": "Ontdemp",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Click to add a note",
  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Gemiddeld",
+  "admin.dashboard.retention.average": "Average",
  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "Nuwe gebruikers",
-  "alert.rate_limited.message": "Probeer asb. weer na {retry_time, time, medium}.",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
  "alert.rate_limited.title": "Rate limited",
  "alert.unexpected.message": "An unexpected error occurred.",
  "alert.unexpected.title": "Oops!",
@ -70,7 +70,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Blocked domains",
  "column.favourites": "Favourites",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no blocked domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Visible for followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -70,7 +70,7 @@
  "column.blocks": "المُستَخدِمون المَحظورون",
  "column.bookmarks": "الفواصل المرجعية",
  "column.community": "الخيط الزمني المحلي",
-  "column.conversations": "المحادثات",
+  "column.direct": "الرسائل المباشرة",
  "column.directory": "تَصَفُّحُ المَلفات الشخصية",
  "column.domain_blocks": "النِّطاقَاتُ المَحظُورَة",
  "column.favourites": "المُفَضَّلَة",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "المحلي فقط",
  "community.column_settings.media_only": "الوسائط فقط",
  "community.column_settings.remote_only": "عن بُعد فقط",
+  "compose_form.direct_message_warning": "سوف تُرسَل هذه التَّبويقة فقط للمُستَخدِمين المَذكورين.",
  "compose_form.direct_message_warning_learn_more": "تَعَلَّم المَزيد",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "لن يُدرَج هذا المنشور تحت أي وسم بما أنَّه غير مُدرَج. فقط المنشورات العامة يُمكن البحث عنها بواسطة الوسم.",
  "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
  "compose_form.lock_disclaimer.lock": "مُقفَل",
@ -166,7 +166,7 @@
  "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
  "empty_column.bookmarked_statuses": "ليس لديك أية منشورات في الفواصل المرجعية بعد. عندما ستقوم بإضافة البعض منها، ستظهر هنا.",
  "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
-  "empty_column.conversations": "عندما ترسل أو تستلم منشورًا محصورٌا على الأشخاص المشار إليهم فيه، سيظهر هنا.",
+  "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
  "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "للترقية",
  "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
  "keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
-  "keyboard_shortcuts.conversations": "لفتح عمود المحادثات",
  "keyboard_shortcuts.description": "الوصف",
+  "keyboard_shortcuts.direct": "لفتح عمود الرسائل المباشرة",
  "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
  "keyboard_shortcuts.enter": "لفتح المنشور",
  "keyboard_shortcuts.favourite": "للإضافة إلى المفضلة",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "الفواصل المرجعية",
  "navigation_bar.community_timeline": "الخيط العام المحلي",
  "navigation_bar.compose": "لتحرير منشور جديد",
+  "navigation_bar.direct": "الرسائل المباشِرة",
  "navigation_bar.discover": "اكتشف",
  "navigation_bar.domain_blocks": "النطاقات المخفية",
  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
@ -308,7 +309,7 @@
  "navigation_bar.preferences": "التفضيلات",
  "navigation_bar.public_timeline": "الخيط العام الموحد",
  "navigation_bar.security": "الأمان",
-  "notification.admin.sign_up": "أنشأ {name} حسابًا",
+  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "أُعجِب {name} بمنشورك",
  "notification.follow": "{name} يتابعك",
  "notification.follow_request": "لقد طلب {name} متابعتك",
@ -317,7 +318,7 @@
  "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
  "notification.reblog": "قام {name} بمشاركة منشورك",
  "notification.status": "{name} نشر للتو",
-  "notification.update": "عدّلَ {name} منشورًا",
+  "notification.update": "{name} edited a post",
  "notifications.clear": "امسح الإخطارات",
  "notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
  "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "إزالة استطلاع الرأي",
  "privacy.change": "اضبط خصوصية المنشور",
  "privacy.direct.long": "أنشر إلى المستخدمين المشار إليهم فقط",
-  "privacy.direct.short": "للمشار إليهم فقط",
+  "privacy.direct.short": "مباشر",
  "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "مرئي للكل",
+  "privacy.private.short": "لمتابعيك فقط",
+  "privacy.public.long": "أنشر على الخيوط العامة",
  "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
  "privacy.unlisted.short": "غير مدرج",
  "refresh": "أنعِش",
  "regeneration_indicator.label": "جارٍ التحميل…",
@ -407,8 +408,8 @@
  "report.placeholder": "تعليقات إضافية",
  "report.reasons.dislike": "لايعجبني",
  "report.reasons.dislike_description": "ألا ترغب برؤيته",
-  "report.reasons.other": "شيء آخر",
-  "report.reasons.other_description": "لا تندرج هذه المشكلة ضمن فئات أخرى",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
  "report.reasons.spam": "إنها رسالة مزعجة",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "ينتهك قواعد الخادم",
@ -455,8 +456,8 @@
  "status.embed": "إدماج",
  "status.favourite": "أضف إلى المفضلة",
  "status.filtered": "مُصفّى",
-  "status.history.created": "أنشأه {name} {date}",
-  "status.history.edited": "عدله {name} {date}",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
  "status.load_more": "حمّل المزيد",
  "status.media_hidden": "الصورة مستترة",
  "status.mention": "أذكُر @{name}",
@ -514,7 +515,7 @@
  "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
  "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
  "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "لم يُضف وصف",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "تعديل",
  "upload_form.thumbnail": "غيّر الصورة المصغرة",
  "upload_form.undo": "حذف",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -70,7 +70,7 @@
  "column.blocks": "Usuarios bloquiaos",
  "column.bookmarks": "Marcadores",
  "column.community": "Llinia temporal llocal",
-  "column.conversations": "Conversations",
+  "column.direct": "Mensaxes direutos",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Dominios anubríos",
  "column.favourites": "Favoritos",
@ -92,9 +92,9 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Namái multimedia",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "Esti barritu namái va unviase a los usuarios mentaos.",
  "compose_form.direct_message_warning_learn_more": "Saber más",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
  "compose_form.placeholder": "¿En qué pienses?",
@ -166,11 +166,11 @@
  "empty_column.blocks": "Entá nun bloquiesti a nengún usuariu.",
  "empty_column.bookmarked_statuses": "Entá nun tienes nengún barritu en Marcadores. Cuando amiestes unu, va amosase equí.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Entá nun tienes nuengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí.",
  "empty_column.domain_blocks": "Entá nun hai dominios anubríos.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Entá nun tienes nengún barritu en Favoritos. Cuando amiestes unu, va amosase equí.",
-  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
  "empty_column.follow_requests": "Entá nun tienes nenguna solicitú de siguimientu. Cuando recibas una, va amosase equí.",
  "empty_column.hashtag": "Entá nun hai nada nesta etiqueta.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "pa compartir un toot",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "Enfocar l'área de composición",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "Abrir la columna de los mensaxes direutos",
  "keyboard_shortcuts.down": "pa baxar na llista",
  "keyboard_shortcuts.enter": "p'abrir estaos",
  "keyboard_shortcuts.favourite": "p'amestar a Favoritos",
@ -289,7 +289,8 @@
  "navigation_bar.blocks": "Usuarios bloquiaos",
  "navigation_bar.bookmarks": "Marcadores",
  "navigation_bar.community_timeline": "Llinia temporal llocal",
-  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Mensaxes direutos",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Dominios anubríos",
  "navigation_bar.edit_profile": "Editar el perfil",
@ -368,10 +369,10 @@
  "privacy.direct.long": "Post to mentioned users only",
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Namái siguidores",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Nun apaez nes llinies temporales públiques",
  "privacy.unlisted.short": "Nun llistar",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Cargando…",
@ -403,7 +404,7 @@
  "report.forward_hint": "La cuenta ye d'otru sirvidor. ¿Quies unviar ellí tamién una copia anónima del informe?",
  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Siguiente",
+  "report.next": "Next",
  "report.placeholder": "Comentarios adicionales",
  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
@ -411,7 +412,7 @@
  "report.reasons.other_description": "The issue does not fit into other categories",
  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
-  "report.reasons.violation": "Incumple les regles del sirvidor",
+  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
  "report.rules.subtitle": "Select all that apply",
  "report.rules.title": "Which rules are being violated?",
@ -419,7 +420,7 @@
  "report.statuses.title": "Are there any posts that back up this report?",
  "report.submit": "Unviar",
  "report.target": "Report {target}",
-  "report.thanks.take_action": "Equí tan les opciones pa controlar qué ver en Mastodon:",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
  "report.thanks.title": "Don't want to see this?",
  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
@ -501,7 +502,7 @@
  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
  "timeline_hint.resources.followers": "Followers",
  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older posts",
+  "timeline_hint.resources.statuses": "Older toots",
  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
  "trends.trending_now": "Trending now",
  "ui.beforeunload": "El borrador va perdese si coles de Mastodon.",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -70,7 +70,7 @@
  "column.blocks": "Блокирани потребители",
  "column.bookmarks": "Отметки",
  "column.community": "Локална емисия",
-  "column.conversations": "Conversations",
+  "column.direct": "Директни съобщения",
  "column.directory": "Преглед на профили",
  "column.domain_blocks": "Hidden domains",
  "column.favourites": "Любими",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Само локално",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Само дистанционно",
+  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Още информация",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Тази публикация няма да бъде изброена под нито един хаштаг, тъй като е скрита. Само публични публикации могат да се търсят по хаштаг.",
  "compose_form.lock_disclaimer": "Вашият акаунт не е {locked}. Всеки може да ви последва, за да прегледа вашите публикации само за последователи.",
  "compose_form.lock_disclaimer.lock": "заключено",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Не сте блокирали потребители все още.",
  "empty_column.bookmarked_statuses": "Все още нямате отметнати публикации. Когато отметнете някоя, тя ще се покаже тук.",
  "empty_column.community": "Локалната емисия е празна. Напишете нещо публично, за да започнете!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Все още нямате директни съобщения. Когато изпратите или получите някое, то ще се покаже тук.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Все още нямате любими публикации. Когато поставите някоя в любими, тя ще се покаже тук.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "за споделяне",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "за фокусиране на текстовото пространство за композиране",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Описание",
+  "keyboard_shortcuts.direct": "за отваряне на колона за директни съобщения",
  "keyboard_shortcuts.down": "за придвижване надолу в списъка",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "за поставяне в любими",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Отметки",
  "navigation_bar.community_timeline": "Локална емисия",
  "navigation_bar.compose": "Композиране на нова публикация",
+  "navigation_bar.direct": "Директни съобщения",
  "navigation_bar.discover": "Откриване",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Редактирай профил",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Премахване на анкета",
  "privacy.change": "Adjust status privacy",
  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Директно",
  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Само за последователи",
+  "privacy.public.long": "Post to public timelines",
  "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Скрито",
  "refresh": "Опресняване",
  "regeneration_indicator.label": "Зареждане…",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -70,7 +70,7 @@
  "column.blocks": "যাদের ব্লক করা হয়েছে",
  "column.bookmarks": "বুকমার্ক",
  "column.community": "স্থানীয় সময়সারি",
-  "column.conversations": "Conversations",
+  "column.direct": "সরাসরি লেখা",
  "column.directory": "প্রোফাইল ব্রাউজ করুন",
  "column.domain_blocks": "লুকোনো ডোমেনগুলি",
  "column.favourites": "পছন্দের গুলো",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "শুধুমাত্র স্থানীয়",
  "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
  "community.column_settings.remote_only": "শুধুমাত্র দূরবর্তী",
+  "compose_form.direct_message_warning": "শুধুমাত্র যাদেরকে উল্লেখ করা হয়েছে তাদেরকেই এই টুটটি পাঠানো হবে ।",
  "compose_form.direct_message_warning_learn_more": "আরো জানুন",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "কোনো হ্যাশট্যাগের ভেতরে এই টুটটি থাকবেনা কারণ এটি তালিকাবহির্ভূত। শুধুমাত্র প্রকাশ্য ঠোটগুলো হ্যাশট্যাগের ভেতরে খুঁজে পাওয়া যাবে।",
  "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
  "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
@ -166,7 +166,7 @@
  "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের ব্লক করেন নি।",
  "empty_column.bookmarked_statuses": "আপনার কাছে এখনও কোনও বুকমার্কড টুট নেই। আপনি যখন একটি বুকমার্ক করেন, এটি এখানে প্রদর্শিত হবে।",
  "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "আপনার কাছে সরাসরি পাঠানো কোনো লেখা নেই। যদি কেও পাঠায়, সেটা এখানে দেখা যাবে।",
  "empty_column.domain_blocks": "এখনও কোনও লুকানো ডোমেন নেই।",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "সমর্থন করতে",
  "keyboard_shortcuts.column": "কোনো কলামএ কোনো লেখা ফোকাস করতে",
  "keyboard_shortcuts.compose": "লেখা সম্পদনার জায়গায় ফোকাস করতে",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "বিবরণ",
+  "keyboard_shortcuts.direct": "সরাসরি পাঠানো লেখা দেখতে",
  "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে",
  "keyboard_shortcuts.enter": "অবস্থা দেখতে",
  "keyboard_shortcuts.favourite": "পছন্দের দেখতে",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "বুকমার্ক",
  "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
  "navigation_bar.compose": "নতুন টুট লিখুন",
+  "navigation_bar.direct": "সরাসরি লেখাগুলি",
  "navigation_bar.discover": "ঘুরে দেখুন",
  "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
  "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
  "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
  "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "সরাসরি",
  "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "শুধুমাত্র অনুসরণকারীদের জন্য",
+  "privacy.public.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে লিখতে",
  "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে না দেখাতে",
  "privacy.unlisted.short": "প্রকাশ্য নয়",
  "refresh": "সতেজ করা",
  "regeneration_indicator.label": "আসছে…",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -70,7 +70,7 @@
  "column.blocks": "Implijer·ezed·ien berzet",
  "column.bookmarks": "Sinedoù",
  "column.community": "Red-amzer lec'hel",
-  "column.conversations": "Conversations",
+  "column.direct": "Kemennadoù prevez",
  "column.directory": "Mont a-dreuz ar profiloù",
  "column.domain_blocks": "Domani berzet",
  "column.favourites": "Muiañ-karet",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Nemet lec'hel",
  "community.column_settings.media_only": "Nemet Mediaoù",
  "community.column_settings.remote_only": "Nemet a-bell",
+  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ezed·ien meneget.",
  "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Ne vo ket lakaet an toud-mañ er rolloù gerioù-klik dre mard eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal heuliañ ac'hanoc'h evit gwelout ho toudoù prevez.",
  "compose_form.lock_disclaimer.lock": "prennet",
@ -166,7 +166,7 @@
  "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
  "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "N'ho peus kemennad prevez ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
  "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "da skignañ",
  "keyboard_shortcuts.column": "Fokus ar bann",
  "keyboard_shortcuts.compose": "Fokus an takad testenn",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Deskrivadur",
+  "keyboard_shortcuts.direct": "Digeriñ bann ar c'hemennadennoù prevez",
  "keyboard_shortcuts.down": "Diskennañ er roll",
  "keyboard_shortcuts.enter": "evit digeriñ un toud",
  "keyboard_shortcuts.favourite": "Lakaat an toud evel muiañ-karet",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Sinedoù",
  "navigation_bar.community_timeline": "Red-amzer lec'hel",
  "navigation_bar.compose": "Skrivañ un toud nevez",
+  "navigation_bar.direct": "Kemennadoù prevez",
  "navigation_bar.discover": "Dizoleiñ",
  "navigation_bar.domain_blocks": "Domanioù kuzhet",
  "navigation_bar.edit_profile": "Aozañ ar profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Dilemel ar sontadeg",
  "privacy.change": "Kemmañ gwelidigezh ar statud",
  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "War-eeun",
  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Ar re a heuilh ac'hanon hepken",
+  "privacy.public.long": "Embann war ar redoù-amzer foran",
  "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Na embann war ar redoù-amzer foran",
  "privacy.unlisted.short": "Anlistennet",
  "refresh": "Freskaat",
  "regeneration_indicator.label": "O kargañ…",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -1,6 +1,6 @@
 {
  "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Afegeix o treu de les llistes",
+  "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
  "account.badges.bot": "Bot",
  "account.badges.group": "Grup",
  "account.block": "Bloqueja @{name}",
@ -8,7 +8,7 @@
  "account.blocked": "Bloquejat",
  "account.browse_more_on_origin_server": "Navega més en el perfil original",
  "account.cancel_follow_request": "Anul·la la sol·licitud de seguiment",
-  "account.direct": "Envia missatge directe a @{name}",
+  "account.direct": "Missatge directe @{name}",
  "account.disable_notifications": "Deixa de notificar-me les publicacions de @{name}",
  "account.domain_blocked": "Domini bloquejat",
  "account.edit_profile": "Edita el perfil",
@ -18,49 +18,49 @@
  "account.followers": "Seguidors",
  "account.followers.empty": "Encara ningú no segueix aquest usuari.",
  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
-  "account.following": "Seguits",
+  "account.following": "Seguint",
  "account.following_counter": "{count, plural, other {{counter} Seguint}}",
-  "account.follows.empty": "Aquest usuari encara no segueix ningú.",
+  "account.follows.empty": "Aquest usuari encara no segueix a ningú.",
  "account.follows_you": "Et segueix",
  "account.hide_reblogs": "Amaga els impulsos de @{name}",
-  "account.joined": "Membre des de {date}",
+  "account.joined": "Unit des de {date}",
  "account.link_verified_on": "La propietat d'aquest enllaç es va verificar el dia {date}",
  "account.locked_info": "Aquest estat de privadesa del compte està definit com a bloquejat. El propietari revisa manualment qui pot seguir-lo.",
  "account.media": "Mèdia",
  "account.mention": "Esmenta @{name}",
-  "account.moved_to": "{name} s'ha traslladat a:",
+  "account.moved_to": "{name} s'ha mogut a:",
  "account.mute": "Silencia @{name}",
-  "account.mute_notifications": "Silencia les notificacions de @{name}",
+  "account.mute_notifications": "Notificacions silenciades de @{name}",
  "account.muted": "Silenciat",
  "account.posts": "Publicacions",
  "account.posts_with_replies": "Publicacions i respostes",
-  "account.report": "Informa sobre @{name}",
-  "account.requested": "Esperant aprovació. Fes clic per cancel·lar la petició de seguiment",
+  "account.report": "Informar sobre @{name}",
+  "account.requested": "Esperant aprovació. Clic per a cancel·lar la petició de seguiment",
  "account.share": "Comparteix el perfil de @{name}",
  "account.show_reblogs": "Mostra els impulsos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Publicació} other {{counter} Publicacions}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
  "account.unblock": "Desbloqueja @{name}",
  "account.unblock_domain": "Desbloqueja el domini {domain}",
  "account.unblock_short": "Desbloqueja",
-  "account.unendorse": "No recomanis en el perfil",
+  "account.unendorse": "No recomanar en el perfil",
  "account.unfollow": "Deixa de seguir",
-  "account.unmute": "Deixa de silenciar @{name}",
+  "account.unmute": "Treure silenci de @{name}",
  "account.unmute_notifications": "Activar notificacions de @{name}",
  "account.unmute_short": "Deixa de silenciar",
  "account_note.placeholder": "Fes clic per afegir una nota",
-  "admin.dashboard.daily_retention": "Ràtio de retenció d'usuaris nous, per dia, després del registre",
-  "admin.dashboard.monthly_retention": "Ràtio de retenció d'usuaris nous, per mes, després del registre",
+  "admin.dashboard.daily_retention": "Ràtio de retenció per dia després del registre",
+  "admin.dashboard.monthly_retention": "Ràtio de retenció per mes després del registre",
  "admin.dashboard.retention.average": "Mitjana",
-  "admin.dashboard.retention.cohort": "Mes del registre",
+  "admin.dashboard.retention.cohort": "Registres mes",
  "admin.dashboard.retention.cohort_size": "Nous usuaris",
-  "alert.rate_limited.message": "Si us plau, torna-ho a provar després de {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Si us plau prova-ho després de {retry_time, time, medium}.",
  "alert.rate_limited.title": "Límit de freqüència",
  "alert.unexpected.message": "S'ha produït un error inesperat.",
  "alert.unexpected.title": "Vaja!",
  "announcement.announcement": "Anunci",
  "attachments_list.unprocessed": "(sense processar)",
  "autosuggest_hashtag.per_week": "{count} per setmana",
-  "boost_modal.combo": "Pots prémer {combo} per evitar-ho el pròxim cop",
+  "boost_modal.combo": "Pots prémer {combo} per saltar-te això el proper cop",
  "bundle_column_error.body": "S'ha produït un error en carregar aquest component.",
  "bundle_column_error.retry": "Torna-ho a provar",
  "bundle_column_error.title": "Error de connexió",
@ -70,8 +70,8 @@
  "column.blocks": "Usuaris bloquejats",
  "column.bookmarks": "Marcadors",
  "column.community": "Línia de temps local",
-  "column.conversations": "Converses",
-  "column.directory": "Navega pels perfils",
+  "column.direct": "Missatges directes",
+  "column.directory": "Navega els perfils",
  "column.domain_blocks": "Dominis bloquejats",
  "column.favourites": "Favorits",
  "column.follow_requests": "Peticions per a seguir-te",
@ -92,50 +92,50 @@
  "community.column_settings.local_only": "Només local",
  "community.column_settings.media_only": "Només multimèdia",
  "community.column_settings.remote_only": "Només remot",
-  "compose_form.direct_message_warning_learn_more": "Més informació",
-  "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació perillosa mitjançant Mastodon.",
-  "compose_form.hashtag_warning": "Aquesta publicació no es mostrarà en cap etiqueta, ja que no està llistada. Només les publicacions públiques es poden cercar per etiqueta.",
-  "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges només per a seguidors.",
+  "compose_form.direct_message_warning": "Aquesta publicació només serà enviat als usuaris esmentats.",
+  "compose_form.direct_message_warning_learn_more": "Aprèn més",
+  "compose_form.hashtag_warning": "Aquesta publicació no es mostrarà en cap etiqueta ja que no està llistada. Només les publicacions públiques poden ser cercades per etiqueta.",
+  "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges només a seguidors.",
  "compose_form.lock_disclaimer.lock": "bloquejat",
-  "compose_form.placeholder": "Què et passa pel cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
+  "compose_form.placeholder": "En què penses?",
+  "compose_form.poll.add_option": "Afegir una opció",
  "compose_form.poll.duration": "Durada de l'enquesta",
  "compose_form.poll.option_placeholder": "Opció {number}",
  "compose_form.poll.remove_option": "Elimina aquesta opció",
  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
-  "compose_form.poll.switch_to_single": "Canvia l’enquesta per permetre una única opció",
-  "compose_form.publish": "Publica",
+  "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
+  "compose_form.publish": "Publicar",
  "compose_form.publish_loud": "{publish}!",
  "compose_form.save_changes": "Desa els canvis",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca contingut com a sensible} other {Marca contingut com a sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
-  "compose_form.spoiler.marked": "Elimina l'avís de contingut",
+  "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Mèdia està marcat com a sensible} other {Mèdia estan marcats com a sensible}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Mèdia no està marcada com a sensible} other {Mèdia no estan marcats com a sensibles}}",
+  "compose_form.spoiler.marked": "Treu l'avís de contingut",
  "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
  "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
  "confirmation_modal.cancel": "Cancel·la",
  "confirmations.block.block_and_report": "Bloqueja i informa",
  "confirmations.block.confirm": "Bloqueja",
-  "confirmations.block.message": "Segur que vols bloquejar a {name}?",
+  "confirmations.block.message": "Estàs segur que vols bloquejar a {name}?",
  "confirmations.delete.confirm": "Suprimeix",
-  "confirmations.delete.message": "Segur que vols suprimir aquesta publicació?",
+  "confirmations.delete.message": "Estàs segur que vols suprimir aquesta publicació?",
  "confirmations.delete_list.confirm": "Suprimeix",
-  "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
+  "confirmations.delete_list.message": "Estàs segur que vols suprimir permanentment aquesta llista?",
  "confirmations.discard_edit_media.confirm": "Descarta",
-  "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
+  "confirmations.discard_edit_media.message": "Tens canvis no desats de la descripciò de mèdia o previsualització, els vols descartar?",
  "confirmations.domain_block.confirm": "Bloqueja el domini sencer",
-  "confirmations.domain_block.message": "N'estàs segur del tot que vols bloquejar totalment {domain}? En la majoria dels casos, bloquejar o silenciar uns pocs objectius és suficient i preferible. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. Els teus seguidors d’aquest domini s'elimiran.",
+  "confirmations.domain_block.message": "Estàs segur, realment segur que vols bloquejar totalment {domain}? En la majoria dels casos bloquejar o silenciar uns pocs objectius és suficient i preferible. No veuràs contingut d’aquest domini en cap de les línies de temps ni en les notificacions. Els teus seguidors d’aquest domini seran eliminats.",
  "confirmations.logout.confirm": "Tancar sessió",
  "confirmations.logout.message": "Segur que vols tancar la sessió?",
  "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen, però encara els permetrà veure les teves i seguir-te.",
-  "confirmations.mute.message": "Segur que vols silenciar {name}?",
-  "confirmations.redraft.confirm": "Esborra'l i reescriure-lo",
-  "confirmations.redraft.message": "Segur que vols esborrar aquesta publicació i tornar-la a escriure? Perdràs tots els impulsos i els favorits, i les respostes a la publicació original es quedaran orfes.",
+  "confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen però encara els permetrà veure les teves i seguir-te.",
+  "confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
+  "confirmations.redraft.confirm": "Esborrar i refer",
+  "confirmations.redraft.message": "Estàs segur que vols esborrar aquesta publicació i tornar a redactar-la? Perdràs tots els impulsos i favorits, i les respostes a la publicació original es quedaran orfes.",
  "confirmations.reply.confirm": "Respon",
-  "confirmations.reply.message": "Si respons ara, sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
+  "confirmations.reply.message": "Responen ara es sobreescriurà el missatge que estàs editant. Estàs segur que vols continuar?",
  "confirmations.unfollow.confirm": "Deixa de seguir",
-  "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
+  "confirmations.unfollow.message": "Estàs segur que vols deixar de seguir {name}?",
  "conversation.delete": "Elimina la conversa",
  "conversation.mark_as_read": "Marca com a llegida",
  "conversation.open": "Veure conversa",
@ -144,7 +144,7 @@
  "directory.local": "Només de {domain}",
  "directory.new_arrivals": "Arribades noves",
  "directory.recently_active": "Recentment actius",
-  "embed.instructions": "Incrusta aquesta publicació a la teva pàgina web copiant el codi següent.",
+  "embed.instructions": "Incrusta aquest tut al lloc web copiant el codi a continuació.",
  "embed.preview": "Aquí està quin aspecte tindrà:",
  "emoji_button.activity": "Activitat",
  "emoji_button.custom": "Personalitzat",
@ -159,32 +159,32 @@
  "emoji_button.search": "Cerca...",
  "emoji_button.search_results": "Resultats de la cerca",
  "emoji_button.symbols": "Símbols",
-  "emoji_button.travel": "Viatges i llocs",
+  "emoji_button.travel": "Viatges i Llocs",
  "empty_column.account_suspended": "Compte suspès",
-  "empty_column.account_timeline": "Aquí no hi ha publicacions!",
+  "empty_column.account_timeline": "No hi ha publicacions aquí!",
  "empty_column.account_unavailable": "Perfil no disponible",
  "empty_column.blocks": "Encara no has bloquejat cap usuari.",
-  "empty_column.bookmarked_statuses": "Encara no has marcat com publicació com a preferida. Quan en marquis una apareixerà aquí.",
-  "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per posar-ho tot en marxa!",
-  "empty_column.conversations": "Cada vegada que envies o reps una publicació que és només visible per la gent que hi has mencionat en ella, serà mostrada aquí.",
+  "empty_column.bookmarked_statuses": "Encara no tens desada a marcadors cap publicació. Quan desis una apareixerà aquí.",
+  "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per a fer rodar la pilota!",
+  "empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
  "empty_column.domain_blocks": "Encara no hi ha dominis bloquejats.",
-  "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Revisa-ho més tard!",
-  "empty_column.favourited_statuses": "Encara no has marcat cap publicació com a preferida. Quan les marquis, apareixeran aquí.",
-  "empty_column.favourites": "Encara ningú no ha marcat aquesta publicació com a preferida. Quan algú ho faci, apareixerà aquí.",
-  "empty_column.follow_recommendations": "Sembla que no s'han pogut generar suggeriments per a tu. Pots provar d'usar la cerca per trobar persones que vulguis conèixer o explorar les etiquetes en tendència.",
+  "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Verifica-ho més tard!",
+  "empty_column.favourited_statuses": "Encara no has afavorit cap publicació. Quan ho facis, apareixerà aquí.",
+  "empty_column.favourites": "Ningú no ha afavorit aquesta publicació encara. Quan algú ho faci, apareixerà aquí.",
+  "empty_column.follow_recommendations": "Sembla que no es poden generar sugerencies per a tu. Pots provar d'emprar la cerca per a trobar gent que voldries conèixer o explorar les etiquetes en tendència.",
  "empty_column.follow_requests": "Encara no tens cap petició de seguiment. Quan en rebis una, apareixerà aquí.",
  "empty_column.hashtag": "Encara no hi ha res en aquesta etiqueta.",
-  "empty_column.home": "La teva línia de temps és buida! Segueix més gent per omplir-la. {suggestions}",
-  "empty_column.home.suggestions": "Mira algunes suggeriments",
+  "empty_column.home": "La teva línia de temps és buida! Segueix més gent per a emplenar-la. {suggestions}",
+  "empty_column.home.suggestions": "Mira algunes sugerencies",
  "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin noves publicacions, apareixeran aquí.",
-  "empty_column.lists": "Encara no tens cap llista. Quan en creïs una, apareixerà aquí.",
+  "empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
  "empty_column.mutes": "Encara no has silenciat cap usuari.",
-  "empty_column.notifications": "Encara no tens notificacions. Quan altres persones interactuïn amb tu, les veuràs aquí.",
-  "empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
-  "error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
-  "error.unexpected_crash.explanation_addons": "Aquesta pàgina no s'ha pogut mostrar correctament. És probable que aquest error sigui causat per un complement del navegador o per eines de traducció automàtica.",
-  "error.unexpected_crash.next_steps": "Prova d'actualitzar la pàgina. Si això no serveix, és possible que encara puguis fer servir Mastodon a través d'un navegador diferent o amb una aplicació nativa.",
-  "error.unexpected_crash.next_steps_addons": "Prova de desactivar-los i actualitza la pàgina. Si això no serveix, és possible que encara puguis fer servir Mastodon amb un altre navegador o una aplicació nativa.",
+  "empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
+  "empty_column.public": "No hi ha res aquí! Escriu públicament alguna cosa o manualment segueix usuaris d'altres servidors per a omplir-ho",
+  "error.unexpected_crash.explanation": "A causa d'un bug en el nostre codi o un problema de compatibilitat del navegador, aquesta pàgina podria no ser mostrada correctament.",
+  "error.unexpected_crash.explanation_addons": "Aquesta pàgina podria no mostrar-se correctament. Aquest error és possiblement causat per una extensió del navegador o per eienes automàtiques de traducció.",
+  "error.unexpected_crash.next_steps": "Prova recarregant la pàgina. Si això no ajuda, encara podries ser capaç d'utilitzar Mastodon a través d'un navegador diferent o amb una aplicació nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prova de desactivar-les i refrescant la pàgina. Si això no ajuda, encara pots ser capaç d’utilitzar Mastodon amb un altre navegador o aplicació nativa.",
  "errors.unexpected_crash.copy_stacktrace": "Còpia stacktrace al porta-retalls",
  "errors.unexpected_crash.report_issue": "Informa d'un problema",
  "explore.search_results": "Resultats de la cerca",
@ -198,16 +198,16 @@
  "follow_recommendations.lead": "Les publicacions del usuaris que segueixes es mostraran en ordre cronològic en la teva línia de temps Inici. No tinguis por en cometre errors, pots fàcilment deixar de seguir-los en qualsevol moment!",
  "follow_request.authorize": "Autoritza",
  "follow_request.reject": "Rebutja",
-  "follow_requests.unlocked_explanation": "Tot i que el teu compte no està bloquejat, el personal de {domain} ha pensat que és possible que vulguis revisar les sol·licituds de seguiment d’aquests comptes manualment.",
+  "follow_requests.unlocked_explanation": "Tot i que el teu compte no està bloquejat, el personal de {domain} ha pensat que és possible que vulguis revisar les sol·licituds de seguiment d’aquests comptes de forma manual.",
  "generic.saved": "Desat",
  "getting_started.developers": "Desenvolupadors",
  "getting_started.directory": "Directori de perfils",
  "getting_started.documentation": "Documentació",
-  "getting_started.heading": "Primers passos",
-  "getting_started.invite": "Convidar gent",
+  "getting_started.heading": "Primeres passes",
+  "getting_started.invite": "Convida gent",
  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir-hi o informar de problemes a GitHub a {github}.",
  "getting_started.security": "Configuració del compte",
-  "getting_started.terms": "Condicions de servei",
+  "getting_started.terms": "Termes del servei",
  "hashtag.column_header.tag_mode.all": "i {additional}",
  "hashtag.column_header.tag_mode.any": "o {additional}",
  "hashtag.column_header.tag_mode.none": "sense {additional}",
@ -225,20 +225,20 @@
  "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
  "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
  "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
-  "keyboard_shortcuts.back": "Anar enrere",
+  "keyboard_shortcuts.back": "Navegar enrere",
  "keyboard_shortcuts.blocked": "Obre la llista d'usuaris bloquejats",
  "keyboard_shortcuts.boost": "Impulsa publicació",
-  "keyboard_shortcuts.column": "Centra la columna",
-  "keyboard_shortcuts.compose": "Centra l'àrea de composició del text",
-  "keyboard_shortcuts.conversations": "per a obrir la columna de converses",
+  "keyboard_shortcuts.column": "Centra columna",
+  "keyboard_shortcuts.compose": "Centra l'àrea de composició de text",
  "keyboard_shortcuts.description": "Descripció",
-  "keyboard_shortcuts.down": "Mou-lo avall en la llista",
+  "keyboard_shortcuts.direct": "Obre la columna de missatges directes",
+  "keyboard_shortcuts.down": "Baixar en la llista",
  "keyboard_shortcuts.enter": "Obre publicació",
  "keyboard_shortcuts.favourite": "Afavorir publicació",
-  "keyboard_shortcuts.favourites": "Obre la llista de preferits",
+  "keyboard_shortcuts.favourites": "Obre la llista de favorits",
  "keyboard_shortcuts.federated": "Obre la línia de temps federada",
  "keyboard_shortcuts.heading": "Dreceres de teclat",
-  "keyboard_shortcuts.home": "Obre la línia de temps de l'Inici",
+  "keyboard_shortcuts.home": "Obre la línia de temps Inici",
  "keyboard_shortcuts.hotkey": "Tecla d'accés directe",
  "keyboard_shortcuts.legend": "Mostra aquesta llegenda",
  "keyboard_shortcuts.local": "Obre la línia de temps local",
@ -246,17 +246,17 @@
  "keyboard_shortcuts.muted": "Obre la llista d'usuaris silenciats",
  "keyboard_shortcuts.my_profile": "Obre el teu perfil",
  "keyboard_shortcuts.notifications": "Obre la columna de notificacions",
-  "keyboard_shortcuts.open_media": "Obre multimèdia",
-  "keyboard_shortcuts.pinned": "Obrir la llista de publicacions fixades",
+  "keyboard_shortcuts.open_media": "Obre mèdia",
+  "keyboard_shortcuts.pinned": "Obre la llista de publicacions fixades",
  "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
-  "keyboard_shortcuts.reply": "Respon a la publicació",
-  "keyboard_shortcuts.requests": "Obre la llista de les sol·licituds de seguiment",
+  "keyboard_shortcuts.reply": "Respon publicació",
+  "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
  "keyboard_shortcuts.search": "Centra la barra de cerca",
  "keyboard_shortcuts.spoilers": "Mostra/amaga el camp CW",
-  "keyboard_shortcuts.start": "Obre la columna \"Primers passos\"",
+  "keyboard_shortcuts.start": "Obre la columna \"Primeres passes\"",
  "keyboard_shortcuts.toggle_hidden": "Mostra/oculta el text marcat com a sensible",
  "keyboard_shortcuts.toggle_sensitivity": "Mostra/amaga contingut multimèdia",
-  "keyboard_shortcuts.toot": "Inicia una nova publicació",
+  "keyboard_shortcuts.toot": "per a començar un tut nou de trinca",
  "keyboard_shortcuts.unfocus": "Descentra l'àrea de composició de text/cerca",
  "keyboard_shortcuts.up": "Moure amunt en la llista",
  "lightbox.close": "Tanca",
@ -264,44 +264,45 @@
  "lightbox.expand": "Amplia el quadre de visualització de l’imatge",
  "lightbox.next": "Següent",
  "lightbox.previous": "Anterior",
-  "lists.account.add": "Afegeix a la llista",
-  "lists.account.remove": "Elimina de la llista",
-  "lists.delete": "Esborra la llista",
-  "lists.edit": "Edita la llista",
-  "lists.edit.submit": "Canvia de títol",
-  "lists.new.create": "Afegeix llista",
-  "lists.new.title_placeholder": "Nou títol de la llista",
-  "lists.replies_policy.followed": "Qualsevol usuari que segueixis",
+  "lists.account.add": "Afegir a la llista",
+  "lists.account.remove": "Treure de la llista",
+  "lists.delete": "Esborrar llista",
+  "lists.edit": "Editar llista",
+  "lists.edit.submit": "Canvi de títol",
+  "lists.new.create": "Afegir llista",
+  "lists.new.title_placeholder": "Nou títol de llista",
+  "lists.replies_policy.followed": "Qualsevol usuari seguit",
  "lists.replies_policy.list": "Membres de la llista",
  "lists.replies_policy.none": "Ningú",
  "lists.replies_policy.title": "Mostra respostes a:",
-  "lists.search": "Cerca entre les persones que segueixes",
+  "lists.search": "Cercar entre les persones que segueixes",
  "lists.subheading": "Les teves llistes",
  "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
  "loading_indicator.label": "Carregant...",
  "media_gallery.toggle_visible": "{number, plural, one {Amaga imatge} other {Amaga imatges}}",
-  "missing_indicator.label": "No s'ha trobat",
-  "missing_indicator.sublabel": "Aquest recurs no s'ha trobat",
+  "missing_indicator.label": "No trobat",
+  "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
+  "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
  "mute_modal.indefinite": "Indefinit",
  "navigation_bar.apps": "Aplicacions mòbils",
  "navigation_bar.blocks": "Usuaris bloquejats",
  "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Línia de temps local",
+  "navigation_bar.community_timeline": "Línia de temps Local",
  "navigation_bar.compose": "Redacta una nova publicació",
+  "navigation_bar.direct": "Missatges directes",
  "navigation_bar.discover": "Descobrir",
  "navigation_bar.domain_blocks": "Dominis bloquejats",
-  "navigation_bar.edit_profile": "Edita el perfil",
+  "navigation_bar.edit_profile": "Editar perfil",
  "navigation_bar.explore": "Explora",
-  "navigation_bar.favourites": "Preferits",
+  "navigation_bar.favourites": "Favorits",
  "navigation_bar.filters": "Paraules silenciades",
  "navigation_bar.follow_requests": "Sol·licituds de seguiment",
  "navigation_bar.follows_and_followers": "Seguits i seguidors",
-  "navigation_bar.info": "Sobre aquest servidor",
+  "navigation_bar.info": "Quant a aquest servidor",
  "navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
  "navigation_bar.lists": "Llistes",
-  "navigation_bar.logout": "Tanca la sessió",
+  "navigation_bar.logout": "Tancar sessió",
  "navigation_bar.mutes": "Usuaris silenciats",
  "navigation_bar.personal": "Personal",
  "navigation_bar.pins": "Publicacions fixades",
@ -314,12 +315,12 @@
  "notification.follow_request": "{name} ha sol·licitat seguir-te",
  "notification.mention": "{name} t'ha esmentat",
  "notification.own_poll": "La teva enquesta ha finalitzat",
-  "notification.poll": "Ha finalitzat una enquesta en què has votat",
+  "notification.poll": "Ha finalitzat una enquesta en la que has votat",
  "notification.reblog": "{name} ha impulsat el teu estat",
  "notification.status": "ha publicat {name}",
  "notification.update": "{name} ha editat una publicació",
-  "notifications.clear": "Esborra les notificacions",
-  "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
+  "notifications.clear": "Netejar notificacions",
+  "notifications.clear_confirmation": "Estàs segur que vols esborrar permanentment totes les teves notificacions?",
  "notifications.column_settings.admin.sign_up": "Nous registres:",
  "notifications.column_settings.alert": "Notificacions d'escriptori",
  "notifications.column_settings.favourite": "Preferits:",
@ -336,24 +337,24 @@
  "notifications.column_settings.sound": "Reproduir so",
  "notifications.column_settings.status": "Noves publicacions:",
  "notifications.column_settings.unread_notifications.category": "Notificacions no llegides",
-  "notifications.column_settings.unread_notifications.highlight": "Destaca les notificacions no llegides",
+  "notifications.column_settings.unread_notifications.highlight": "Destaca notificacions no llegides",
  "notifications.column_settings.update": "Edicions:",
  "notifications.filter.all": "Tots",
  "notifications.filter.boosts": "Impulsos",
-  "notifications.filter.favourites": "Preferits",
+  "notifications.filter.favourites": "Favorits",
  "notifications.filter.follows": "Seguiments",
  "notifications.filter.mentions": "Mencions",
  "notifications.filter.polls": "Resultats de l'enquesta",
  "notifications.filter.statuses": "Actualitzacions de gent que segueixes",
  "notifications.grant_permission": "Concedir permís.",
  "notifications.group": "{count} notificacions",
-  "notifications.mark_as_read": "Marca totes les notificacions com a llegides",
+  "notifications.mark_as_read": "Marca cada notificació com a llegida",
  "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
-  "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè el permís del navegador s'ha denegat prèviament",
+  "notifications.permission_denied_alert": "No es poden activar les notificacions del escriptori perquè el permís del navegador ha estat denegat abans",
  "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
-  "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
-  "notifications_permission_banner.how_to_control": "Per rebre notificacions quan Mastodon no estigui obert, cal activar les notificacions d’escriptori. Pots controlar exactament quins tipus d’interaccions generen notificacions d’escriptori si actives el botó {icon} de dalt.",
-  "notifications_permission_banner.title": "No et perdis mai res",
+  "notifications_permission_banner.enable": "Activar les notificacions d’escriptori",
+  "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
+  "notifications_permission_banner.title": "Mai et perdis res",
  "picture_in_picture.restore": "Retorna’l",
  "poll.closed": "Finalitzada",
  "poll.refresh": "Actualitza",
@ -362,20 +363,20 @@
  "poll.vote": "Vota",
  "poll.voted": "Vas votar per aquesta resposta",
  "poll.votes": "{votes, plural, one {# vot} other {# vots}}",
-  "poll_button.add_poll": "Afegeix una enquesta",
+  "poll_button.add_poll": "Afegir una enquesta",
  "poll_button.remove_poll": "Elimina l'enquesta",
-  "privacy.change": "Ajusta la privacitat de la publicació",
+  "privacy.change": "Ajustar la privacitat de la publicació",
  "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només la gent que menciono",
-  "privacy.private.long": "Visible només per als seguidors",
+  "privacy.direct.short": "Directe",
+  "privacy.private.long": "Visible només pels seguidors",
  "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per tothom",
+  "privacy.public.long": "Visible per a tothom, mostrat en línies de temps públiques",
  "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per tothom però exclosa de les funcions de descobriment",
+  "privacy.unlisted.long": "Visible per a tothom però no en les línies de temps públiques",
  "privacy.unlisted.short": "No llistat",
  "refresh": "Actualitza",
  "regeneration_indicator.label": "Carregant…",
-  "regeneration_indicator.sublabel": "S'està preparant la teva línia de temps d'Inici!",
+  "regeneration_indicator.sublabel": "S'està preparant la teva línia de temps Inici!",
  "relative_time.days": "fa {number} dies",
  "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
  "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",
@ -387,9 +388,9 @@
  "relative_time.minutes": "fa {number} minuts",
  "relative_time.seconds": "fa {number} segons",
  "relative_time.today": "avui",
-  "reply_indicator.cancel": "Cancel·la",
+  "reply_indicator.cancel": "Cancel·lar",
  "report.block": "Bloqueja",
-  "report.block_explanation": "No veuràs les seves publicacions. Ells no podran veure les teves publicacions ni et podran seguir. Podran saber que estan bloquejats.",
+  "report.block_explanation": "No veuràs les seves publicacions. Ell no podran veure les teves publicacions ni seguir-te. Ells podran dir que estan bloquejats.",
  "report.categories.other": "Altres",
  "report.categories.spam": "Contingut brossa",
  "report.categories.violation": "El contingut viola una o més regles del servidor",
@ -398,39 +399,39 @@
  "report.category.title_account": "perfil",
  "report.category.title_status": "publicació",
  "report.close": "Fet",
-  "report.comment.title": "Hi ha res més que creguis que hauríem de saber?",
+  "report.comment.title": "Hi ha res més que penses hauriem de saber?",
  "report.forward": "Reenvia a {target}",
-  "report.forward_hint": "Aquest compte és d'un altre servidor. Vols enviar-li també una còpia anònima de l'informe?",
+  "report.forward_hint": "Aquest compte és d'un altre servidor. Enviar-hi també una copia anònima del informe?",
  "report.mute": "Silencia",
-  "report.mute_explanation": "No veuràs les seves publicacions. Encara poden seguir-te i veure les teves publicacions, però no sabran que han estat silenciats.",
+  "report.mute_explanation": "No veuràs les seves publicacions. Ells encara poden seguir-te i veure les teves publicacions però no sabran que han estat silenciats.",
  "report.next": "Següent",
  "report.placeholder": "Comentaris addicionals",
  "report.reasons.dislike": "No m'agrada",
-  "report.reasons.dislike_description": "No és una cosa que vulguis veure",
-  "report.reasons.other": "És una altra cosa",
-  "report.reasons.other_description": "El problema no encaixa a les altres categories",
-  "report.reasons.spam": "És contingut brossa",
-  "report.reasons.spam_description": "Enllaços maliciosos, implicació falsa o respostes repetitives",
+  "report.reasons.dislike_description": "Això no és quelcom que vulguis veure",
+  "report.reasons.other": "Això és una altre cosa",
+  "report.reasons.other_description": "El problema no encaixa en altres categories",
+  "report.reasons.spam": "Això és contingut brossa",
+  "report.reasons.spam_description": "Enllaços maliciosos, compromís falç o respostes repetitives",
  "report.reasons.violation": "Viola les regles del servidor",
  "report.reasons.violation_description": "Ets conscient que trenca regles especifiques",
-  "report.rules.subtitle": "Selecciona tot el que correspongui",
-  "report.rules.title": "Quines regles s'han violat?",
-  "report.statuses.subtitle": "Selecciona tot el que correspongui",
+  "report.rules.subtitle": "Selecciona totes les aplicables",
+  "report.rules.title": "Quines regles han estat violades?",
+  "report.statuses.subtitle": "Selecciona tots els aplicables",
  "report.statuses.title": "Hi ha alguna publicació que recolzi aquest informe?",
-  "report.submit": "Envia",
-  "report.target": "Denunciant a {target}",
-  "report.thanks.take_action": "Aquestes són les teves opcions per controlar el que veus a Mastodon:",
-  "report.thanks.take_action_actionable": "Mentre ho revisem, pots prendre mesures contra @{name}:",
+  "report.submit": "Enviar",
+  "report.target": "Informes {target}",
+  "report.thanks.take_action": "Aquestes son les teves opcions per a controlar el que veus a Mastodon:",
+  "report.thanks.take_action_actionable": "Mentre ho revisem, pots pendre mesures contra @{name}:",
  "report.thanks.title": "No vols veure això?",
-  "report.thanks.title_actionable": "Gràcies per denunciar-ho. Ho investigarem.",
-  "report.unfollow": "Deixa de seguir @{name}",
-  "report.unfollow_explanation": "Estàs seguint aquest compte. Per no veure les seves publicacions a la teva línia de temps d'Inici, deixa de seguir-lo.",
-  "search.placeholder": "Cerca",
+  "report.thanks.title_actionable": "Gràcies per informar, ho investigarem.",
+  "report.unfollow": "Deixar de seguir @{name}",
+  "report.unfollow_explanation": "Estàs seguint aquest compte. Per a no veure més les seves publicacions en la teva línia de temps Inici, deixa de seguir-lo.",
+  "search.placeholder": "Cercar",
  "search_popout.search_format": "Format de cerca avançada",
-  "search_popout.tips.full_text": "El text simple recupera publicacions que has escrit, marcat com a preferides, que has impulsat o on t'han esmentat, així com els usuaris, els noms d'usuaris i les etiquetes.",
+  "search_popout.tips.full_text": "Text simple recupera publicacions que has escrit, les afavorides, les impulsades o en les que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
  "search_popout.tips.hashtag": "etiqueta",
  "search_popout.tips.status": "publicació",
-  "search_popout.tips.text": "El text simple recupera coincidències amb els usuaris, els noms d'usuari i les etiquetes",
+  "search_popout.tips.text": "El text simple retorna coincidències amb els noms de visualització, els noms d'usuari i les etiquetes",
  "search_popout.tips.user": "usuari",
  "search_results.accounts": "Gent",
  "search_results.all": "Tots",
@ -442,51 +443,51 @@
  "status.admin_account": "Obre l'interfície de moderació per a @{name}",
  "status.admin_status": "Obre aquesta publicació a la interfície de moderació",
  "status.block": "Bloqueja @{name}",
-  "status.bookmark": "Afavoreix",
-  "status.cancel_reblog_private": "Desfés l'impuls",
-  "status.cannot_reblog": "Aquesta publicació no es pot impulsar",
+  "status.bookmark": "Marcador",
+  "status.cancel_reblog_private": "Desfer l'impuls",
+  "status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
  "status.copy": "Copia l'enllaç a l'estat",
  "status.delete": "Esborra",
  "status.detailed_status": "Visualització detallada de la conversa",
-  "status.direct": "Envia missatge directe a @{name}",
+  "status.direct": "Missatge directe @{name}",
  "status.edit": "Edita",
  "status.edited": "Editat {date}",
  "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
-  "status.embed": "Incrusta",
+  "status.embed": "Incrustat",
  "status.favourite": "Favorit",
  "status.filtered": "Filtrat",
  "status.history.created": "{name} ha creat {date}",
  "status.history.edited": "{name} ha editat {date}",
-  "status.load_more": "Carregar-ne més",
-  "status.media_hidden": "Multimèdia amagada",
-  "status.mention": "Esmenta @{name}",
+  "status.load_more": "Carrega més",
+  "status.media_hidden": "Multimèdia amagat",
+  "status.mention": "Esmentar @{name}",
  "status.more": "Més",
-  "status.mute": "Silencia @{name}",
-  "status.mute_conversation": "Silencia conversació",
-  "status.open": "Amplia la publicació",
+  "status.mute": "Silenciar @{name}",
+  "status.mute_conversation": "Silenciar conversació",
+  "status.open": "Ampliar aquest estat",
  "status.pin": "Fixa en el perfil",
  "status.pinned": "Publicació fixada",
-  "status.read_more": "Més informació",
-  "status.reblog": "Impulsa",
-  "status.reblog_private": "Impulsa amb la visibilitat original",
+  "status.read_more": "Llegir més",
+  "status.reblog": "Impuls",
+  "status.reblog_private": "Impulsar amb la visibilitat original",
  "status.reblogged_by": "{name} ha impulsat",
  "status.reblogs.empty": "Encara ningú no ha impulsat aquesta publicació. Quan algú ho faci, apareixeran aquí.",
-  "status.redraft": "Esborra-la i reescriure-la",
+  "status.redraft": "Esborrar i reescriure",
  "status.remove_bookmark": "Suprimeix el marcador",
-  "status.reply": "Respon",
-  "status.replyAll": "Respon al fil",
-  "status.report": "Denuncia @{name}",
+  "status.reply": "Respondre",
+  "status.replyAll": "Respondre al fil",
+  "status.report": "Informar sobre @{name}",
  "status.sensitive_warning": "Contingut sensible",
-  "status.share": "Comparteix",
-  "status.show_less": "Mostrar-ne menys",
-  "status.show_less_all": "Mostrar-ne menys per a tot",
-  "status.show_more": "Mostrar-ne més",
-  "status.show_more_all": "Mostrar-ne més per a tot",
+  "status.share": "Compartir",
+  "status.show_less": "Mostra menys",
+  "status.show_less_all": "Mostra menys per a tot",
+  "status.show_more": "Mostra més",
+  "status.show_more_all": "Mostra més per a tot",
  "status.show_thread": "Mostra el fil",
  "status.uncached_media_warning": "No està disponible",
-  "status.unmute_conversation": "No silenciïs la conversa",
-  "status.unpin": "No fixis al perfil",
-  "suggestions.dismiss": "Ignora el suggeriment",
+  "status.unmute_conversation": "Activar conversació",
+  "status.unpin": "Deslliga del perfil",
+  "suggestions.dismiss": "Descartar suggeriment",
  "suggestions.header": "És possible que estiguis interessat en…",
  "tabs_bar.federated_timeline": "Federat",
  "tabs_bar.home": "Inici",
@ -501,24 +502,24 @@
  "timeline_hint.remote_resource_not_displayed": "{resource} dels altres servidors no son mostrats.",
  "timeline_hint.resources.followers": "Seguidors",
  "timeline_hint.resources.follows": "Seguiments",
-  "timeline_hint.resources.statuses": "Publicacions més antigues",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} parlant-ne",
-  "trends.trending_now": "En tendència",
+  "timeline_hint.resources.statuses": "Tuts més antics",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} parlant-hi",
+  "trends.trending_now": "Ara en tendència",
  "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
  "units.short.billion": "{count}B",
  "units.short.million": "{count}M",
  "units.short.thousand": "{count}K",
-  "upload_area.title": "Arrossega i deixa anar per carregar",
-  "upload_button.label": "Afegeix imatges, un vídeo o un fitxer d'àudio",
+  "upload_area.title": "Arrossega i deixa anar per a carregar",
+  "upload_button.label": "Afegir mèdia, un vídeo o un fitxer d'audio",
  "upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
-  "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
-  "upload_form.audio_description": "Descripció per a persones amb discapacitat auditiva",
-  "upload_form.description": "Descripció per a persones amb discapacitat visual",
-  "upload_form.description_missing": "No s'ha afegit cap descripció",
+  "upload_error.poll": "No es permet l'enviament de fitxers en les enquestes.",
+  "upload_form.audio_description": "Descriviu per a les persones amb pèrdua auditiva",
+  "upload_form.description": "Descriure per els que tenen problemes visuals",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Edita",
  "upload_form.thumbnail": "Canvia la miniatura",
  "upload_form.undo": "Esborra",
-  "upload_form.video_description": "Descripció per a persones amb discapacitat auditiva o amb discapacitat visual",
+  "upload_form.video_description": "Descriu per a les persones amb pèrdua auditiva o deficiència visual",
  "upload_modal.analyzing_picture": "Analitzant imatge…",
  "upload_modal.apply": "Aplica",
  "upload_modal.applying": "Aplicant…",
@ -526,18 +527,18 @@
  "upload_modal.description_placeholder": "Una ràpida guineu marró salta sobre el gos mandrós",
  "upload_modal.detect_text": "Detecta el text de l'imatge",
  "upload_modal.edit_media": "Editar multimèdia",
-  "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualització per escollir el punt focal que sempre serà visible en totes les miniatures.",
+  "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualització per escollir el punt focal que sempre serà visible de totes les miniatures.",
  "upload_modal.preparing_ocr": "Preparant OCR…",
  "upload_modal.preview_label": "Previsualitza ({ratio})",
  "upload_progress.label": "Pujant...",
-  "video.close": "Tanca el vídeo",
+  "video.close": "Tancar el vídeo",
  "video.download": "Descarrega l’arxiu",
-  "video.exit_fullscreen": "Surt de la pantalla completa",
-  "video.expand": "Amplia el vídeo",
+  "video.exit_fullscreen": "Sortir de pantalla completa",
+  "video.expand": "Ampliar el vídeo",
  "video.fullscreen": "Pantalla completa",
-  "video.hide": "Amaga el vídeo",
-  "video.mute": "Silencia el so",
+  "video.hide": "Amaga vídeo",
+  "video.mute": "Silenciar el so",
  "video.pause": "Pausa",
-  "video.play": "Reprodueix",
-  "video.unmute": "Activa el so"
+  "video.play": "Reproduir",
+  "video.unmute": "Activar so"
 }
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@ -70,7 +70,7 @@
  "column.blocks": "بەکارهێنەرە بلۆککراوەکان",
  "column.bookmarks": "نیشانەکان",
  "column.community": "هێڵی کاتی ناوخۆیی",
-  "column.conversations": "Conversations",
+  "column.direct": "نامە ڕاستەوخۆکان",
  "column.directory": "گەڕان لە پرۆفایلەکان",
  "column.domain_blocks": "دۆمەینە داخراوەکان",
  "column.favourites": "دڵخوازترینەکان",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "تەنها خۆماڵی",
  "community.column_settings.media_only": "تەنها میدیا",
  "community.column_settings.remote_only": "تەنها بۆ دوور",
+  "compose_form.direct_message_warning": "ئەم توتە تەنیا بۆ بەکارهێنەرانی ناوبراو دەنێردرێت.",
  "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "ئەم توتە لە ژێر هیچ هاشتاگییەک دا ناکرێت وەک ئەوەی لە لیستەکەدا نەریزراوە. تەنها توتی گشتی دەتوانرێت بە هاشتاگی بگەڕێت.",
  "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
  "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
@ -166,7 +166,7 @@
  "empty_column.blocks": "تۆ هێشتا هیچ بەکارهێنەرێکت بلۆک نەکردووە.",
  "empty_column.bookmarked_statuses": "تۆ هێشتا هیچ توتێکی دیاریکراوت نیە کاتێک نیشانەیەک نیشان دەکەیت، لێرە دەرئەکەویت.",
  "empty_column.community": "هێڵی کاتی ناوخۆیی بەتاڵە. شتێک بە ئاشکرا بنووسە بۆ ئەوەی تۆپەکە بسووڕێت!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "تۆ هیچ نامەی ڕاستەوخۆت نیە تا ئێستا. کاتێک دانەیەک دەنێریت یان وەرت دەگرێت، لێرە پیشان دەدات.",
  "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "بۆ بەهێزکردن",
  "keyboard_shortcuts.column": "بۆ ئەوەی تیشک بخاتە سەر توتێک لە یەکێک لە ستوونەکان",
  "keyboard_shortcuts.compose": "بۆ سەرنجدان بە نووسینی ناوچەی دەق",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "وه‌سف",
+  "keyboard_shortcuts.direct": "بۆ کردنەوەی ستوونی نامە ڕاستەوخۆکان",
  "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا",
  "keyboard_shortcuts.enter": "بۆ کردنەوەی توت",
  "keyboard_shortcuts.favourite": "بۆ دڵخواز",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "نیشانکراوەکان",
  "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
  "navigation_bar.compose": "نووسینی توتی نوێ",
+  "navigation_bar.direct": "نامە ڕاستەوخۆکان",
  "navigation_bar.discover": "دۆزینەوە",
  "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
  "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "ڕاستەوخۆ",
  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "تەنها بۆ شوێنکەوتوان",
+  "privacy.public.long": "بۆ هەمووان دیاربێت، لە هێڵی کاتی گشتی دا نیشان دەدرێت",
  "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە هێڵی کاتی گشتیدا نا",
  "privacy.unlisted.short": "لە لیست نەکراو",
  "refresh": "نوێکردنەوە",
  "regeneration_indicator.label": "بارکردن…",
@ -441,7 +442,7 @@
  "search_results.total": "{count, number} {count, plural, one {دەرئەنجام} other {دەرئەنجام}}",
  "status.admin_account": "کردنەوەی میانڕەوی بەڕێوەبەر بۆ @{name}",
  "status.admin_status": "ئەم توتە بکەوە لە ناو ڕووکاری بەڕیوەبەر",
-  "status.block": "@{name} ئاستەنگ بکە",
+  "status.block": "بلۆکی @{name}",
  "status.bookmark": "نیشانه",
  "status.cancel_reblog_private": "بێبەهێزکردن",
  "status.cannot_reblog": "ئەم بابەتە ناتوانرێت بەرزبکرێتەوە",
@ -457,12 +458,12 @@
  "status.filtered": "پاڵاوتن",
  "status.history.created": "{name} created {date}",
  "status.history.edited": "{name} edited {date}",
-  "status.load_more": "زیاتر بار بکە",
+  "status.load_more": "بارکردنی زیاتر",
  "status.media_hidden": "میدیای شاراوە",
  "status.mention": "ناوبنێ @{name}",
  "status.more": "زیاتر",
-  "status.mute": "@{name} بێدەنگ بکە",
-  "status.mute_conversation": "بێدەنگی بکە",
+  "status.mute": "بێدەنگکردن @{name}",
+  "status.mute_conversation": "گفتوگۆی بێدەنگ",
  "status.open": "ئەم توتە فراوان بکە",
  "status.pin": "لکاندن لەسەر پرۆفایل",
  "status.pinned": "توتی چەسپکراو",
@ -477,59 +478,59 @@
  "status.replyAll": "بە نووسراوە وەڵام بدەوە",
  "status.report": "گوزارشت @{name}",
  "status.sensitive_warning": "ناوەڕۆکی هەستیار",
-  "status.share": "هاوبەشی بکە",
+  "status.share": "هاوبەش کردن",
  "status.show_less": "کەمتر نیشان بدە",
-  "status.show_less_all": "هەمووی بچووک بکەوە",
-  "status.show_more": "زیاتر نیشان بدە",
+  "status.show_less_all": "کەمتر نیشان بدە بۆ هەمووی",
+  "status.show_more": "زیاتر پیشان بدە",
  "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
  "status.show_thread": "نیشاندانی گفتوگۆ",
  "status.uncached_media_warning": "بەردەست نیە",
  "status.unmute_conversation": "گفتوگۆی بێدەنگ",
-  "status.unpin": "لە سەرەوە لایبە",
+  "status.unpin": "لابردن لە پرۆفایل",
  "suggestions.dismiss": "ڕەتکردنەوەی پێشنیار",
  "suggestions.header": "لەوانەیە حەزت لەمەش بێت…",
  "tabs_bar.federated_timeline": "گشتی",
  "tabs_bar.home": "سەرەتا",
  "tabs_bar.local_timeline": "ناوخۆیی",
  "tabs_bar.notifications": "ئاگادارییەکان",
-  "tabs_bar.search": "بگەڕێ",
+  "tabs_bar.search": "گەڕان",
  "time_remaining.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژ}} ماوە",
-  "time_remaining.hours": "{number, plural, one {# کاتژمێر} other {# کاتژمێر}} ماوە",
-  "time_remaining.minutes": "{number, plural, one {# خولەک} other {# خولەک}} ماوە",
-  "time_remaining.moments": "کاتی ماوە",
+  "time_remaining.hours": "{number, plural, one {# کات} other {# کات}} ماوە",
+  "time_remaining.minutes": "{number, plural, one {# خۆلەک} other {# خولەک}} ماوە",
+  "time_remaining.moments": "ئەو ساتانەی ماونەتەوە",
  "time_remaining.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
  "timeline_hint.remote_resource_not_displayed": "{resource} لە ڕاژەکانی ترەوە پیشان نادرێت.",
-  "timeline_hint.resources.followers": "شوێنکەوتوو",
+  "timeline_hint.resources.followers": "شوێنکەوتووان",
  "timeline_hint.resources.follows": "شوێنکەوتن",
-  "timeline_hint.resources.statuses": "نێردراوی کۆن",
+  "timeline_hint.resources.statuses": "توتی کۆن",
  "trends.counter_by_accounts": "{count, plural, one {{counter} کەس} other {{counter} کەس}} گفتوگۆ دەکا",
-  "trends.trending_now": "ڕۆژەڤ",
-  "ui.beforeunload": "ڕەشنووسەکەت لەدەست دەچێت ئەگەر ماستۆدۆن جێ بهێڵیت.",
-  "units.short.billion": "{count} ملیار",
-  "units.short.million": "{count} ملیۆن",
-  "units.short.thousand": "{count} هەزار",
-  "upload_area.title": "فایلەکانت ڕابکێشە ئێرە بۆ بەرزکردنەوەیان",
-  "upload_button.label": "وێنە، ڤیدیۆ یان پەیامی دەنگی زیاد بکە",
-  "upload_error.limit": "سنووری بەرزکردنەوەت بەزاندووە.",
-  "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
-  "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
-  "upload_form.description": "پەیامەکەت بۆ نابیناکان",
+  "trends.trending_now": "گۆگران",
+  "ui.beforeunload": "ڕەشنووسەکەت لە دەست دەچێت ئەگەر لە ماستۆدۆن بڕۆیت.",
+  "units.short.billion": "{count}ملیار",
+  "units.short.million": "{count}ملیۆن",
+  "units.short.thousand": "{count}هەزار",
+  "upload_area.title": "ڕاکێشان & دانان بۆ بارکردن",
+  "upload_button.label": "زیادکردنی وێنەکان، ڤیدیۆیەک یان فایلێکی دەنگی",
+  "upload_error.limit": "سنووری بارکردنی فایل تێپەڕیوە.",
+  "upload_error.poll": "پەڕگەکە ڕێی پێنەدراوە بە ڕاپرسی باربکرێت.",
+  "upload_form.audio_description": "بۆ ئەو کەسانەی کە گوێ بیستیان هەیە وەسف دەکات",
+  "upload_form.description": "وەسف بکە بۆ کەمبینایان",
  "upload_form.description_missing": "No description added",
  "upload_form.edit": "دەستکاری",
  "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "بیسڕەوە",
-  "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
-  "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
-  "upload_modal.apply": "بیسەپێنە",
+  "upload_form.undo": "سڕینەوە",
+  "upload_form.video_description": "بۆ کەم بینایان و کەم بیستان وەسفی بکە",
+  "upload_modal.analyzing_picture": "شیکردنەوەی وێنە…",
+  "upload_modal.apply": "جێبەجێ کردن",
  "upload_modal.applying": "Applying…",
  "upload_modal.choose_image": "وێنە هەڵبژێرە",
  "upload_modal.description_placeholder": "بە دڵ کەین با بە نەشئەی مەی غوباری میحنەتی دونیا",
-  "upload_modal.detect_text": "نووسینی ناو وێنەکە دەستنیشان بکە",
+  "upload_modal.detect_text": "دەقی وێنەکە بدۆزیەوە",
  "upload_modal.edit_media": "دەستکاریکردنی میدیا",
  "upload_modal.hint": "گەر وێنە چکۆلە یان بڕاوەبێت، خاڵی ناوەندی دیار دەکەوێت. خاڵی ناوەندی وێنە بە کرتە یان جێبەجیکردنی رێکبخەن.",
-  "upload_modal.preparing_ocr": "نووسینەکە دەستنیشان دەکرێت…",
-  "upload_modal.preview_label": "پێشبینین ({ratio})",
-  "upload_progress.label": "بار دەکرێت...",
+  "upload_modal.preparing_ocr": "ئامادەکردنی OCR…",
+  "upload_modal.preview_label": "پێشبینی ({ratio})",
+  "upload_progress.label": "بارکردن...",
  "video.close": "داخستنی ڤیدیۆ",
  "video.download": "داگرتنی فایل",
  "video.exit_fullscreen": "دەرچوون لە پڕ شاشە",
@ -538,6 +539,6 @@
  "video.hide": "شاردنەوەی ڤیدیۆ",
  "video.mute": "دەنگی کپ",
  "video.pause": "وەستان",
-  "video.play": "لێی بدە",
-  "video.unmute": "بێدەنگی مەکە"
+  "video.play": "پەخشکردن",
+  "video.unmute": "دەنگ لابدە"
 }
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@ -70,7 +70,7 @@
  "column.blocks": "Utilizatori bluccati",
  "column.bookmarks": "Segnalibri",
  "column.community": "Linea pubblica lucale",
-  "column.conversations": "Conversations",
+  "column.direct": "Missaghji diretti",
  "column.directory": "Percorre i prufili",
  "column.domain_blocks": "Duminii piattati",
  "column.favourites": "Favuriti",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Solu lucale",
  "community.column_settings.media_only": "Solu media",
  "community.column_settings.remote_only": "Solu distante",
+  "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
  "compose_form.direct_message_warning_learn_more": "Amparà di più",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".",
  "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
  "compose_form.lock_disclaimer.lock": "privatu",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
  "empty_column.bookmarked_statuses": "Ùn avete manc'un segnalibru. Quandu aghjunghjerate unu, sarà mustratu quì.",
  "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Ùn avete ancu nisun missaghju direttu. S'è voi mandate o ricevete unu, u vidarete quì.",
  "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Ùn avete manc'unu statutu favuritu. Quandu aghjunghjerate unu à i vostri favuriti, sarà mustratu quì.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "sparte",
  "keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
  "keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Descrizzione",
+  "keyboard_shortcuts.direct": "per apre una culonna di missaghji diretti",
  "keyboard_shortcuts.down": "falà indè a lista",
  "keyboard_shortcuts.enter": "apre u statutu",
  "keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Segnalibri",
  "navigation_bar.community_timeline": "Linea pubblica lucale",
  "navigation_bar.compose": "Scrive un novu statutu",
+  "navigation_bar.direct": "Missaghji diretti",
  "navigation_bar.discover": "Scopre",
  "navigation_bar.domain_blocks": "Duminii piattati",
  "navigation_bar.edit_profile": "Mudificà u prufile",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Toglie u scandagliu",
  "privacy.change": "Mudificà a cunfidenzialità di u statutu",
  "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direttu",
  "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Privatu",
+  "privacy.public.long": "Mustrà à tuttu u mondu nant'à e linee pubbliche",
  "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ùn mette micca nant'à e linee pubbliche",
  "privacy.unlisted.short": "Micca listatu",
  "refresh": "Attualizà",
  "regeneration_indicator.label": "Caricamentu…",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokovaní uživatelé",
  "column.bookmarks": "Záložky",
  "column.community": "Místní časová osa",
-  "column.conversations": "Konverzace",
+  "column.direct": "Přímé zprávy",
  "column.directory": "Prozkoumat profily",
  "column.domain_blocks": "Blokované domény",
  "column.favourites": "Oblíbené",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Pouze místní",
  "community.column_settings.media_only": "Pouze média",
  "community.column_settings.remote_only": "Pouze vzdálené",
+  "compose_form.direct_message_warning": "Tento příspěvek bude odeslán pouze zmíněným uživatelům.",
  "compose_form.direct_message_warning_learn_more": "Zjistit více",
-  "compose_form.encryption_warning": "Příspěvky na Mastodonu nejsou end-to-end šifrovány. Nesdílejte přes Mastodon žádné nebezpečné informace.",
  "compose_form.hashtag_warning": "Tento příspěvek nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné příspěvky mohou být vyhledány podle hashtagu.",
  "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
  "compose_form.lock_disclaimer.lock": "uzamčen",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ještě jste nezablokovali žádného uživatele.",
  "empty_column.bookmarked_statuses": "Ještě nemáte v záložkách žádné příspěvky. Pokud si do nich nějaký přidáte, zobrazí se zde.",
  "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!",
-  "empty_column.conversations": "Jakmile pošlete nebo obdržíte příspěvek, který je viditelný pouze lidem v něm zmíněným, objeví se tady.",
+  "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
  "empty_column.domain_blocks": "Ještě nemáte žádné blokované domény.",
  "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!",
  "empty_column.favourited_statuses": "Ještě nemáte žádné oblíbené příspěvky. Pokud si nějaký oblíbíte, zobrazí se zde.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Boostnout příspěvek",
  "keyboard_shortcuts.column": "Focus na sloupec",
  "keyboard_shortcuts.compose": "Focus na textové pole nového příspěvku",
-  "keyboard_shortcuts.conversations": "Otevřít sloupec konverzací",
  "keyboard_shortcuts.description": "Popis",
+  "keyboard_shortcuts.direct": "Otevřít sloupec přímých zpráv",
  "keyboard_shortcuts.down": "Posunout dolů v seznamu",
  "keyboard_shortcuts.enter": "Otevřít příspěvek",
  "keyboard_shortcuts.favourite": "Oblíbit příspěvek",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Záložky",
  "navigation_bar.community_timeline": "Místní časová osa",
  "navigation_bar.compose": "Vytvořit nový příspěvek",
+  "navigation_bar.direct": "Přímé zprávy",
  "navigation_bar.discover": "Objevujte",
  "navigation_bar.domain_blocks": "Blokované domény",
  "navigation_bar.edit_profile": "Upravit profil",
@ -365,13 +366,13 @@
  "poll_button.add_poll": "Přidat anketu",
  "poll_button.remove_poll": "Odstranit anketu",
  "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze lidé, které zmíním",
-  "privacy.private.long": "Viditelný pouze pro sledující",
-  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelný pro všechny",
+  "privacy.direct.long": "Viditelné pouze pro zmíněné uživatele",
+  "privacy.direct.short": "Přímý",
+  "privacy.private.long": "Viditelné pouze pro sledující",
+  "privacy.private.short": "Pouze pro sledující",
+  "privacy.public.long": "Viditelné pro všechny, i ve veřejných časových osách",
  "privacy.public.short": "Veřejný",
-  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
+  "privacy.unlisted.long": "Viditelné pro všechny, ale ne ve veřejných časových osách",
  "privacy.unlisted.short": "Neuvedený",
  "refresh": "Obnovit",
  "regeneration_indicator.label": "Načítání…",
@ -514,7 +515,7 @@
  "upload_error.poll": "U anket není nahrávání souborů povoleno.",
  "upload_form.audio_description": "Popis pro sluchově postižené",
  "upload_form.description": "Popis pro zrakově postižené",
-  "upload_form.description_missing": "Nebyl přidán popis",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Upravit",
  "upload_form.thumbnail": "Změnit miniaturu",
  "upload_form.undo": "Smazat",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -4,26 +4,26 @@
  "account.badges.bot": "Bot",
  "account.badges.group": "Grŵp",
  "account.block": "Blocio @{name}",
-  "account.block_domain": "Blocio parth {domain}",
+  "account.block_domain": "Cuddio popeth rhag {domain}",
  "account.blocked": "Blociwyd",
  "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
  "account.cancel_follow_request": "Canslo cais dilyn",
  "account.direct": "Neges breifat @{name}",
-  "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
-  "account.domain_blocked": "Parth wedi ei flocio",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Parth wedi ei guddio",
  "account.edit_profile": "Golygu proffil",
-  "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
+  "account.enable_notifications": "Notify me when @{name} posts",
  "account.endorse": "Arddangos ar fy mhroffil",
  "account.follow": "Dilyn",
  "account.followers": "Dilynwyr",
-  "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
-  "account.followers_counter": "{count, plural, one {{counter} Dilynwr} other {{counter} o Ddilynwyr}}",
-  "account.following": "Yn dilyn",
+  "account.followers.empty": "Nid oes neb yn dilyn y defnyddiwr hwn eto.",
+  "account.followers_counter": "{count, plural, one {{counter} Ddilynwr} other {{counter} o Ddilynwyr}}",
+  "account.following": "Following",
  "account.following_counter": "{count, plural, one {{counter} yn Dilyn} other {{counter} yn Dilyn}}",
  "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
  "account.follows_you": "Yn eich dilyn chi",
  "account.hide_reblogs": "Cuddio bwstiau o @{name}",
-  "account.joined": "Ymunodd {date}",
+  "account.joined": "Joined {date}",
  "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
  "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i gloi. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
  "account.media": "Cyfryngau",
@ -32,8 +32,8 @@
  "account.mute": "Tawelu @{name}",
  "account.mute_notifications": "Cuddio hysbysiadau o @{name}",
  "account.muted": "Distewyd",
-  "account.posts": "Postiadau",
-  "account.posts_with_replies": "Postiadau ac atebion",
+  "account.posts": "Tŵtiau",
+  "account.posts_with_replies": "Tŵtiau ac atebion",
  "account.report": "Adrodd @{name}",
  "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
  "account.share": "Rhannwch broffil @{name}",
@ -41,24 +41,24 @@
  "account.statuses_counter": "{count, plural, one {{counter} Dŵt} other {{counter} o Dŵtiau}}",
  "account.unblock": "Dadflocio @{name}",
  "account.unblock_domain": "Dadguddio {domain}",
-  "account.unblock_short": "Dad-flocio",
+  "account.unblock_short": "Unblock",
  "account.unendorse": "Peidio a'i arddangos ar fy mhroffil",
  "account.unfollow": "Dad-ddilyn",
  "account.unmute": "Dad-dawelu @{name}",
  "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
-  "account.unmute_short": "Dad-dewi",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Clicio i ychwanegu nodyn",
-  "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
-  "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru",
-  "admin.dashboard.retention.average": "Cyfartaledd",
-  "admin.dashboard.retention.cohort": "Mis cofrestru",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
  "admin.dashboard.retention.cohort_size": "Defnyddwyr newydd",
  "alert.rate_limited.message": "Ceisiwch eto ar ôl {retry_time, time, medium}.",
  "alert.rate_limited.title": "Cyfradd gyfyngedig",
  "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
  "alert.unexpected.title": "Wps!",
  "announcement.announcement": "Cyhoeddiad",
-  "attachments_list.unprocessed": "(heb eu prosesu)",
+  "attachments_list.unprocessed": "(unprocessed)",
  "autosuggest_hashtag.per_week": "{count} yr wythnos",
  "boost_modal.combo": "Mae modd gwasgu {combo} er mwyn sgipio hyn tro nesa",
  "bundle_column_error.body": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
@ -70,7 +70,7 @@
  "column.blocks": "Defnyddwyr a flociwyd",
  "column.bookmarks": "Tudalnodau",
  "column.community": "Ffrwd lleol",
-  "column.conversations": "Sgyrsiau",
+  "column.direct": "Negeseuon preifat",
  "column.directory": "Pori proffiliau",
  "column.domain_blocks": "Parthau cuddiedig",
  "column.favourites": "Ffefrynnau",
@ -79,7 +79,7 @@
  "column.lists": "Rhestrau",
  "column.mutes": "Defnyddwyr a ddistewyd",
  "column.notifications": "Hysbysiadau",
-  "column.pins": "Postiadau wedi eu pinio",
+  "column.pins": "Tŵtiau wedi eu pinio",
  "column.public": "Ffrwd y ffederasiwn",
  "column_back_button.label": "Nôl",
  "column_header.hide_settings": "Cuddio dewisiadau",
@ -92,10 +92,10 @@
  "community.column_settings.local_only": "Lleol yn unig",
  "community.column_settings.media_only": "Cyfryngau yn unig",
  "community.column_settings.remote_only": "Anghysbell yn unig",
+  "compose_form.direct_message_warning": "Mi fydd y tŵt hwn ond yn cael ei anfon at y defnyddwyr sy'n cael eu crybwyll.",
  "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
-  "compose_form.encryption_warning": "Dyw postiadau ar Mastodon ddim wedi'u hamgryptio o ben i ben. Peidiwch â rhannu unrhyw wybodaeth beryglus dros Mastodon.",
-  "compose_form.hashtag_warning": "Ni fydd y post hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond postiadau cyhoeddus gellid chwilio amdanynt drwy hashnod.",
-  "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
+  "compose_form.hashtag_warning": "Ni fydd y tŵt hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond tŵtiau cyhoeddus gellid chwilota amdanynt drwy hashnod.",
+  "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich tŵtiau dilynwyr-yn-unig.",
  "compose_form.lock_disclaimer.lock": "wedi ei gloi",
  "compose_form.placeholder": "Beth sydd ar eich meddwl?",
  "compose_form.poll.add_option": "Ychwanegu Dewisiad",
@ -106,7 +106,7 @@
  "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
  "compose_form.publish": "Tŵt",
  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Cadw newidiadau",
+  "compose_form.save_changes": "Save changes",
  "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
  "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
  "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
@ -118,11 +118,11 @@
  "confirmations.block.confirm": "Blocio",
  "confirmations.block.message": "Ydych chi'n sicr eich bod eisiau blocio {name}?",
  "confirmations.delete.confirm": "Dileu",
-  "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
+  "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y tŵt hwn?",
  "confirmations.delete_list.confirm": "Dileu",
  "confirmations.delete_list.message": "Ydych chi'n sicr eich bod eisiau dileu y rhestr hwn am byth?",
-  "confirmations.discard_edit_media.confirm": "Gwaredu",
-  "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg, eu taflu beth bynnag?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
  "confirmations.domain_block.confirm": "Cuddio parth cyfan",
  "confirmations.domain_block.message": "A ydych yn hollol, hollol sicr eich bod am flocio y {domain} cyfan? Yn y nifer helaeth o achosion mae blocio neu tawelu ambell gyfrif yn ddigonol ac yn well. Ni fyddwch yn gweld cynnwys o'r parth hwnnw mewn unrhyw ffrydiau cyhoeddus na chwaith yn eich hysbysiadau. Bydd hyn yn cael gwared o'ch dilynwyr o'r parth hwnnw.",
  "confirmations.logout.confirm": "Allgofnodi",
@ -131,7 +131,7 @@
  "confirmations.mute.explanation": "Bydd hyn yn cuddio pyst oddi wrthynt a physt sydd yn sôn amdanynt, ond bydd hyn dal yn gadael iddyn nhw gweld eich pyst a'ch dilyn.",
  "confirmations.mute.message": "Ydych chi'n sicr eich bod am ddistewi {name}?",
  "confirmations.redraft.confirm": "Dileu & ailddrafftio",
-  "confirmations.redraft.message": "Ydych chi'n siwr eich bod eisiau dileu y post hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael ei colli, a bydd ymatebion i'r post gwreiddiol yn cael eu hamddifadu.",
+  "confirmations.redraft.message": "Ydych chi'n siwr eich bod eisiau dileu y tŵt hwn a'i ailddrafftio? Bydd ffefrynnau a bwstiau'n cael ei colli, a bydd ymatebion i'r tŵt gwreiddiol yn cael eu hamddifadu.",
  "confirmations.reply.confirm": "Ateb",
  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n sicr yr ydych am barhau?",
  "confirmations.unfollow.confirm": "Dad-ddilynwch",
@ -140,11 +140,11 @@
  "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
  "conversation.open": "Gweld sgwrs",
  "conversation.with": "Gyda {names}",
-  "directory.federated": "O'r ffedysawd cyfan",
+  "directory.federated": "O ffedysawd hysbys",
  "directory.local": "O {domain} yn unig",
  "directory.new_arrivals": "Newydd-ddyfodiaid",
  "directory.recently_active": "Yn weithredol yn ddiweddar",
-  "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
+  "embed.instructions": "Mewnblannwch y tŵt hwn ar eich gwefan drwy gopïo'r côd isod.",
  "embed.preview": "Dyma sut olwg fydd arno:",
  "emoji_button.activity": "Gweithgarwch",
  "emoji_button.custom": "Unigryw",
@ -160,42 +160,42 @@
  "emoji_button.search_results": "Canlyniadau chwilio",
  "emoji_button.symbols": "Symbolau",
  "emoji_button.travel": "Teithio & Llefydd",
-  "empty_column.account_suspended": "Cyfrif wedi'i atal",
-  "empty_column.account_timeline": "Dim postiadau yma!",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "Dim tŵtiau fama!",
  "empty_column.account_unavailable": "Proffil ddim ar gael",
  "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw dwtiau tudalnodiedig eto. Pan y byddwch yn tudalnodi un, mi fydd yn ymddangos yma.",
  "empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
-  "empty_column.conversations": "Unwaith y byddwch chi'n anfon neu'n derbyn post sydd ond yn weladwy i'r bobl a grybwyllir ynddo, bydd yn ymddangos yma.",
+  "empty_column.direct": "Nid oes gennych unrhyw negeseuon preifat eto. Pan y byddwch yn anfon neu derbyn un, mi fydd yn ymddangos yma.",
  "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
-  "empty_column.explore_statuses": "Does dim byd yn trendio ar hyn o bryd. Gwiriwch yn ôl yn nes ymlaen!",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff dwtiau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
-  "empty_column.favourites": "Does neb wedi hoffi'r post hwn eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
-  "empty_column.follow_recommendations": "Does dim awgrymiadau yma i chi. Gallwch geisio chwilio am bobl yr ydych yn eu hadnabod neu archwilio hashnodau sy'n trendio.",
+  "empty_column.favourites": "Nid oes neb wedi hoffi'r tŵt yma eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
  "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan dderbyniwch chi un, byddent yn ymddangos yma.",
  "empty_column.hashtag": "Nid oes dim ar yr hashnod hwn eto.",
  "empty_column.home": "Mae eich ffrwd gartref yn wag! Ymwelwch a {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd a defnyddwyr eraill.",
-  "empty_column.home.suggestions": "Gweler awgrymiadau",
+  "empty_column.home.suggestions": "See some suggestions",
  "empty_column.list": "Nid oes dim yn y rhestr yma eto. Pan y bydd aelodau'r rhestr yn cyhoeddi statws newydd, mi fydd yn ymddangos yma.",
  "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan grëwch chi un, mi fydd yn ymddangos yma.",
  "empty_column.mutes": "Nid ydych wedi tawelu unrhyw ddefnyddwyr eto.",
  "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ac eraill i ddechrau'r sgwrs.",
  "empty_column.public": "Does dim byd yma! Ysgrifennwch rhywbeth yn gyhoeddus, neu dilynwch ddefnyddwyr o achosion eraill i'w lenwi",
  "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
-  "error.unexpected_crash.explanation_addons": "Ni ellid arddangos y dudalen hon yn gywir. Mae'r gwall hwn yn debygol o gael ei achosi gan ategyn porwr neu offer cyfieithu awtomatig.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
  "error.unexpected_crash.next_steps": "Ceisiwch ail-lwytho y dudalen. Os nad yw hyn yn eich helpu, efallai gallech defnyddio Mastodon trwy borwr neu ap brodorol gwahanol.",
-  "error.unexpected_crash.next_steps_addons": "Ceisiwch eu hanalluogi ac adnewyddu'r dudalen. Os nad yw hynny'n helpu, efallai y byddwch yn dal i allu defnyddio Mastodon trwy borwr neu ap cynhenid arall.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
  "errors.unexpected_crash.copy_stacktrace": "Copïo'r olrhain stac i'r clipfwrdd",
  "errors.unexpected_crash.report_issue": "Rhoi gwybod am broblem",
-  "explore.search_results": "Canlyniadau chwilio",
-  "explore.suggested_follows": "I chi",
-  "explore.title": "Archwilio",
-  "explore.trending_links": "Newyddion",
-  "explore.trending_statuses": "Postiau",
-  "explore.trending_tags": "Hanshnodau",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Wedi gorffen",
-  "follow_recommendations.heading": "Dilynwch y bobl yr hoffech chi weld eu postiadau! Dyma ambell i awgrymiad.",
-  "follow_recommendations.lead": "Bydd postiadau gan bobl rydych chi'n eu dilyn yn ymddangos mewn trefn amser ar eich ffrwd cartref. Peidiwch â bod ofn gwneud camgymeriadau, gallwch chi ddad-ddilyn pobl yr un mor hawdd unrhyw bryd!",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
  "follow_request.authorize": "Caniatau",
  "follow_request.reject": "Gwrthod",
  "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, oedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
@ -218,7 +218,7 @@
  "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
  "home.column_settings.basic": "Syml",
-  "home.column_settings.show_reblogs": "Dangos hybiau",
+  "home.column_settings.show_reblogs": "Dangos bŵstiau",
  "home.column_settings.show_replies": "Dangos ymatebion",
  "home.hide_announcements": "Cuddio cyhoeddiadau",
  "home.show_announcements": "Dangos cyhoeddiadau",
@ -228,26 +228,26 @@
  "keyboard_shortcuts.back": "i lywio nôl",
  "keyboard_shortcuts.blocked": "i agor rhestr defnyddwyr a flociwyd",
  "keyboard_shortcuts.boost": "i fŵstio",
-  "keyboard_shortcuts.column": "Ffocysu colofn",
+  "keyboard_shortcuts.column": "i ffocysu tŵt yn un o'r colofnau",
  "keyboard_shortcuts.compose": "i ffocysu yr ardal cyfansoddi testun",
-  "keyboard_shortcuts.conversations": "i agor colofn sgyrsiau",
  "keyboard_shortcuts.description": "Disgrifiad",
+  "keyboard_shortcuts.direct": "i agor colofn negeseuon preifat",
  "keyboard_shortcuts.down": "i symud lawr yn y rhestr",
-  "keyboard_shortcuts.enter": "Agor post",
+  "keyboard_shortcuts.enter": "i agor tŵt",
  "keyboard_shortcuts.favourite": "i hoffi",
  "keyboard_shortcuts.favourites": "i agor rhestr hoffi",
  "keyboard_shortcuts.federated": "i agor ffrwd y ffederasiwn",
  "keyboard_shortcuts.heading": "Llwybrau byr allweddell",
  "keyboard_shortcuts.home": "i agor ffrwd cartref",
  "keyboard_shortcuts.hotkey": "Bysell brys",
-  "keyboard_shortcuts.legend": "i ddangos y rhestr hon",
+  "keyboard_shortcuts.legend": "i ddangos yr arwr yma",
  "keyboard_shortcuts.local": "i agor ffrwd lleol",
  "keyboard_shortcuts.mention": "i grybwyll yr awdur",
  "keyboard_shortcuts.muted": "i agor rhestr defnyddwyr a dawelwyd",
  "keyboard_shortcuts.my_profile": "i agor eich proffil",
  "keyboard_shortcuts.notifications": "i agor colofn hysbysiadau",
  "keyboard_shortcuts.open_media": "i agor cyfryngau",
-  "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
+  "keyboard_shortcuts.pinned": "i agor rhestr tŵtiau wedi'i pinio",
  "keyboard_shortcuts.profile": "i agor proffil yr awdur",
  "keyboard_shortcuts.reply": "i ateb",
  "keyboard_shortcuts.requests": "i agor rhestr ceisiadau dilyn",
@ -256,7 +256,7 @@
  "keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"",
  "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu ôl i CW",
  "keyboard_shortcuts.toggle_sensitivity": "i ddangos/gyddio cyfryngau",
-  "keyboard_shortcuts.toot": "Dechrau post newydd",
+  "keyboard_shortcuts.toot": "i ddechrau tŵt newydd sbon",
  "keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio",
  "keyboard_shortcuts.up": "i symud yn uwch yn y rhestr",
  "lightbox.close": "Cau",
@ -275,7 +275,7 @@
  "lists.replies_policy.list": "Aelodau'r rhestr",
  "lists.replies_policy.none": "Neb",
  "lists.replies_policy.title": "Dangos ymatebion i:",
-  "lists.search": "Chwilio ymysg pobl yr ydych yn eu dilyn",
+  "lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
  "lists.subheading": "Eich rhestrau",
  "load_pending": "{count, plural, one {# eitem newydd} other {# eitemau newydd}}",
  "loading_indicator.label": "Llwytho...",
@ -289,11 +289,12 @@
  "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
  "navigation_bar.bookmarks": "Tudalnodau",
  "navigation_bar.community_timeline": "Ffrwd leol",
-  "navigation_bar.compose": "Cyfansoddi post newydd",
+  "navigation_bar.compose": "Cyfansoddi tŵt newydd",
+  "navigation_bar.direct": "Negeseuon preifat",
  "navigation_bar.discover": "Darganfod",
  "navigation_bar.domain_blocks": "Parthau cuddiedig",
  "navigation_bar.edit_profile": "Golygu proffil",
-  "navigation_bar.explore": "Archwilio",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Ffefrynnau",
  "navigation_bar.filters": "Geiriau a dawelwyd",
  "navigation_bar.follow_requests": "Ceisiadau dilyn",
@ -304,28 +305,28 @@
  "navigation_bar.logout": "Allgofnodi",
  "navigation_bar.mutes": "Defnyddwyr a dawelwyd",
  "navigation_bar.personal": "Personol",
-  "navigation_bar.pins": "Postiadau wedi eu pinio",
+  "navigation_bar.pins": "Tŵtiau wedi eu pinio",
  "navigation_bar.preferences": "Dewisiadau",
  "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
  "navigation_bar.security": "Diogelwch",
-  "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.favourite": "Hoffodd {name} eich post",
-  "notification.follow": "Dilynodd {name} chi",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "hoffodd {name} eich tŵt",
+  "notification.follow": "dilynodd {name} chi",
  "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
  "notification.mention": "Soniodd {name} amdanoch chi",
  "notification.own_poll": "Mae eich pôl wedi diweddu",
  "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
-  "notification.reblog": "Hybodd {name} eich post",
+  "notification.reblog": "Hysbysebodd {name} eich tŵt",
  "notification.status": "{name} newydd ei bostio",
-  "notification.update": "Golygodd {name} bost",
+  "notification.update": "{name} edited a post",
  "notifications.clear": "Clirio hysbysiadau",
  "notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
-  "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
  "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
  "notifications.column_settings.favourite": "Ffefrynnau:",
  "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
  "notifications.column_settings.filter_bar.category": "Bar hidlo",
-  "notifications.column_settings.filter_bar.show_bar": "Dangos bar hidlo",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
  "notifications.column_settings.follow": "Dilynwyr newydd:",
  "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
  "notifications.column_settings.mention": "Crybwylliadau:",
@ -335,10 +336,10 @@
  "notifications.column_settings.show": "Dangos yn y golofn",
  "notifications.column_settings.sound": "Chwarae sain",
  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_notifications.category": "Hysbysiadau heb eu darllen",
-  "notifications.column_settings.unread_notifications.highlight": "Amlygu hysbysiadau heb eu darllen",
-  "notifications.column_settings.update": "Golygiadau:",
-  "notifications.filter.all": "Popeth",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "Pob",
  "notifications.filter.boosts": "Hybiadau",
  "notifications.filter.favourites": "Ffefrynnau",
  "notifications.filter.follows": "Yn dilyn",
@ -361,116 +362,116 @@
  "poll.total_votes": "{count, plural, one {# bleidlais} other {# o bleidleisiau}}",
  "poll.vote": "Pleidleisio",
  "poll.voted": "Pleidleisioch chi am yr ateb hon",
-  "poll.votes": "{votes, plural, one {# bleidlais} other {# o bleidleisiau}}",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
  "poll_button.add_poll": "Ychwanegu pleidlais",
  "poll_button.remove_poll": "Tynnu pleidlais",
-  "privacy.change": "Addasu preifatrwdd y post",
+  "privacy.change": "Addasu preifatrwdd y tŵt",
  "privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
-  "privacy.direct.short": "Dim ond pobl rwy'n eu crybwyll",
+  "privacy.direct.short": "Uniongyrchol",
  "privacy.private.long": "Cyhoeddi i ddilynwyr yn unig",
-  "privacy.private.short": "Dilynwyr yn unig",
-  "privacy.public.long": "Gweladwy i bawb",
+  "privacy.private.short": "Dilynwyr-yn-unig",
+  "privacy.public.long": "Cyhoeddi i ffrydiau cyhoeddus",
  "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
+  "privacy.unlisted.long": "Peidio a chyhoeddi i ffrydiau cyhoeddus",
  "privacy.unlisted.short": "Heb ei restru",
  "refresh": "Adnewyddu",
  "regeneration_indicator.label": "Llwytho…",
  "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
  "relative_time.days": "{number}dydd",
-  "relative_time.full.days": "{number, plural, one {# dydd} other {# o ddyddiau}} yn ôl",
-  "relative_time.full.hours": "{number, plural, one {# awr} other {# o oriau}} yn ôl",
-  "relative_time.full.just_now": "jyst nawr",
-  "relative_time.full.minutes": "{number, plural, one {# funud} other {# o funudau}} yn ôl",
-  "relative_time.full.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} yn ôl",
-  "relative_time.hours": "{number} awr",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}awr",
  "relative_time.just_now": "nawr",
-  "relative_time.minutes": "{number} munud",
+  "relative_time.minutes": "{number}munud",
  "relative_time.seconds": "{number}eiliad",
  "relative_time.today": "heddiw",
  "reply_indicator.cancel": "Canslo",
-  "report.block": "Blocio",
-  "report.block_explanation": "Ni welwch chi eu postiadau. Ni allan nhw weld eich postiadau na'ch dilyn. Byddan nhw'n gallu gweld eu bod nhw wedi'u rhwystro.",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.other": "Arall",
  "report.categories.spam": "Sbam",
-  "report.categories.violation": "Mae cynnwys yn torri un neu fwy o reolau'r gweinydd",
-  "report.category.subtitle": "Dewiswch yr ateb gorau",
-  "report.category.title": "Beth sy'n bod â'r {type} hwn?",
-  "report.category.title_account": "proffil",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
  "report.category.title_status": "post",
-  "report.close": "Iawn",
-  "report.comment.title": "Oes unrhyw beth arall y dylem ei wybod yn eich barn chi?",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Ymlaen i {target}",
  "report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
-  "report.mute": "Mudo",
-  "report.mute_explanation": "Ni fyddwch yn gweld eu postiadau. Gallant eich dilyn o hyd a gweld eich postiadau ac ni fyddant yn gwybod eu bod nhw wedi'u mudo.",
-  "report.next": "Nesaf",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
  "report.placeholder": "Sylwadau ychwanegol",
-  "report.reasons.dislike": "Dydw i ddim yn ei hoffi",
-  "report.reasons.dislike_description": "Nid yw'n rhywbeth yr ydych am ei weld",
-  "report.reasons.other": "Mae'n rhywbeth arall",
-  "report.reasons.other_description": "Nid yw'r mater yn ffitio i gategorïau eraill",
-  "report.reasons.spam": "Sothach yw e",
-  "report.reasons.spam_description": "Cysylltiadau maleisus, ymgysylltu ffug, neu atebion ailadroddus",
-  "report.reasons.violation": "Mae'n torri rheolau'r gweinydd",
-  "report.reasons.violation_description": "Rydych yn ymwybodol ei fod yn torri rheolau penodol",
-  "report.rules.subtitle": "Dewiswch bob un sy'n berthnasol",
-  "report.rules.title": "Pa reolau sy'n cael eu torri?",
-  "report.statuses.subtitle": "Dewiswch bob un sy'n berthnasol",
-  "report.statuses.title": "Oes postiadau eraill sy'n cefnogi'r adroddiad hwn?",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
  "report.submit": "Cyflwyno",
  "report.target": "Cwyno am {target}",
-  "report.thanks.take_action": "Dyma'ch opsiynau ar gyfer rheoli'r hyn a welwch ar Mastodon:",
-  "report.thanks.take_action_actionable": "Tra byddwn yn edrych ar hyn, gallwch gymryd camau yn erbyn @{name}:",
-  "report.thanks.title": "Ddim eisiau gweld hwn?",
-  "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
-  "report.unfollow": "Dad-ddilyn @{name}",
-  "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
  "search.placeholder": "Chwilio",
  "search_popout.search_format": "Fformat chwilio uwch",
-  "search_popout.tips.full_text": "Mae testun syml yn dychwelyd postiadau yr ydych wedi ysgrifennu, hoffi, wedi'u hybio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
+  "search_popout.tips.full_text": "Mae testun syml yn dychwelyd tŵtiau yr ydych wedi ysgrifennu, hoffi, wedi'u bŵstio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
  "search_popout.tips.hashtag": "hashnod",
-  "search_popout.tips.status": "post",
+  "search_popout.tips.status": "tŵt",
  "search_popout.tips.text": "Mae testun syml yn dychwelyd enwau arddangos, enwau defnyddwyr a hashnodau sy'n cyfateb",
  "search_popout.tips.user": "defnyddiwr",
  "search_results.accounts": "Pobl",
-  "search_results.all": "Popeth",
+  "search_results.all": "All",
  "search_results.hashtags": "Hanshnodau",
-  "search_results.nothing_found": "Methu dod o hyd i unrhyw beth ar gyfer y termau chwilio hyn",
-  "search_results.statuses": "Postiadau",
-  "search_results.statuses_fts_disabled": "Nid yw chwilio postiadau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
-  "search_results.total": "{count, number} {count, plural, zero {canlyniad} one {canlyniad} two {ganlyniad} other {o ganlyniadau}}",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Tŵtiau",
+  "search_results.statuses_fts_disabled": "Nid yw chwilio Tŵtiau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
  "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
-  "status.admin_status": "Agor y post hwn yn y rhyngwyneb goruwchwylio",
+  "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio",
  "status.block": "Blocio @{name}",
  "status.bookmark": "Tudalnodi",
  "status.cancel_reblog_private": "Dadfŵstio",
-  "status.cannot_reblog": "Ni ellir hybio'r post hwn",
-  "status.copy": "Copïo dolen i'r post",
+  "status.cannot_reblog": "Ni ellir sbarduno'r tŵt hwn",
+  "status.copy": "Copïo cysylltiad i'r tŵt",
  "status.delete": "Dileu",
  "status.detailed_status": "Golwg manwl o'r sgwrs",
  "status.direct": "Neges breifat @{name}",
-  "status.edit": "Golygu",
-  "status.edited": "Ymunodd {date}",
-  "status.edited_x_times": "Golygwyd {count, plural, one {unwaith} two {dwywaith} other {{count} gwaith}}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
  "status.embed": "Plannu",
  "status.favourite": "Hoffi",
  "status.filtered": "Wedi'i hidlo",
-  "status.history.created": "{name} greuodd {date}",
-  "status.history.edited": "{name} olygodd {date}",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
  "status.load_more": "Llwythwch mwy",
  "status.media_hidden": "Cyfryngau wedi'u cuddio",
  "status.mention": "Crybwyll @{name}",
  "status.more": "Mwy",
  "status.mute": "Tawelu @{name}",
  "status.mute_conversation": "Tawelu sgwrs",
-  "status.open": "Ehangu'r post hwn",
+  "status.open": "Ehangu'r tŵt hwn",
  "status.pin": "Pinio ar y proffil",
-  "status.pinned": "Pinio post",
+  "status.pinned": "Pinio tŵt",
  "status.read_more": "Darllen mwy",
  "status.reblog": "Hybu",
  "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
-  "status.reblogged_by": "Hybio {name}",
-  "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
+  "status.reblogged_by": "Bŵstio {name}",
+  "status.reblogs.empty": "Does neb wedi bŵstio'r tŵt yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
  "status.redraft": "Dileu & ailddrafftio",
  "status.remove_bookmark": "Tynnu'r tudalnod",
  "status.reply": "Ateb",
@ -501,7 +502,7 @@
  "timeline_hint.remote_resource_not_displayed": "ni chaiff {resource} o gweinyddion eraill ei ddangos.",
  "timeline_hint.resources.followers": "Dilynwyr",
  "timeline_hint.resources.follows": "Yn dilyn",
-  "timeline_hint.resources.statuses": "Postiadau hŷn",
+  "timeline_hint.resources.statuses": "Tŵtiau henach",
  "trends.counter_by_accounts": "{count, plural, one {{counter} berson} other {{counter} o bobl}}",
  "trends.trending_now": "Yn tueddu nawr",
  "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
@ -514,20 +515,20 @@
  "upload_error.poll": "Nid oes modd uwchlwytho ffeiliau â phleidleisiau.",
  "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
  "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
-  "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Golygu",
  "upload_form.thumbnail": "Newid mân-lun",
  "upload_form.undo": "Dileu",
  "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
  "upload_modal.analyzing_picture": "Dadansoddi llun…",
  "upload_modal.apply": "Gweithredu",
-  "upload_modal.applying": "Gweithio…",
+  "upload_modal.applying": "Applying…",
  "upload_modal.choose_image": "Dewis delwedd",
  "upload_modal.description_placeholder": "Mae ei phen bach llawn jocs, 'run peth a fy nghot golff, rhai dyddiau",
  "upload_modal.detect_text": "Canfod testun o'r llun",
  "upload_modal.edit_media": "Golygu cyfryngau",
  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob mân-lunau.",
-  "upload_modal.preparing_ocr": "Paratoi OCR…",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
  "upload_modal.preview_label": "Rhagolwg ({ratio})",
  "upload_progress.label": "Uwchlwytho...",
  "video.close": "Cau fideo",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokerede brugere",
  "column.bookmarks": "Bogmærker",
  "column.community": "Lokal tidslinje",
-  "column.conversations": "Konversationer",
+  "column.direct": "Direkte beskeder",
  "column.directory": "Tjek profiler",
  "column.domain_blocks": "Blokerede domæner",
  "column.favourites": "Favoritter",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Kun lokalt",
  "community.column_settings.media_only": "Kun medier",
  "community.column_settings.remote_only": "Kun udefra",
+  "compose_form.direct_message_warning": "Indlægget sendes kun til de nævnte brugere.",
  "compose_form.direct_message_warning_learn_more": "Få mere at vide",
-  "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende krypteret. Del derfor ikke sensitiv information over Mastodon.",
  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, idet kun offentlige indlæg kan søges via hashtags.",
  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
  "compose_form.lock_disclaimer.lock": "låst",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ingen brugere blokeret endnu.",
  "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
  "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.conversations": "Når der sendes eller modtages indlæg, som kun er synligt for personer nævnt heri, vil de dukke op her.",
+  "empty_column.direct": "Du har endnu ingen direkte beskeder. Når du sender eller modtager én, vil den dukke op hér.",
  "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
  "empty_column.explore_statuses": "Ingen nye tendensen pt. Tjek igen senere!",
  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Boost indlæg",
  "keyboard_shortcuts.column": "Fokusér kolonne",
  "keyboard_shortcuts.compose": "Fokusér skriveområdet",
-  "keyboard_shortcuts.conversations": "for at åbne konversationskolonnen",
  "keyboard_shortcuts.description": "Beskrivelse",
+  "keyboard_shortcuts.direct": "Åbn Direkte beskeder-kolonnen",
  "keyboard_shortcuts.down": "Flyt nedad på listen",
  "keyboard_shortcuts.enter": "Åbn indlæg",
  "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bogmærker",
  "navigation_bar.community_timeline": "Lokal tidslinje",
  "navigation_bar.compose": "Skriv nyt indlæg",
+  "navigation_bar.direct": "Direkte beskeder",
  "navigation_bar.discover": "Opdag",
  "navigation_bar.domain_blocks": "Blokerede domæner",
  "navigation_bar.edit_profile": "Redigér profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Fjern afstemning",
  "privacy.change": "Justér indlægsfortrolighed",
  "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun personer, jeg nævner",
+  "privacy.direct.short": "Direkte",
  "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.private.short": "Kun for følgere",
+  "privacy.public.long": "Synlig for alle, fremgår på offentlige tidslinjer",
  "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
+  "privacy.unlisted.long": "Synlig for alle, fremgår ikke på offentlige tidslinjer",
  "privacy.unlisted.short": "Diskret",
  "refresh": "Genindlæs",
  "regeneration_indicator.label": "Indlæser…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
  "upload_form.audio_description": "Beskrivelse til hørehæmmede",
  "upload_form.description": "Beskrivelse til svagtseende",
-  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Redigér",
  "upload_form.thumbnail": "Skift miniature",
  "upload_form.undo": "Slet",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -13,22 +13,22 @@
  "account.domain_blocked": "Domain versteckt",
  "account.edit_profile": "Profil bearbeiten",
  "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
-  "account.endorse": "Im Profil anzeigen",
+  "account.endorse": "Auf Profil hervorheben",
  "account.follow": "Folgen",
  "account.followers": "Follower",
-  "account.followers.empty": "Diesem Profil folgt bislang niemand.",
+  "account.followers.empty": "Diesem Profil folgt noch niemand.",
  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
  "account.following": "Folgt",
-  "account.following_counter": "{count, plural, one {{counter} Folgt} other {{counter} Folgt}}",
+  "account.following_counter": "{count, plural, one {{counter} Folgender} other {{counter} Folgende}}",
  "account.follows.empty": "Dieses Profil folgt noch niemandem.",
  "account.follows_you": "Folgt dir",
  "account.hide_reblogs": "Geteilte Beiträge von @{name} verbergen",
  "account.joined": "Beigetreten am {date}",
  "account.link_verified_on": "Besitz dieses Links wurde geprüft am {date}",
-  "account.locked_info": "Der Privatsphärenstatus dieses Accounts wurde auf „gesperrt“ gesetzt. Die Person bestimmt manuell, wer ihm/ihr folgen darf.",
+  "account.locked_info": "Der Privatsphärenstatus dieses Accounts wurde auf gesperrt gesetzt. Die Person bestimmt manuell wer ihm/ihr folgen darf.",
  "account.media": "Medien",
  "account.mention": "@{name} erwähnen",
-  "account.moved_to": "{name} ist umgezogen nach:",
+  "account.moved_to": "{name} ist umgezogen auf:",
  "account.mute": "@{name} stummschalten",
  "account.mute_notifications": "Benachrichtigungen von @{name} stummschalten",
  "account.muted": "Stummgeschaltet",
@ -39,26 +39,26 @@
  "account.share": "Profil von @{name} teilen",
  "account.show_reblogs": "Von @{name} geteilte Beiträge anzeigen",
  "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "Blockierung von @{name} aufheben",
+  "account.unblock": "@{name} entblocken",
  "account.unblock_domain": "{domain} wieder anzeigen",
  "account.unblock_short": "Blockierung aufheben",
-  "account.unendorse": "Nicht mehr im Profil anzeigen",
+  "account.unendorse": "Nicht auf Profil hervorheben",
  "account.unfollow": "Entfolgen",
-  "account.unmute": "Stummschaltung von @{name} aufheben",
+  "account.unmute": "@{name} nicht mehr stummschalten",
  "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
-  "account.unmute_short": "Stummschaltung aufheben",
+  "account.unmute_short": "Nicht mehr stummschalten",
  "account_note.placeholder": "Notiz durch Klicken hinzufügen",
  "admin.dashboard.daily_retention": "Benutzerverbleibrate nach Tag nach Anmeldung",
  "admin.dashboard.monthly_retention": "Benutzerverbleibrate nach Monat nach Anmeldung",
  "admin.dashboard.retention.average": "Durchschnitt",
-  "admin.dashboard.retention.cohort": "Monat der Anmeldung",
+  "admin.dashboard.retention.cohort": "Anmeldemonat",
  "admin.dashboard.retention.cohort_size": "Neue Benutzer",
-  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
+  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium}.",
  "alert.rate_limited.title": "Anfragelimit überschritten",
  "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
  "alert.unexpected.title": "Hoppla!",
  "announcement.announcement": "Ankündigung",
-  "attachments_list.unprocessed": "(ausstehend)",
+  "attachments_list.unprocessed": "(unverarbeitet)",
  "autosuggest_hashtag.per_week": "{count} pro Woche",
  "boost_modal.combo": "Drücke {combo}, um dieses Fenster zu überspringen",
  "bundle_column_error.body": "Etwas ist beim Laden schiefgelaufen.",
@ -70,7 +70,7 @@
  "column.blocks": "Blockierte Profile",
  "column.bookmarks": "Lesezeichen",
  "column.community": "Lokale Zeitleiste",
-  "column.conversations": "Konversationen",
+  "column.direct": "Direktnachrichten",
  "column.directory": "Profile durchsuchen",
  "column.domain_blocks": "Blockierte Domains",
  "column.favourites": "Favoriten",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Nur lokal",
  "community.column_settings.media_only": "Nur Medien",
  "community.column_settings.remote_only": "Nur entfernt",
+  "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
  "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
-  "compose_form.encryption_warning": "Beiträge auf Mastodon sind nicht Ende-zu-Ende-verschlüsselt. Teile keine sensiblen Informationen über Mastodon.",
  "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
  "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
  "compose_form.lock_disclaimer.lock": "gesperrt",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Du hast keine Profile blockiert.",
  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
  "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
-  "empty_column.conversations": "Sobald du einen Beitrag sendest oder empfängst, der nur für die in ihm erwähnten Personen sichtbar ist, wird er hier angezeigt.",
+  "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
  "empty_column.domain_blocks": "Es sind noch keine Domains versteckt.",
  "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder!",
  "empty_column.favourited_statuses": "Du hast noch keine favorisierten Tröts. Wenn du einen favorisierst, wird er hier erscheinen.",
@ -176,7 +176,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.suggestions": "Ein paar Vorschläge ansehen",
-  "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen werden sie hier erscheinen.",
+  "empty_column.list": "Diese Liste ist derzeit leer. Wenn Wesen auf dieser Liste neue Beiträge veröffentlichen werden sie hier erscheinen.",
  "empty_column.lists": "Du hast noch keine Listen. Wenn du eine anlegst, wird sie hier angezeigt.",
  "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
  "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "teilen",
  "keyboard_shortcuts.column": "einen Beitrag in einer der Spalten fokussieren",
  "keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
-  "keyboard_shortcuts.conversations": "um die Konversationsspalte zu öffnen",
  "keyboard_shortcuts.description": "Beschreibung",
+  "keyboard_shortcuts.direct": "Direct-Message-Spalte öffnen",
  "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
  "keyboard_shortcuts.enter": "Beitrag öffnen",
  "keyboard_shortcuts.favourite": "um zu favorisieren",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Lesezeichen",
  "navigation_bar.community_timeline": "Lokale Zeitleiste",
  "navigation_bar.compose": "Neuen Beitrag verfassen",
+  "navigation_bar.direct": "Direktnachrichten",
  "navigation_bar.discover": "Entdecken",
  "navigation_bar.domain_blocks": "Versteckte Domains",
  "navigation_bar.edit_profile": "Profil bearbeiten",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Umfrage entfernen",
  "privacy.change": "Sichtbarkeit des Beitrags anpassen",
  "privacy.direct.long": "Wird an erwähnte Profile gesendet",
-  "privacy.direct.short": "Nur Leute, die ich erwähne",
+  "privacy.direct.short": "Direktnachricht",
  "privacy.private.long": "Nur für Folgende sichtbar",
-  "privacy.private.short": "Nur Follower",
-  "privacy.public.long": "Für alle sichtbar",
+  "privacy.private.short": "Nur für Folgende",
+  "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
  "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Sichtbar für alle, aber nicht über Entdeckungsfunktionen",
+  "privacy.unlisted.long": "Wird in öffentlichen Zeitleisten nicht gezeigt",
  "privacy.unlisted.short": "Nicht gelistet",
  "refresh": "Aktualisieren",
  "regeneration_indicator.label": "Laden…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Dateiuploads sind in Kombination mit Umfragen nicht erlaubt.",
  "upload_form.audio_description": "Beschreibe die Audiodatei für Menschen mit Hörschädigungen",
  "upload_form.description": "Für Menschen mit Sehbehinderung beschreiben",
-  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Bearbeiten",
  "upload_form.thumbnail": "Miniaturansicht ändern",
  "upload_form.undo": "Löschen",
@ -523,7 +524,7 @@
  "upload_modal.apply": "Übernehmen",
  "upload_modal.applying": "Anwenden…",
  "upload_modal.choose_image": "Bild auswählen",
-  "upload_modal.description_placeholder": "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
+  "upload_modal.description_placeholder": "Die heiße Zypernsonne quälte Max und Victoria ja böse auf dem Weg bis zur Küste",
  "upload_modal.detect_text": "Text aus Bild erkennen",
  "upload_modal.edit_media": "Medien bearbeiten",
  "upload_modal.hint": "Klicke oder ziehe den Kreis auf die Vorschau, um den Brennpunkt auszuwählen, der immer auf allen Vorschaubilder angezeigt wird.",
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -206,7 +206,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+        "defaultMessage": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
        "id": "account.statuses_counter"
      },
      {
@ -659,7 +659,7 @@
        "id": "privacy.private.short"
      },
      {
-        "defaultMessage": "Mentioned people only",
+        "defaultMessage": "Direct",
        "id": "privacy.direct.short"
      },
      {
@ -671,7 +671,7 @@
        "id": "status.filtered"
      },
      {
-        "defaultMessage": "Pinned post",
+        "defaultMessage": "Pinned toot",
        "id": "status.pinned"
      },
      {
@ -773,11 +773,11 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Posts",
+        "defaultMessage": "Toots",
        "id": "account.posts"
      },
      {
-        "defaultMessage": "Posts and replies",
+        "defaultMessage": "Toots and replies",
        "id": "account.posts_with_replies"
      },
      {
@ -820,7 +820,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Older posts",
+        "defaultMessage": "Older toots",
        "id": "timeline_hint.resources.statuses"
      },
      {
@ -832,7 +832,7 @@
        "id": "empty_column.account_unavailable"
      },
      {
-        "defaultMessage": "No posts found",
+        "defaultMessage": "No toots here!",
        "id": "empty_column.account_timeline"
      }
    ],
@ -946,7 +946,7 @@
        "id": "account.disable_notifications"
      },
      {
-        "defaultMessage": "Pinned posts",
+        "defaultMessage": "Pinned toots",
        "id": "navigation_bar.pins"
      },
      {
@ -1069,7 +1069,7 @@
        "id": "column.bookmarks"
      },
      {
-        "defaultMessage": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+        "defaultMessage": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
        "id": "empty_column.bookmarked_statuses"
      }
    ],
@ -1104,7 +1104,7 @@
        "id": "account.edit_profile"
      },
      {
-        "defaultMessage": "Pinned posts",
+        "defaultMessage": "Pinned toots",
        "id": "navigation_bar.pins"
      },
      {
@ -1306,7 +1306,7 @@
        "id": "privacy.public.short"
      },
      {
-        "defaultMessage": "Visible for all",
+        "defaultMessage": "Visible for all, shown in public timelines",
        "id": "privacy.public.long"
      },
      {
@ -1314,11 +1314,11 @@
        "id": "privacy.unlisted.short"
      },
      {
-        "defaultMessage": "Visible for all, but opted-out of discovery features",
+        "defaultMessage": "Visible for all, but not in public timelines",
        "id": "privacy.unlisted.long"
      },
      {
-        "defaultMessage": "Followers only",
+        "defaultMessage": "Followers-only",
        "id": "privacy.private.short"
      },
      {
@ -1326,7 +1326,7 @@
        "id": "privacy.private.long"
      },
      {
-        "defaultMessage": "Mentioned people only",
+        "defaultMessage": "Direct",
        "id": "privacy.direct.short"
      },
      {
@ -1364,11 +1364,11 @@
        "id": "search_results.accounts"
      },
      {
-        "defaultMessage": "Posts",
+        "defaultMessage": "Toots",
        "id": "search_results.statuses"
      },
      {
-        "defaultMessage": "Searching posts by their content is not enabled on this Mastodon server.",
+        "defaultMessage": "Searching toots by their content is not enabled on this Mastodon server.",
        "id": "search_results.statuses_fts_disabled"
      },
      {
@ -1504,12 +1504,12 @@
        "id": "compose_form.lock_disclaimer.lock"
      },
      {
-        "defaultMessage": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+        "defaultMessage": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
        "id": "compose_form.hashtag_warning"
      },
      {
-        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-        "id": "compose_form.encryption_warning"
+        "defaultMessage": "This toot will only be sent to all the mentioned users.",
+        "id": "compose_form.direct_message_warning"
      },
      {
        "defaultMessage": "Learn more",
@ -1549,7 +1549,7 @@
        "id": "navigation_bar.logout"
      },
      {
-        "defaultMessage": "Compose new post",
+        "defaultMessage": "Compose new toot",
        "id": "navigation_bar.compose"
      },
      {
@ -1616,12 +1616,12 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Conversations",
-        "id": "column.conversations"
+        "defaultMessage": "Direct messages",
+        "id": "column.direct"
      },
      {
-        "defaultMessage": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
-        "id": "empty_column.conversations"
+        "defaultMessage": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+        "id": "empty_column.direct"
      }
    ],
    "path": "app/javascript/mastodon/features/direct_timeline/index.json"
@ -1665,7 +1665,7 @@
        "id": "confirmations.unfollow.message"
      },
      {
-        "defaultMessage": "Posts",
+        "defaultMessage": "Toots",
        "id": "account.posts"
      },
      {
@ -1769,7 +1769,7 @@
        "id": "search_results.hashtags"
      },
      {
-        "defaultMessage": "Posts",
+        "defaultMessage": "Toots",
        "id": "search_results.statuses"
      }
    ],
@ -1791,7 +1791,7 @@
        "id": "column.favourites"
      },
      {
-        "defaultMessage": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+        "defaultMessage": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
        "id": "empty_column.favourited_statuses"
      }
    ],
@ -1804,7 +1804,7 @@
        "id": "refresh"
      },
      {
-        "defaultMessage": "No one has favourited this post yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has favourited this toot yet. When someone does, they will show up here.",
        "id": "empty_column.favourites"
      }
    ],
@ -1965,8 +1965,8 @@
        "id": "navigation_bar.explore"
      },
      {
-        "defaultMessage": "Conversations",
-        "id": "column.conversations"
+        "defaultMessage": "Direct messages",
+        "id": "navigation_bar.direct"
      },
      {
        "defaultMessage": "Bookmarks",
@ -1997,7 +1997,7 @@
        "id": "navigation_bar.mutes"
      },
      {
-        "defaultMessage": "Pinned posts",
+        "defaultMessage": "Pinned toots",
        "id": "navigation_bar.pins"
      },
      {
@ -2186,7 +2186,7 @@
        "id": "keyboard_shortcuts.compose"
      },
      {
-        "defaultMessage": "to start a brand new post",
+        "defaultMessage": "to start a brand new toot",
        "id": "keyboard_shortcuts.toot"
      },
      {
@ -2222,8 +2222,8 @@
        "id": "keyboard_shortcuts.federated"
      },
      {
-        "defaultMessage": "to open conversations column",
-        "id": "keyboard_shortcuts.conversations"
+        "defaultMessage": "to open direct messages column",
+        "id": "keyboard_shortcuts.direct"
      },
      {
        "defaultMessage": "to open \"get started\" column",
@ -2234,7 +2234,7 @@
        "id": "keyboard_shortcuts.favourites"
      },
      {
-        "defaultMessage": "to open pinned posts list",
+        "defaultMessage": "to open pinned toots list",
        "id": "keyboard_shortcuts.pinned"
      },
      {
@ -2468,7 +2468,7 @@
        "id": "notifications.column_settings.poll"
      },
      {
-        "defaultMessage": "New posts:",
+        "defaultMessage": "New toots:",
        "id": "notifications.column_settings.status"
      },
      {
@ -2690,7 +2690,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Pinned post",
+        "defaultMessage": "Pinned toot",
        "id": "column.pins"
      }
    ],
@ -2729,7 +2729,7 @@
        "id": "refresh"
      },
      {
-        "defaultMessage": "No one has boosted this post yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has boosted this toot yet. When someone does, they will show up here.",
        "id": "status.reblogs.empty"
      }
    ],
@ -3513,8 +3513,8 @@
        "id": "tabs_bar.federated_timeline"
      },
      {
-        "defaultMessage": "Conversations",
-        "id": "column.conversations"
+        "defaultMessage": "Direct messages",
+        "id": "navigation_bar.direct"
      },
      {
        "defaultMessage": "Favourites",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -70,7 +70,7 @@
  "column.blocks": "Αποκλεισμένοι χρήστες",
  "column.bookmarks": "Σελιδοδείκτες",
  "column.community": "Τοπική ροή",
-  "column.conversations": "Συνομιλίες",
+  "column.direct": "Προσωπικά μηνύματα",
  "column.directory": "Δες προφίλ",
  "column.domain_blocks": "Κρυμμένοι τομείς",
  "column.favourites": "Αγαπημένα",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Τοπικά μόνο",
  "community.column_settings.media_only": "Μόνο πολυμέσα",
  "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
+  "compose_form.direct_message_warning": "Αυτό το τουτ θα σταλεί μόνο στους αναφερόμενους χρήστες.",
  "compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα",
-  "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μην μοιράζεστε επικίνδυνες πληροφορίες μέσω του Mastodon.",
  "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
  "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
  "compose_form.lock_disclaimer.lock": "κλειδωμένο",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
  "empty_column.bookmarked_statuses": "Δεν έχεις κανένα αποθηκευμένο τουτ ακόμα. Μόλις αποθηκεύσεις κάποιο, θα εμφανιστεί εδώ.",
  "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
-  "empty_column.conversations": "Μόλις στείλετε ή λάβετε μια δημοσίευση που είναι ορατή μόνο σε άτομα που αναφέρονται σε αυτή, θα εμφανιστεί εδώ.",
+  "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
  "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "προώθηση",
  "keyboard_shortcuts.column": "εμφάνιση της κατάστασης σε μια από τις στήλες",
  "keyboard_shortcuts.compose": "εστίαση στην περιοχή συγγραφής",
-  "keyboard_shortcuts.conversations": "για να ανοίξετε στήλη συνομιλιών",
  "keyboard_shortcuts.description": "Περιγραφή",
+  "keyboard_shortcuts.direct": "άνοιγμα στήλης απευθείας μηνυμάτων",
  "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
  "keyboard_shortcuts.enter": "εμφάνιση κατάστασης",
  "keyboard_shortcuts.favourite": "σημείωση ως αγαπημένο",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Σελιδοδείκτες",
  "navigation_bar.community_timeline": "Τοπική ροή",
  "navigation_bar.compose": "Γράψε νέο τουτ",
+  "navigation_bar.direct": "Προσωπικά μηνύματα",
  "navigation_bar.discover": "Ανακάλυψη",
  "navigation_bar.domain_blocks": "Κρυμμένοι τομείς",
  "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
  "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης",
  "privacy.direct.long": "Δημοσίευση μόνο σε όσους και όσες αναφέρονται",
-  "privacy.direct.short": "Μόνο άτομα που αναφέρω",
+  "privacy.direct.short": "Προσωπικά",
  "privacy.private.long": "Δημοσίευση μόνο στους ακόλουθους",
  "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Ορατό σε όλους",
+  "privacy.public.long": "Δημοσίευσε στις δημόσιες ροές",
  "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Ορατό για όλους, αλλά opted-out των χαρακτηριστικών της ανακάλυψης",
+  "privacy.unlisted.long": "Μην δημοσιεύσεις στις δημόσιες ροές",
  "privacy.unlisted.short": "Μη καταχωρημένα",
  "refresh": "Ανανέωση",
  "regeneration_indicator.label": "Φορτώνει…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
  "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
  "upload_form.description": "Περιέγραψε για όσους & όσες έχουν προβλήματα όρασης",
-  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Ενημέρωση",
  "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
  "upload_form.undo": "Διαγραφή",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -70,7 +70,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Blocked domains",
  "column.favourites": "Favourites",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media Only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This post will only be sent to the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no blocked domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Boost post",
  "keyboard_shortcuts.column": "Focus column",
  "keyboard_shortcuts.compose": "Focus compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "Open direct messages column",
  "keyboard_shortcuts.down": "Move down in the list",
  "keyboard_shortcuts.enter": "Open post",
  "keyboard_shortcuts.favourite": "Favourite post",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Blocked domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Change post privacy",
  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
+  "privacy.direct.short": "Direct",
  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokitaj uzantoj",
  "column.bookmarks": "Legosignoj",
  "column.community": "Loka templinio",
-  "column.conversations": "Conversations",
+  "column.direct": "Rektaj mesaĝoj",
  "column.directory": "Trarigardi profilojn",
  "column.domain_blocks": "Blokitaj domajnoj",
  "column.favourites": "Stelumoj",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Nur loka",
  "community.column_settings.media_only": "Nur aŭdovidaĵoj",
  "community.column_settings.remote_only": "Nur malproksima",
+  "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.",
  "compose_form.direct_message_warning_learn_more": "Lerni pli",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
  "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.",
  "compose_form.lock_disclaimer.lock": "ŝlosita",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
  "empty_column.bookmarked_statuses": "Vi ankoraŭ ne aldonis mesaĝon al viaj legosignoj. Kiam vi aldonos iun, tiu aperos ĉi tie.",
  "empty_column.community": "La loka templinio estas malplena. Skribu ion por plenigi ĝin!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
  "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
  "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
  "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis mesaĝon. Kiam vi stelumos iun, tiu aperos ĉi tie.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "diskonigi",
  "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj",
  "keyboard_shortcuts.compose": "enfokusigi la tekstujon",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Priskribo",
+  "keyboard_shortcuts.direct": "malfermi la kolumnon de rektaj mesaĝoj",
  "keyboard_shortcuts.down": "iri suben en la listo",
  "keyboard_shortcuts.enter": "malfermi mesaĝon",
  "keyboard_shortcuts.favourite": "stelumi",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Legosignoj",
  "navigation_bar.community_timeline": "Loka templinio",
  "navigation_bar.compose": "Skribi novan mesaĝon",
+  "navigation_bar.direct": "Rektaj mesaĝoj",
  "navigation_bar.discover": "Esplori",
  "navigation_bar.domain_blocks": "Blokitaj domajnoj",
  "navigation_bar.edit_profile": "Redakti profilon",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Forigi balotenketon",
  "privacy.change": "Agordi mesaĝan privatecon",
  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Rekta",
  "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Nur al sekvantoj",
+  "privacy.public.long": "Videbla al ĉiuj, afiŝita en publikaj templinioj",
  "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Videbla al ĉiuj, sed ne en publikaj templinioj",
  "privacy.unlisted.short": "Nelistigita",
  "refresh": "Refreŝigu",
  "regeneration_indicator.label": "Ŝargado…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
  "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
  "upload_form.description": "Priskribi por misvidantaj homoj",
-  "upload_form.description_missing": "Neniu priskribo aldonita",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Redakti",
  "upload_form.thumbnail": "Ŝanĝi etigita bildo",
  "upload_form.undo": "Forigi",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -70,7 +70,7 @@
  "column.blocks": "Usuarios bloqueados",
  "column.bookmarks": "Marcadores",
  "column.community": "Línea temporal local",
-  "column.conversations": "Conversaciones",
+  "column.direct": "Mensajes directos",
  "column.directory": "Explorar perfiles",
  "column.domain_blocks": "Dominios bloqueados",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Sólo local",
  "community.column_settings.media_only": "Sólo medios",
  "community.column_settings.remote_only": "Sólo remoto",
+  "compose_form.direct_message_warning": "Este mensaje sólo será enviado a los usuarios mencionados.",
  "compose_form.direct_message_warning_learn_more": "Aprendé más",
-  "compose_form.encryption_warning": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No comparta ninguna información sensible al usar Mastodon.",
  "compose_form.hashtag_warning": "Este mensaje no se mostrará bajo ninguna etiqueta porque no es público. Sólo los mensajes públicos se pueden buscar por etiquetas.",
  "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
  "compose_form.lock_disclaimer.lock": "privada",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
  "empty_column.bookmarked_statuses": "Todavía no tenés mensajes guardados en \"Marcadores\". Cuando guardés uno en \"Marcadores\", se mostrará acá.",
  "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
-  "empty_column.conversations": "Una vez que enviés o recibás un mensaje que sólo sea visible para la gente mencionada en él, aparecerá aquí.",
+  "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
  "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
  "empty_column.explore_statuses": "No hay nada en tendencia ahora mismo. ¡Volvé a revisar más tarde!",
  "empty_column.favourited_statuses": "Todavía no tenés mensajes favoritos. Cuando marqués uno como favorito, se mostrará acá.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Adherir al mensaje",
  "keyboard_shortcuts.column": "Enfocar columna",
  "keyboard_shortcuts.compose": "Enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
  "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "Abrir columna de mensajes directos",
  "keyboard_shortcuts.down": "Bajar en la lista",
  "keyboard_shortcuts.enter": "Abrir mensaje",
  "keyboard_shortcuts.favourite": "Marcar mensaje como favorito",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcadores",
  "navigation_bar.community_timeline": "Línea temporal local",
  "navigation_bar.compose": "Redactar un nuevo mensaje",
+  "navigation_bar.direct": "Mensajes directos",
  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios bloqueados",
  "navigation_bar.edit_profile": "Editar perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Quitar encuesta",
  "privacy.change": "Configurar privacidad del mensaje",
  "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Sólo a las cuentas que menciono",
+  "privacy.direct.short": "Directo",
  "privacy.private.long": "Visible sólo para los seguidores",
  "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.public.long": "Visible para todos, mostrado en las líneas temporales públicas",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
+  "privacy.unlisted.long": "Visible para todos, pero no en las líneas temporales públicas",
  "privacy.unlisted.short": "No listado",
  "refresh": "Refrescar",
  "regeneration_indicator.label": "Cargando…",
@ -514,7 +515,7 @@
  "upload_error.poll": "No se permite la subida de archivos en encuestas.",
  "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
  "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
-  "upload_form.description_missing": "No se agregó descripción",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.undo": "Eliminar",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -70,7 +70,7 @@
  "column.blocks": "Usuarios bloqueados",
  "column.bookmarks": "Marcadores",
  "column.community": "Línea de tiempo local",
-  "column.conversations": "Conversations",
+  "column.direct": "Mensajes directos",
  "column.directory": "Buscar perfiles",
  "column.domain_blocks": "Dominios ocultados",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Solo local",
  "community.column_settings.media_only": "Solo media",
  "community.column_settings.remote_only": "Solo remoto",
+  "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.",
  "compose_form.direct_message_warning_learn_more": "Aprender mas",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
  "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
  "compose_form.lock_disclaimer.lock": "bloqueado",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
  "empty_column.bookmarked_statuses": "Aún no tienes ningún toot guardado como marcador. Cuando guardes uno, se mostrará aquí.",
  "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
  "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
  "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
  "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "retootear",
  "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
  "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
  "keyboard_shortcuts.down": "mover hacia abajo en la lista",
  "keyboard_shortcuts.enter": "abrir estado",
  "keyboard_shortcuts.favourite": "añadir a favoritos",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcadores",
  "navigation_bar.community_timeline": "Historia local",
  "navigation_bar.compose": "Escribir un nuevo toot",
+  "navigation_bar.direct": "Mensajes directos",
  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios ocultos",
  "navigation_bar.edit_profile": "Editar perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Eliminar encuesta",
  "privacy.change": "Ajustar privacidad",
  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Directo",
  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Privado",
+  "privacy.public.long": "Mostrar en la historia federada",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "No mostrar en la historia federada",
  "privacy.unlisted.short": "No listado",
  "refresh": "Actualizar",
  "regeneration_indicator.label": "Cargando…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
  "upload_form.audio_description": "Describir para personas con problemas auditivos",
  "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.description_missing": "Ninguna descripción añadida",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.undo": "Borrar",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -70,7 +70,7 @@
  "column.blocks": "Usuarios bloqueados",
  "column.bookmarks": "Marcadores",
  "column.community": "Línea de tiempo local",
-  "column.conversations": "Conversaciones",
+  "column.direct": "Mensajes directos",
  "column.directory": "Buscar perfiles",
  "column.domain_blocks": "Dominios ocultados",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Solo local",
  "community.column_settings.media_only": "Solo media",
  "community.column_settings.remote_only": "Solo remoto",
+  "compose_form.direct_message_warning": "Esta nueva publicación solo será enviada a los usuarios mencionados.",
  "compose_form.direct_message_warning_learn_more": "Aprender más",
-  "compose_form.encryption_warning": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No comparta ninguna información confidencial en Mastodon.",
  "compose_form.hashtag_warning": "Esta publicación no se mostrará bajo ningún hashtag porque no está listada. Sólo las publicaciones públicas se pueden buscar por hashtag.",
  "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
  "compose_form.lock_disclaimer.lock": "bloqueado",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
  "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
  "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.conversations": "Una vez que envíe o reciba un mensaje que solo sea visible para la gente mencionada en él, aparecerá aquí.",
+  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
  "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
  "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
  "empty_column.favourited_statuses": "Aún no tienes publicaciones favoritas. Cuando marques una como favorita, aparecerá aquí.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Retootear",
  "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
  "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
  "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
  "keyboard_shortcuts.down": "mover hacia abajo en la lista",
  "keyboard_shortcuts.enter": "abrir estado",
  "keyboard_shortcuts.favourite": "añadir a favoritos",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcadores",
  "navigation_bar.community_timeline": "Línea de tiempo local",
  "navigation_bar.compose": "Escribir nueva publicación",
+  "navigation_bar.direct": "Mensajes directos",
  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios ocultos",
  "navigation_bar.edit_profile": "Editar perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Eliminar encuesta",
  "privacy.change": "Ajustar privacidad",
  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo la gente que yo menciono",
+  "privacy.direct.short": "Directo",
  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.private.short": "Privado",
+  "privacy.public.long": "Mostrar en la historia federada",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
+  "privacy.unlisted.long": "No mostrar en la historia federada",
  "privacy.unlisted.short": "No listado",
  "refresh": "Actualizar",
  "regeneration_indicator.label": "Cargando…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
  "upload_form.audio_description": "Describir para personas con problemas auditivos",
  "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.description_missing": "Ninguna descripción añadida",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.undo": "Borrar",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokeeritud kasutajad",
  "column.bookmarks": "Järjehoidjad",
  "column.community": "Kohalik ajajoon",
-  "column.conversations": "Conversations",
+  "column.direct": "Otsesõnumid",
  "column.directory": "Sirvi profiile",
  "column.domain_blocks": "Peidetud domeenid",
  "column.favourites": "Lemmikud",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Ainult kohalik",
  "community.column_settings.media_only": "Ainult meedia",
  "community.column_settings.remote_only": "Ainult kaug",
+  "compose_form.direct_message_warning": "See tuut saadetakse ainult mainitud kasutajatele.",
  "compose_form.direct_message_warning_learn_more": "Vaata veel",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
  "compose_form.lock_disclaimer": "Teie konto ei ole {locked}. Igaüks saab Teid jälgida ja näha Teie ainult-jälgijatele postitusi.",
  "compose_form.lock_disclaimer.lock": "lukus",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
  "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud tuututusi. Kui lisate mõne, näete neid siin.",
  "empty_column.community": "Kohalik ajajoon on tühi. Kirjutage midagi avalikult, et pall veerema ajada!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Teil ei ole veel otsesõnumeid. Kui saadate või võtate mõne vastu, ilmuvad nad siia.",
  "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Teil pole veel lemmikuid tuute. Kui märgite mõne, näete neid siin.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "upitamiseks",
  "keyboard_shortcuts.column": "fokuseerimaks staatust ühele tulpadest",
  "keyboard_shortcuts.compose": "fokuseerimaks tekstikoostamise alale",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Kirjeldus",
+  "keyboard_shortcuts.direct": "avamaks otsesõnumite tulpa",
  "keyboard_shortcuts.down": "liikumaks nimstus alla",
  "keyboard_shortcuts.enter": "staatuse avamiseks",
  "keyboard_shortcuts.favourite": "lemmikuks märkimiseks",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Järjehoidjad",
  "navigation_bar.community_timeline": "Kohalik ajajoon",
  "navigation_bar.compose": "Koosta uus tuut",
+  "navigation_bar.direct": "Otsesõnumid",
  "navigation_bar.discover": "Avasta",
  "navigation_bar.domain_blocks": "Peidetud domeenid",
  "navigation_bar.edit_profile": "Muuda profiili",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Eemalda küsitlus",
  "privacy.change": "Muuda staatuse privaatsust",
  "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Otsene",
  "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Ainult jälgijatele",
+  "privacy.public.long": "Postita avalikele ajajoontele",
  "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ära postita avalikele ajajoontele",
  "privacy.unlisted.short": "Määramata",
  "refresh": "Värskenda",
  "regeneration_indicator.label": "Laeb…",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokeatutako erabiltzaileak",
  "column.bookmarks": "Laster-markak",
  "column.community": "Denbora-lerro lokala",
-  "column.conversations": "Conversations",
+  "column.direct": "Mezu zuzenak",
  "column.directory": "Arakatu profilak",
  "column.domain_blocks": "Ezkutatutako domeinuak",
  "column.favourites": "Gogokoak",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Lokala soilik",
  "community.column_settings.media_only": "Multimedia besterik ez",
  "community.column_settings.remote_only": "Urrunekoa soilik",
+  "compose_form.direct_message_warning": "Bidalketa hau aipatutako erabiltzaileei besterik ez zaie bidaliko.",
  "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Bidalketa hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan bidalketa publikoak besterik ez dira agertzen.",
  "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
  "compose_form.lock_disclaimer.lock": "giltzapetuta",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
  "empty_column.bookmarked_statuses": "Oraindik ez dituzu bidalketa laster-markatutarik. Bat laster-markatzerakoan, hemen agertuko da.",
  "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
  "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.",
  "empty_column.explore_statuses": "Ez dago joerarik une honetan. Begiratu beranduago!",
  "empty_column.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Bultzatu bidalketa",
  "keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
  "keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Deskripzioa",
+  "keyboard_shortcuts.direct": "mezu zuzenen zutabea irekitzeko",
  "keyboard_shortcuts.down": "zerrendan behera mugitzea",
  "keyboard_shortcuts.enter": "Ireki bidalketa",
  "keyboard_shortcuts.favourite": "Egin gogoko bidalketa",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Laster-markak",
  "navigation_bar.community_timeline": "Denbora-lerro lokala",
  "navigation_bar.compose": "Idatzi bidalketa berria",
+  "navigation_bar.direct": "Mezu zuzenak",
  "navigation_bar.discover": "Aurkitu",
  "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
  "navigation_bar.edit_profile": "Aldatu profila",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Kendu inkesta",
  "privacy.change": "Aldatu bidalketaren pribatutasuna",
  "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Zuzena",
  "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Jarraitzaileak soilik",
+  "privacy.public.long": "Bistaratu denbora-lerro publikoetan",
  "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Zerrendatu gabea",
  "refresh": "Berritu",
  "regeneration_indicator.label": "Kargatzen…",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@ -70,7 +70,7 @@
  "column.blocks": "کاربران مسدود شده",
  "column.bookmarks": "نشانک‌ها",
  "column.community": "خط زمانی محلّی",
-  "column.conversations": "Conversations",
+  "column.direct": "پیام‌های مستقیم",
  "column.directory": "مرور نمایه‌ها",
  "column.domain_blocks": "دامنه‌های مسدود شده",
  "column.favourites": "پسندیده‌ها",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "فقط محلّی",
  "community.column_settings.media_only": "فقط رسانه",
  "community.column_settings.remote_only": "تنها دوردست",
+  "compose_form.direct_message_warning": "این فرسته تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
  "compose_form.direct_message_warning_learn_more": "بیشتر بدانید",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "از آن‌جا که این فرسته فهرست نشده است، در نتایج جست‌وجوی هشتگ‌ها پیدا نخواهد شد. تنها فرسته‌های عمومی را می‌توان با جست‌وجوی هشتگ یافت.",
  "compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی می‌تواند پی‌گیرتان شده و فرسته‌های ویژهٔ پی‌گیرانتان را ببیند.",
  "compose_form.lock_disclaimer.lock": "قفل‌شده",
@ -166,7 +166,7 @@
  "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
  "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
  "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "هنوز هیچ پیام مستقیمی ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید این‌جا نشان داده خواهد شد.",
  "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
  "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
  "empty_column.favourited_statuses": "شما هنوز هیچ فرسته‌ای را نپسندیده‌اید. هنگامی که فرسته‌ای را بپسندید، این‌جا نشان داده خواهد شد.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "تقویت فرسته",
  "keyboard_shortcuts.column": "برای تمرکز روی یک فرسته در یکی از ستون‌ها",
  "keyboard_shortcuts.compose": "تمرکز روی محیط نوشتن",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "توضیح",
+  "keyboard_shortcuts.direct": "گشودن ستون پیام‌های مستقیم",
  "keyboard_shortcuts.down": "پایین بردن در سیاهه",
  "keyboard_shortcuts.enter": "گشودن فرسته",
  "keyboard_shortcuts.favourite": "پسندیدن فرسته",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "نشانک‌ها",
  "navigation_bar.community_timeline": "خط زمانی محلّی",
  "navigation_bar.compose": "نوشتن فرستهٔ تازه",
+  "navigation_bar.direct": "پیام‌های مستقیم",
  "navigation_bar.discover": "گشت و گذار",
  "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
  "navigation_bar.edit_profile": "ویرایش نمایه",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "برداشتن نظرسنجی",
  "privacy.change": "تغییر محرمانگی فرسته",
  "privacy.direct.long": "فقط برای کاربران نام‌برده نمایان است",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "مستقیم",
  "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "فقط پی‌گیرندگان",
+  "privacy.public.long": "نمایان برای همه، در خط‌های زمانی همگانی نمایش داده خواهد شد",
  "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "نمایان برای همه، ولی در خط‌های زمانی همگانی نمایش داده نخواهد شد",
  "privacy.unlisted.short": "فهرست نشده",
  "refresh": "نوسازی",
  "regeneration_indicator.label": "در حال بار شدن…",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -70,7 +70,7 @@
  "column.blocks": "Estetyt käyttäjät",
  "column.bookmarks": "Kirjanmerkit",
  "column.community": "Paikallinen aikajana",
-  "column.conversations": "Conversations",
+  "column.direct": "Pikaviestit",
  "column.directory": "Selaa profiileja",
  "column.domain_blocks": "Piilotetut verkkotunnukset",
  "column.favourites": "Suosikit",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Vain paikalliset",
  "community.column_settings.media_only": "Vain media",
  "community.column_settings.remote_only": "Vain etäkäyttö",
+  "compose_form.direct_message_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
  "compose_form.direct_message_warning_learn_more": "Lisätietoja",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Tätä julkaisua listata minkään hastagin alle, koska se on listaamaton. Ainoastaan julkisia julkaisuja etsiä hastageilla.",
  "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
  "compose_form.lock_disclaimer.lock": "lukittu",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
  "empty_column.bookmarked_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
  "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
  "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä estetty.",
  "empty_column.explore_statuses": "Mikään ei ole nyt trendi. Tarkista myöhemmin!",
  "empty_column.favourited_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Buustaa viestiä",
  "keyboard_shortcuts.column": "Kohdista sarakkeeseen",
  "keyboard_shortcuts.compose": "siirry tekstinsyöttöön",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Kuvaus",
+  "keyboard_shortcuts.direct": "Avaa pikaviestisarake",
  "keyboard_shortcuts.down": "Siirry listassa alaspäin",
  "keyboard_shortcuts.enter": "Avaa julkaisu",
  "keyboard_shortcuts.favourite": "Lisää suosikkeihin",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Kirjanmerkit",
  "navigation_bar.community_timeline": "Paikallinen aikajana",
  "navigation_bar.compose": "Luo uusi viesti",
+  "navigation_bar.direct": "Pikaviestit",
  "navigation_bar.discover": "Löydä uutta",
  "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
  "navigation_bar.edit_profile": "Muokkaa profiilia",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Poista kysely",
  "privacy.change": "Muuta julkaisun näkyvyyttä",
  "privacy.direct.long": "Julkaise vain mainituille käyttäjille",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Suora viesti",
  "privacy.private.long": "Julkaise vain seuraajille",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Vain seuraajat",
+  "privacy.public.long": "Julkaise julkisille aikajanoille",
  "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Älä julkaise julkisilla aikajanoilla",
  "privacy.unlisted.short": "Listaamaton julkinen",
  "refresh": "Päivitä",
  "regeneration_indicator.label": "Ladataan…",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -70,7 +70,7 @@
  "column.blocks": "Comptes bloqués",
  "column.bookmarks": "Marque-pages",
  "column.community": "Fil public local",
-  "column.conversations": "Conversations",
+  "column.direct": "Messages directs",
  "column.directory": "Parcourir les profils",
  "column.domain_blocks": "Domaines bloqués",
  "column.favourites": "Favoris",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local seulement",
  "community.column_settings.media_only": "Média uniquement",
  "community.column_settings.remote_only": "Distant seulement",
+  "compose_form.direct_message_warning": "Ce message sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
  "compose_form.direct_message_warning_learn_more": "En savoir plus",
-  "compose_form.encryption_warning": "Les messages sur Mastodon ne sont pas chiffrés de bout en bout. Ne partagez aucune information confidentielle sur Mastodon.",
  "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 messages privés.",
  "compose_form.lock_disclaimer.lock": "verrouillé",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
  "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.",
  "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "empty_column.conversations": "Une fois que vous avez envoyé ou reçu un message qui ne sera visible que par les personnes mentionnées, il apparaîtra ici.",
+  "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
  "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
  "empty_column.explore_statuses": "Rien n'est en tendance pour le moment. Revenez plus tard !",
  "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Partager le message",
  "keyboard_shortcuts.column": "Se placer dans une colonne",
  "keyboard_shortcuts.compose": "Se placer dans la zone de rédaction",
-  "keyboard_shortcuts.conversations": "pour ouvrir la colonne des conversations",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "Ouvrir la colonne des messages directs",
  "keyboard_shortcuts.down": "Descendre dans la liste",
  "keyboard_shortcuts.enter": "Ouvrir le message",
  "keyboard_shortcuts.favourite": "Ajouter le message aux favoris",
@ -279,7 +279,7 @@
  "lists.subheading": "Vos listes",
  "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
  "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
+  "media_gallery.toggle_visible": "Intervertir la visibilité",
  "missing_indicator.label": "Non trouvé",
  "missing_indicator.sublabel": "Ressource introuvable",
  "mute_modal.duration": "Durée",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marque-pages",
  "navigation_bar.community_timeline": "Fil public local",
  "navigation_bar.compose": "Rédiger un nouveau message",
+  "navigation_bar.direct": "Messages directs",
  "navigation_bar.discover": "Découvrir",
  "navigation_bar.domain_blocks": "Domaines bloqués",
  "navigation_bar.edit_profile": "Modifier le profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Supprimer le sondage",
  "privacy.change": "Ajuster la confidentialité du message",
  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Seulement les personnes mentionnées",
+  "privacy.direct.short": "Direct",
  "privacy.private.long": "Visible uniquement par vos abonné·e·s",
  "privacy.private.short": "Abonné·e·s uniquement",
-  "privacy.public.long": "Visible pour tous",
+  "privacy.public.long": "Visible par tou·te·s, affiché dans les fils publics",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
+  "privacy.unlisted.long": "Visible par tou·te·s, mais pas dans les fils publics",
  "privacy.unlisted.short": "Non listé",
  "refresh": "Actualiser",
  "regeneration_indicator.label": "Chargement…",
@ -514,7 +515,7 @@
  "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
  "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
  "upload_form.description": "Décrire pour les malvoyant·e·s",
-  "upload_form.description_missing": "Description manquante",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Modifier",
  "upload_form.thumbnail": "Changer la vignette",
  "upload_form.undo": "Supprimer",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -1,54 +1,54 @@
 {
-  "account.account_note_header": "Nóta",
-  "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
-  "account.badges.bot": "Bota",
-  "account.badges.group": "Grúpa",
-  "account.block": "Bac @{name}",
-  "account.block_domain": "Bac ainm fearainn {domain}",
-  "account.blocked": "Bactha",
-  "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
-  "account.cancel_follow_request": "Cealaigh iarratas leanúnaí",
-  "account.direct": "Seol teachtaireacht dhíreach chuig @{name}",
-  "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
-  "account.domain_blocked": "Ainm fearainn bactha",
-  "account.edit_profile": "Cuir an phróifíl in eagar",
-  "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
-  "account.endorse": "Cuir ar an phróifíl mar ghné",
-  "account.follow": "Lean",
-  "account.followers": "Leantóirí",
-  "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
-  "account.followers_counter": "{count, plural, one {Leantóir amháin} other {{counter} Leantóir}}",
-  "account.following": "Ag leanúint",
-  "account.following_counter": "{count, plural, one {Ag leanúint cúntas amháin} other {Ag leanúint {counter} cúntas}}",
-  "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
-  "account.follows_you": "Do do leanúint",
-  "account.hide_reblogs": "Folaigh athphostálacha ó @{name}",
-  "account.joined": "Ina bhall ó {date}",
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Hide everything from {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Cancel follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain hidden",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined": "Joined {date}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
-  "account.media": "Ábhair",
-  "account.mention": "Luaigh @{name}",
-  "account.moved_to": "Tá {name} bogtha go:",
-  "account.mute": "Balbhaigh @{name}",
-  "account.mute_notifications": "Balbhaigh fógraí ó @{name}",
-  "account.muted": "Balbhaithe",
-  "account.posts": "Postálacha",
-  "account.posts_with_replies": "Postálacha agus freagraí",
-  "account.report": "Tuairiscigh @{name}",
-  "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
-  "account.share": "Roinn próifíl @{name}",
-  "account.show_reblogs": "Taispeáin athphostálacha ó @{name}",
-  "account.statuses_counter": "{count, plural, one {Postáil amháin} other {{counter} Postáil}}",
-  "account.unblock": "Bain bac de @{name}",
-  "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
-  "account.unblock_short": "Bain bac de",
-  "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
-  "account.unfollow": "Ná lean a thuilleadh",
-  "account.unmute": "Díbhalbhaigh @{name}",
-  "account.unmute_notifications": "Díbhalbhaigh fógraí ó @{name}",
-  "account.unmute_short": "Díbhalbhaigh",
-  "account_note.placeholder": "Cliceáil chun nóta a chuir leis",
-  "admin.dashboard.daily_retention": "Ráta coinneála an úsáideora de réir an lae tar éis clárú",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "No comment provided",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
  "admin.dashboard.retention.average": "Average",
  "admin.dashboard.retention.cohort": "Sign-up month",
@ -56,48 +56,48 @@
  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
  "alert.rate_limited.title": "Rate limited",
  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Hiúps!",
-  "announcement.announcement": "Fógra",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
  "attachments_list.unprocessed": "(unprocessed)",
  "autosuggest_hashtag.per_week": "{count} per week",
  "boost_modal.combo": "You can press {combo} to skip this next time",
  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Bain triail as arís",
+  "bundle_column_error.retry": "Try again",
  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Dún",
+  "bundle_modal_error.close": "Close",
  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Bain triail as arís",
-  "column.blocks": "Cuntais choiscthe",
-  "column.bookmarks": "Leabharmharcanna",
+  "bundle_modal_error.retry": "Try again",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Blocked domains",
+  "column.domain_blocks": "Hidden domains",
  "column.favourites": "Favourites",
  "column.follow_requests": "Follow requests",
-  "column.home": "Baile",
-  "column.lists": "Liostaí",
-  "column.mutes": "Úsáideoirí balbhaithe",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
  "column.notifications": "Notifications",
-  "column.pins": "Pinned post",
+  "column.pins": "Pinned toot",
  "column.public": "Federated timeline",
-  "column_back_button.label": "Siar",
+  "column_back_button.label": "Back",
  "column_header.hide_settings": "Hide settings",
  "column_header.moveLeft_settings": "Move column to the left",
  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Greamaigh",
+  "column_header.pin": "Pin",
  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Díghreamaigh",
-  "column_subheading.settings": "Socruithe",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "Cad atá ag tarlú?",
+  "compose_form.placeholder": "What is on your mind?",
  "compose_form.poll.add_option": "Add a choice",
  "compose_form.poll.duration": "Poll duration",
  "compose_form.poll.option_placeholder": "Choice {number}",
@ -121,20 +121,20 @@
  "confirmations.delete.message": "Are you sure you want to delete this status?",
  "confirmations.delete_list.confirm": "Delete",
  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Faigh réidh de",
-  "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
-  "confirmations.logout.confirm": "Logáil amach",
+  "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. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Balbhaigh",
+  "confirmations.mute.confirm": "Mute",
  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
  "confirmations.redraft.confirm": "Delete & redraft",
  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
  "confirmations.reply.confirm": "Reply",
  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Ná lean",
+  "confirmations.unfollow.confirm": "Unfollow",
  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
  "conversation.delete": "Delete conversation",
  "conversation.mark_as_read": "Mark as read",
@ -146,40 +146,40 @@
  "directory.recently_active": "Recently active",
  "embed.instructions": "Embed this status on your website by copying the code below.",
  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Gníomhaíocht",
+  "emoji_button.activity": "Activity",
  "emoji_button.custom": "Custom",
  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Bia ⁊ Ól",
+  "emoji_button.food": "Food & Drink",
  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nádur",
-  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
  "emoji_button.objects": "Objects",
-  "emoji_button.people": "Daoine",
+  "emoji_button.people": "People",
  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Cuardaigh...",
+  "emoji_button.search": "Search...",
  "emoji_button.search_results": "Search results",
  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Taisteal ⁊ Áiteanna",
+  "emoji_button.travel": "Travel & Places",
  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No posts found",
+  "empty_column.account_timeline": "No toots here!",
  "empty_column.account_unavailable": "Profile unavailable",
  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
-  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
-  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
  "empty_column.home.suggestions": "See some suggestions",
  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "Níl aon úsáideoir balbhaithe agat fós.",
-  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
@ -189,15 +189,15 @@
  "errors.unexpected_crash.report_issue": "Report issue",
  "explore.search_results": "Search results",
  "explore.suggested_follows": "For you",
-  "explore.title": "Féach thart",
-  "explore.trending_links": "Nuacht",
-  "explore.trending_statuses": "Postálacha",
-  "explore.trending_tags": "Haischlibeanna",
-  "follow_recommendations.done": "Déanta",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "follow_recommendations.done": "Done",
  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "Ceadaigh",
-  "follow_request.reject": "Diúltaigh",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
  "generic.saved": "Saved",
  "getting_started.developers": "Developers",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -243,11 +243,11 @@
  "keyboard_shortcuts.legend": "to display this legend",
  "keyboard_shortcuts.local": "to open local timeline",
  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "Oscail liosta na n-úsáideoirí balbhaithe",
+  "keyboard_shortcuts.muted": "to open muted users list",
  "keyboard_shortcuts.my_profile": "to open your profile",
  "keyboard_shortcuts.notifications": "to open notifications column",
  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.pinned": "to open pinned toots list",
  "keyboard_shortcuts.profile": "to open author's profile",
  "keyboard_shortcuts.reply": "to reply",
  "keyboard_shortcuts.requests": "to open follow requests list",
@ -256,7 +256,7 @@
  "keyboard_shortcuts.start": "to open \"get started\" column",
  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
  "keyboard_shortcuts.up": "to move up in the list",
  "lightbox.close": "Close",
@ -267,8 +267,8 @@
  "lists.account.add": "Add to list",
  "lists.account.remove": "Remove from list",
  "lists.delete": "Delete list",
-  "lists.edit": "Cuir an liosta in eagar",
-  "lists.edit.submit": "Athraigh teideal",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
  "lists.new.create": "Add list",
  "lists.new.title_placeholder": "New list title",
  "lists.replies_policy.followed": "Any followed user",
@ -279,45 +279,46 @@
  "lists.subheading": "Your lists",
  "load_pending": "{count, plural, one {# new item} other {# new items}}",
  "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "media_gallery.toggle_visible": "Hide media",
  "missing_indicator.label": "Not found",
  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Tréimhse",
-  "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
-  "mute_modal.indefinite": "Gan téarma",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
  "navigation_bar.apps": "Mobile apps",
  "navigation_bar.blocks": "Blocked users",
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
+  "navigation_bar.edit_profile": "Edit profile",
  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Focail bhalbhaithe",
+  "navigation_bar.filters": "Muted words",
  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint",
+  "navigation_bar.follows_and_followers": "Follows and followers",
  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Eochracha Aicearra",
-  "navigation_bar.lists": "Liostaí",
-  "navigation_bar.logout": "Logáil Amach",
-  "navigation_bar.mutes": "Úsáideoirí balbhaithe",
-  "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned toots",
  "navigation_bar.preferences": "Preferences",
  "navigation_bar.public_timeline": "Federated timeline",
  "navigation_bar.security": "Security",
  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "{name} favourited your status",
-  "notification.follow": "Lean {name} thú",
-  "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
  "notification.mention": "{name} mentioned you",
  "notification.own_poll": "Your poll has ended",
  "notification.poll": "A poll you have voted in has ended",
  "notification.reblog": "{name} boosted your status",
  "notification.status": "{name} just posted",
-  "notification.update": "Chuir {name} postáil in eagar",
+  "notification.update": "{name} edited a post",
  "notifications.clear": "Clear notifications",
  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
  "notifications.column_settings.admin.sign_up": "New sign-ups:",
@ -326,18 +327,18 @@
  "notifications.column_settings.filter_bar.advanced": "Display all categories",
  "notifications.column_settings.filter_bar.category": "Quick filter bar",
  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
-  "notifications.column_settings.follow": "Leantóirí nua:",
-  "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
  "notifications.column_settings.mention": "Mentions:",
  "notifications.column_settings.poll": "Poll results:",
  "notifications.column_settings.push": "Push notifications",
  "notifications.column_settings.reblog": "Boosts:",
  "notifications.column_settings.show": "Show in column",
  "notifications.column_settings.sound": "Play sound",
-  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.status": "New toots:",
  "notifications.column_settings.unread_notifications.category": "Unread notifications",
  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Eagair:",
+  "notifications.column_settings.update": "Edits:",
  "notifications.filter.all": "All",
  "notifications.filter.boosts": "Boosts",
  "notifications.filter.favourites": "Favourites",
@ -365,16 +366,16 @@
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.long": "Post to mentioned users only",
  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
+  "privacy.private.long": "Post to followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
-  "privacy.public.short": "Poiblí",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.public.long": "Post to public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
-  "regeneration_indicator.label": "Ag lódáil…",
+  "regeneration_indicator.label": "Loading…",
  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
  "relative_time.days": "{number}d",
  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
@ -386,38 +387,38 @@
  "relative_time.just_now": "now",
  "relative_time.minutes": "{number}m",
  "relative_time.seconds": "{number}s",
-  "relative_time.today": "inniu",
+  "relative_time.today": "today",
  "reply_indicator.cancel": "Cancel",
  "report.block": "Block",
  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.other": "Other",
-  "report.categories.spam": "Turscar",
+  "report.categories.spam": "Spam",
  "report.categories.violation": "Content violates one or more server rules",
  "report.category.subtitle": "Choose the best match",
  "report.category.title": "Tell us what's going on with this {type}",
  "report.category.title_account": "profile",
  "report.category.title_status": "post",
-  "report.close": "Déanta",
+  "report.close": "Done",
  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Forward to {target}",
  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.mute": "Balbhaigh",
-  "report.mute_explanation": "Ní fheicfidh tú a postálacha. Is féidir an té seo tú a leanúint agus do phostálacha a fheiceáil, agus ní fhios go bhfuil iad balbhaithe.",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
  "report.next": "Next",
-  "report.placeholder": "Type or paste additional comments",
-  "report.reasons.dislike": "Ní maith liom é",
+  "report.placeholder": "Additional comments",
+  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
  "report.reasons.other": "It's something else",
  "report.reasons.other_description": "The issue does not fit into other categories",
  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
  "report.rules.subtitle": "Select all that apply",
  "report.rules.title": "Which rules are being violated?",
  "report.statuses.subtitle": "Select all that apply",
  "report.statuses.title": "Are there any posts that back up this report?",
-  "report.submit": "Submit report",
+  "report.submit": "Submit",
  "report.target": "Report {target}",
  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
@ -425,19 +426,19 @@
  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
  "report.unfollow": "Unfollow @{name}",
  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
-  "search.placeholder": "Cuardaigh",
+  "search.placeholder": "Search",
  "search_popout.search_format": "Advanced search format",
  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "haischlib",
+  "search_popout.tips.hashtag": "hashtag",
  "search_popout.tips.status": "status",
  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
  "search_popout.tips.user": "user",
-  "search_results.accounts": "Daoine",
+  "search_results.accounts": "People",
  "search_results.all": "All",
-  "search_results.hashtags": "Haischlibeanna",
+  "search_results.hashtags": "Hashtags",
  "search_results.nothing_found": "Could not find anything for these search terms",
-  "search_results.statuses": "Postálacha",
-  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.statuses": "Toots",
+  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
  "status.admin_account": "Open moderation interface for @{name}",
  "status.admin_status": "Open this status in the moderation interface",
@ -446,31 +447,31 @@
  "status.cancel_reblog_private": "Unboost",
  "status.cannot_reblog": "This post cannot be boosted",
  "status.copy": "Copy link to status",
-  "status.delete": "Scrios",
+  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
-  "status.edit": "Cuir in eagar",
-  "status.edited": "Curtha in eagar in {date}",
-  "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
  "status.embed": "Embed",
  "status.favourite": "Favourite",
  "status.filtered": "Filtered",
  "status.history.created": "{name} created {date}",
-  "status.history.edited": "Curtha in eagar ag {name} in {date}",
+  "status.history.edited": "{name} edited {date}",
  "status.load_more": "Load more",
  "status.media_hidden": "Media hidden",
  "status.mention": "Mention @{name}",
-  "status.more": "Tuilleadh",
-  "status.mute": "Balbhaigh @{name}",
-  "status.mute_conversation": "Balbhaigh comhrá",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
  "status.open": "Expand this status",
  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned post",
+  "status.pinned": "Pinned toot",
  "status.read_more": "Read more",
  "status.reblog": "Boost",
  "status.reblog_private": "Boost with original visibility",
  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
  "status.redraft": "Delete & re-draft",
  "status.remove_bookmark": "Remove bookmark",
  "status.reply": "Reply",
@ -484,24 +485,24 @@
  "status.show_more_all": "Show more for all",
  "status.show_thread": "Show thread",
  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Díbhalbhaigh comhrá",
+  "status.unmute_conversation": "Unmute conversation",
  "status.unpin": "Unpin from profile",
  "suggestions.dismiss": "Dismiss suggestion",
  "suggestions.header": "You might be interested in…",
  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Baile",
+  "tabs_bar.home": "Home",
  "tabs_bar.local_timeline": "Local",
  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Cuardaigh",
+  "tabs_bar.search": "Search",
  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
  "time_remaining.moments": "Moments remaining",
  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Leantóirí",
+  "timeline_hint.resources.followers": "Followers",
  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older posts",
+  "timeline_hint.resources.statuses": "Older toots",
  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
  "trends.trending_now": "Trending now",
  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
@ -509,13 +510,13 @@
  "units.short.million": "{count}M",
  "units.short.thousand": "{count}K",
  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add images, a video or an audio file",
+  "upload_button.label": "Add media ({formats})",
  "upload_error.limit": "File upload limit exceeded.",
  "upload_error.poll": "File upload not allowed with polls.",
  "upload_form.audio_description": "Describe for people with hearing loss",
  "upload_form.description": "Describe for the visually impaired",
  "upload_form.description_missing": "No description added",
-  "upload_form.edit": "Cuir in eagar",
+  "upload_form.edit": "Edit",
  "upload_form.thumbnail": "Change thumbnail",
  "upload_form.undo": "Delete",
  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
@ -525,19 +526,19 @@
  "upload_modal.choose_image": "Choose image",
  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Cuir gné in eagar",
+  "upload_modal.edit_media": "Edit media",
  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
  "upload_modal.preparing_ocr": "Preparing OCR…",
  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading…",
+  "upload_progress.label": "Uploading...",
  "video.close": "Close video",
  "video.download": "Download file",
  "video.exit_fullscreen": "Exit full screen",
  "video.expand": "Expand video",
  "video.fullscreen": "Full screen",
  "video.hide": "Hide video",
-  "video.mute": "Ciúnaigh fuaim",
-  "video.pause": "Cuir ar sos",
-  "video.play": "Cuir ar siúl",
-  "video.unmute": "Díchiúnaigh fuaim"
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
 }
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -70,7 +70,7 @@
  "column.blocks": "Cleachdaichean bacte",
  "column.bookmarks": "Comharran-lìn",
  "column.community": "Loidhne-ama ionadail",
-  "column.conversations": "Còmhraidhean",
+  "column.direct": "Teachdaireachdan dìreach",
  "column.directory": "Rùraich sna pròifilean",
  "column.domain_blocks": "Àrainnean bacte",
  "column.favourites": "Na h-annsachdan",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Feadhainn ionadail a-mhàin",
  "community.column_settings.media_only": "Meadhanan a-mhàin",
  "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
+  "compose_form.direct_message_warning": "Cha dèid am post seo a chur ach dha na cleachdaichean air an dug thu iomradh.",
  "compose_form.direct_message_warning_learn_more": "Barrachd fiosrachaidh",
-  "compose_form.encryption_warning": "Chan eil crioptachadh ceann gu ceann air postaichean Mhastodon. Na co-roinn fiosrachadh cunnartach idir le Mastodon.",
  "compose_form.hashtag_warning": "Cha nochd am post seo fon taga hais on a tha e falaichte o liostaichean. Cha ghabh ach postaichean poblach a lorg a-rèir an tagaichean hais.",
  "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith leantainn ort is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
  "compose_form.lock_disclaimer.lock": "glaiste",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Cha do bhac thu cleachdaiche sam bith fhathast.",
  "empty_column.bookmarked_statuses": "Chan eil comharra-lìn ri post agad fhathast. Nuair a nì thu comharra-lìn de dh’fhear, nochdaidh e an-seo.",
  "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!",
-  "empty_column.conversations": "Nuair a chuireas no gheibh thu post nach fhaic ach an fheadhainn le iomradh orra ann, nochdaidh e an-seo.",
+  "empty_column.direct": "Chan eil teachdaireachd dhìreach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
  "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.",
  "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!",
  "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Brosnaich post",
  "keyboard_shortcuts.column": "Cuir am fòcas air colbh",
  "keyboard_shortcuts.compose": "Cuir am fòcas air raon teacsa an sgrìobhaidh",
-  "keyboard_shortcuts.conversations": "a dh’fhosgladh colbh nan còmhraidhean",
  "keyboard_shortcuts.description": "Tuairisgeul",
+  "keyboard_shortcuts.direct": "Fosgail colbh nan teachdaireachdan dìreach",
  "keyboard_shortcuts.down": "Gluais sìos air an liosta",
  "keyboard_shortcuts.enter": "Fosgail post",
  "keyboard_shortcuts.favourite": "Cuir post ris na h-annsachdan",
@ -290,7 +290,8 @@
  "navigation_bar.bookmarks": "Comharran-lìn",
  "navigation_bar.community_timeline": "Loidhne-ama ionadail",
  "navigation_bar.compose": "Sgrìobh post ùr",
-  "navigation_bar.discover": "Rùraich",
+  "navigation_bar.direct": "Teachdaireachdan dìreach",
+  "navigation_bar.discover": "Fidir",
  "navigation_bar.domain_blocks": "Àrainnean bacte",
  "navigation_bar.edit_profile": "Deasaich a’ phròifil",
  "navigation_bar.explore": "Rùraich",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
  "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
  "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "Daoine air an dug mi iomradh a-mhàin",
+  "privacy.direct.short": "Dìreach",
  "privacy.private.long": "Chan fhaic ach na daoine a tha a’ leantainn ort seo",
  "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine e",
+  "privacy.public.long": "Chì a h-uile duine seo ’s e ’ga shealltainn air loidhnichean-ama poblach",
  "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
+  "privacy.unlisted.long": "Chì a h-uile duine seo ach cha dèid a shealltainn air loidhnichean-ama poblach",
  "privacy.unlisted.short": "Falaichte o liostaichean",
  "refresh": "Ath-nuadhaich",
  "regeneration_indicator.label": "’Ga luchdadh…",
@ -458,7 +459,7 @@
  "status.history.created": "Chruthaich {name} {date} e",
  "status.history.edited": "Dheasaich {name} {date} e",
  "status.load_more": "Luchdaich barrachd dheth",
-  "status.media_hidden": "Meadhan falaichte",
+  "status.media_hidden": "Meadhanan falaichte",
  "status.mention": "Thoir iomradh air @{name}",
  "status.more": "Barrachd",
  "status.mute": "Mùch @{name}",
@ -514,7 +515,7 @@
  "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
  "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
  "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
-  "upload_form.description_missing": "Cha deach tuairisgeul a chur ris",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Deasaich",
  "upload_form.thumbnail": "Atharraich an dealbhag",
  "upload_form.undo": "Sguab às",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -48,8 +48,8 @@
  "account.unmute_notifications": "Deixar de silenciar as notificacións de @{name}",
  "account.unmute_short": "Non silenciar",
  "account_note.placeholder": "Preme para engadir nota",
-  "admin.dashboard.daily_retention": "Ratio de retención de usuarias diaria após rexistrarse",
-  "admin.dashboard.monthly_retention": "Ratio de retención de usuarias mensual após o rexistro",
+  "admin.dashboard.daily_retention": "Ratio de retención de usuarias após rexistrarse",
+  "admin.dashboard.monthly_retention": "Ratio de retención de usuarias após un mes do rexistro",
  "admin.dashboard.retention.average": "Media",
  "admin.dashboard.retention.cohort": "Mes de rexistro",
  "admin.dashboard.retention.cohort_size": "Novas usuarias",
@ -70,7 +70,7 @@
  "column.blocks": "Usuarias bloqueadas",
  "column.bookmarks": "Marcadores",
  "column.community": "Cronoloxía local",
-  "column.conversations": "Conversas",
+  "column.direct": "Mensaxes directas",
  "column.directory": "Procurar perfís",
  "column.domain_blocks": "Dominios agochados",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Só local",
  "community.column_settings.media_only": "Só multimedia",
  "community.column_settings.remote_only": "Só remoto",
+  "compose_form.direct_message_warning": "Esta publicación só será enviada ás usuarias mencionadas.",
  "compose_form.direct_message_warning_learn_more": "Coñecer máis",
-  "compose_form.encryption_warning": "As publicacións en Mastodon non están cifradas de extremo-a-extremo. Non compartas información sensible en Mastodon.",
  "compose_form.hashtag_warning": "Esta publicación non aparecerá baixo ningún cancelo (hashtag) porque non está listada. Só se poden procurar publicacións públicas por cancelos.",
  "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
  "compose_form.lock_disclaimer.lock": "bloqueada",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Aínda non bloqueaches a ningún usuaria.",
  "empty_column.bookmarked_statuses": "Aínda non marcaches ningunha publicación. Cando o fagas, aparecerán aquí.",
  "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
-  "empty_column.conversations": "Aquí verás as publicacións que envíes ou recibas é só son visibles para as persoas mencionadas.",
+  "empty_column.direct": "Aínda non tes mensaxes directas. Cando envíes ou recibas unha, amosarase aquí.",
  "empty_column.domain_blocks": "Aínda non hai dominios agochados.",
  "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!",
  "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Promover publicación",
  "keyboard_shortcuts.column": "Destacar unha columna",
  "keyboard_shortcuts.compose": "Por o cursor na área de escritura",
-  "keyboard_shortcuts.conversations": "para abrir a columna das conversas",
  "keyboard_shortcuts.description": "Descrición",
+  "keyboard_shortcuts.direct": "Para abrir a columna de mensaxes directas",
  "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
  "keyboard_shortcuts.enter": "Para abrir publicación",
  "keyboard_shortcuts.favourite": "Para engadir a favoritos",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcadores",
  "navigation_bar.community_timeline": "Cronoloxía local",
  "navigation_bar.compose": "Escribir unha nova publicación",
+  "navigation_bar.direct": "Mensaxes directas",
  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios agochados",
  "navigation_bar.edit_profile": "Editar perfil",
@ -314,7 +315,7 @@
  "notification.follow_request": "{name} solicitou seguirte",
  "notification.mention": "{name} mencionoute",
  "notification.own_poll": "A túa enquisa rematou",
-  "notification.poll": "Rematou a enquisa na que votaches",
+  "notification.poll": "Unha enquisa na que votaches rematou",
  "notification.reblog": "{name} compartiu a túa publicación",
  "notification.status": "{name} publicou",
  "notification.update": "{name} editou unha publicación",
@ -366,19 +367,19 @@
  "poll_button.remove_poll": "Eliminar enquisa",
  "privacy.change": "Axustar privacidade",
  "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só para persoas mencionadas",
+  "privacy.direct.short": "Directo",
  "privacy.private.long": "Só para os seguidoras",
  "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Visible por todas",
+  "privacy.public.long": "Publicar nas cronoloxías públicas",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
+  "privacy.unlisted.long": "Non publicar nas cronoloxías públicas",
  "privacy.unlisted.short": "Non listado",
  "refresh": "Actualizar",
  "regeneration_indicator.label": "Estase a cargar…",
  "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
  "relative_time.days": "{number}d",
  "relative_time.full.days": "fai {number, plural, one {# día} other {# días}}",
-  "relative_time.full.hours": "fai {number, plural, one {# hora} other {# horas}}",
+  "relative_time.full.hours": "fai {number, plural, one {# hora} other {# horas}} ago",
  "relative_time.full.just_now": "xusto agora",
  "relative_time.full.minutes": "fai {number, plural, one {# minuto} other {# minutos}}",
  "relative_time.full.seconds": "fai {number, plural, one {# segundo} other {# segundos}}",
@ -514,7 +515,7 @@
  "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
  "upload_form.audio_description": "Describir para persoas con problemas auditivos",
  "upload_form.description": "Describir para persoas con problemas visuais",
-  "upload_form.description_missing": "Sen descrición",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar a miniatura",
  "upload_form.undo": "Eliminar",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -70,7 +70,7 @@
  "column.blocks": "חסימות",
  "column.bookmarks": "סימניות",
  "column.community": "ציר זמן מקומי",
-  "column.conversations": "Conversations",
+  "column.direct": "הודעות ישירות",
  "column.directory": "גלוש פרופילים",
  "column.domain_blocks": "Hidden domains",
  "column.favourites": "חיבובים",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "מקומי בלבד",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "מרחוק בלבד",
+  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "מידע נוסף",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
  "compose_form.lock_disclaimer.lock": "נעול",
@ -166,7 +166,7 @@
  "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "עדיין אין לכם הודעות פרטיות. כאשר תשלחו או תקבלו אחת, היא תופיע כאן.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "להדהד",
  "keyboard_shortcuts.column": "להתמקד בהודעה באחד מהטורים",
  "keyboard_shortcuts.compose": "להתמקד בתיבת חיבור ההודעות",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "תיאור",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "לנוע במורד הרשימה",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "לחבב",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "ציר זמן מקומי",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "הודעות ישירות",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "עריכת פרופיל",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "שינוי פרטיות ההודעה",
  "privacy.direct.long": "הצג רק למי שהודעה זו פונה אליו",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "הודעה ישירה",
  "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "לעוקבים בלבד",
+  "privacy.public.long": "פרסם בפומבי",
  "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
  "privacy.unlisted.short": "לא לפיד הכללי",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@ -70,7 +70,7 @@
  "column.blocks": "ब्लॉक्ड यूज़र्स",
  "column.bookmarks": "पुस्तकचिह्न:",
  "column.community": "लोकल टाइम्लाइन",
-  "column.conversations": "Conversations",
+  "column.direct": "सीधा संदेश",
  "column.directory": "प्रोफाइल्स खोजें",
  "column.domain_blocks": "छुपे डोमेन्स",
  "column.favourites": "पसंदीदा",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "स्थानीय ही",
  "community.column_settings.media_only": "सिर्फ़ मीडिया",
  "community.column_settings.remote_only": "केवल सुदूर",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "और जानें",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "यह टूट् किसी भी हैशटैग के तहत सूचीबद्ध नहीं होगा क्योंकि यह अनलिस्टेड है। हैशटैग द्वारा केवल सार्वजनिक टूट्स खोजे जा सकते हैं।",
  "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
  "compose_form.lock_disclaimer.lock": "लॉक्ड",
@ -166,7 +166,7 @@
  "empty_column.blocks": "आप अभी तक किसी भी यूजर के द्वारा ब्लॉक्ड नहीं हो।",
  "empty_column.bookmarked_statuses": "आपके पास अभी तक कोई बुकमार्क नहीं है। जब आप एक बुकमार्क करते हैं, तो यह यहां दिखाई देगा।",
  "empty_column.community": "लोकल टाइम्लाइन खाली है, कुछ देखने के लिये सार्वजनिक रूप से कुछ लिखें!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "आपके पास कोई सीधा सन्देश नहीं है, जब आप कोई भेजेंगे प्राप्त करेंगे तो यहाँ दिखेगा।",
  "empty_column.domain_blocks": "अभी तक कोई छुपा हुआ डोमेन नहीं है।",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "आपके पास अभी कोई भी चहिता टूट नहीं है. जब आप किसी टूट को पसंद (स्टार) करेंगे, तब वो यहाँ दिखेगा।",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "बढ़ावा देने के लिए",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "कंपोज़ टेक्स्ट-एरिया पर ध्यान केंद्रित करने के लिए",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "विवरण",
+  "keyboard_shortcuts.direct": "सीधा सन्देश कॉलम को खोलने के लिए",
  "keyboard_shortcuts.down": "सूची में शामिल करने के लिए",
  "keyboard_shortcuts.enter": "स्टेटस खोलने के लिए",
  "keyboard_shortcuts.favourite": "पसंदीदा के लिए",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "पुस्तकचिह्न:",
  "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
  "navigation_bar.compose": "नया टूट् लिखें",
+  "navigation_bar.direct": "सीधा संदेश",
  "navigation_bar.discover": "खोजें",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "सीधा",
  "privacy.private.long": "Post to followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "सार्वजनिक टाइम्लाइन पर भेजें",
  "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "अनलिस्टेड",
  "refresh": "रीफ्रेश करें",
  "regeneration_indicator.label": "लोड हो रहा है...",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -70,7 +70,7 @@
  "column.blocks": "Blokirani korisnici",
  "column.bookmarks": "Knjižne oznake",
  "column.community": "Lokalna vremenska crta",
-  "column.conversations": "Conversations",
+  "column.direct": "Izravne poruke",
  "column.directory": "Pregledavanje profila",
  "column.domain_blocks": "Blokirane domene",
  "column.favourites": "Favoriti",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Samo lokalno",
  "community.column_settings.media_only": "Samo medijski sadržaj",
  "community.column_settings.remote_only": "Samo udaljeno",
+  "compose_form.direct_message_warning": "Ovaj toot bit će poslan samo spomenutim korisnicima.",
  "compose_form.direct_message_warning_learn_more": "Saznajte više",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Ovaj toot neće biti prikazan ni pod jednim hashtagom jer je postavljen kao neprikazan. Samo javni tootovi mogu biti pretraživani pomoći hashtagova.",
  "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
  "compose_form.lock_disclaimer.lock": "zaključan",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Još niste blokirali nikoga.",
  "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazad će se ovdje.",
  "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Nemate još niti jedne direktne poruke. Kada ih pošaljete ili primite, prikazati će se ovdje.",
  "empty_column.domain_blocks": "Još nema blokiranih domena.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "za boostanje",
  "keyboard_shortcuts.column": "za fokusiranje na toot u jednom od stupaca",
  "keyboard_shortcuts.compose": "za fokusiranje na tekstualni okvir za stvaranje",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "za otvaranje stupca s izravnim porukama",
  "keyboard_shortcuts.down": "za pomak dolje na listi",
  "keyboard_shortcuts.enter": "za otvaranje toota",
  "keyboard_shortcuts.favourite": "za označavanje favoritom",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Lokalna vremenska crta",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Izravne poruke",
  "navigation_bar.discover": "Istraživanje",
  "navigation_bar.domain_blocks": "Blokirane domene",
  "navigation_bar.edit_profile": "Uredi profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Ukloni anketu",
  "privacy.change": "Podesi privatnost toota",
  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Izravno",
  "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Samo pratitelji",
+  "privacy.public.long": "Vidljivo svima, prikazano u javim vremenskim crtama",
  "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Vidljivo svima, ali se ne prikazuje u javnim vremenskim crtama",
  "privacy.unlisted.short": "Neprikazano",
  "refresh": "Osvježi",
  "regeneration_indicator.label": "Učitavanje…",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -70,7 +70,7 @@
  "column.blocks": "Letiltott felhasználók",
  "column.bookmarks": "Könyvjelzők",
  "column.community": "Helyi idővonal",
-  "column.conversations": "Beszélgetések",
+  "column.direct": "Közvetlen üzenetek",
  "column.directory": "Profilok böngészése",
  "column.domain_blocks": "Rejtett domainek",
  "column.favourites": "Kedvencek",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Csak helyi",
  "community.column_settings.media_only": "Csak média",
  "community.column_settings.remote_only": "Csak távoli",
+  "compose_form.direct_message_warning": "Ezt a bejegyzést csak a benne megemlített felhasználók láthatják majd.",
  "compose_form.direct_message_warning_learn_more": "Tudj meg többet",
-  "compose_form.encryption_warning": "A bejegyzések a Mastodonon nem használnak végpontok közötti titkosítást. Ne ossz meg érzékeny információt Mastodonon.",
  "compose_form.hashtag_warning": "Ez a bejegyzésed nem fog megjelenni semmilyen hashtag alatt, mivel listázatlan. Csak a nyilvános bejegyzések kereshetők hashtaggel.",
  "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
  "compose_form.lock_disclaimer.lock": "lezárva",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Még senkit sem tiltottál le.",
  "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
  "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
-  "empty_column.conversations": "Ha olyan bejegyzést küldesz vagy fogadsz, melyet csak az abban megemlítettek látnak, itt fog megjelenni.",
+  "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
  "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
  "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
  "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Bejegyzés megtolása",
  "keyboard_shortcuts.column": "Fókuszálás egy oszlopra",
  "keyboard_shortcuts.compose": "fókuszálás a szerkesztési szövegdobozra",
-  "keyboard_shortcuts.conversations": "beszélgetések megnyitása",
  "keyboard_shortcuts.description": "Leírás",
+  "keyboard_shortcuts.direct": "Közvetlen üzenetek oszlopának megnyitása",
  "keyboard_shortcuts.down": "lefele navigálás a listában",
  "keyboard_shortcuts.enter": "Bejegyzés megnyitása",
  "keyboard_shortcuts.favourite": "Bejegyzés kedvencnek jelölése",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Könyvjelzők",
  "navigation_bar.community_timeline": "Helyi idővonal",
  "navigation_bar.compose": "Új bejegyzés írása",
+  "navigation_bar.direct": "Közvetlen üzenetek",
  "navigation_bar.discover": "Felfedezés",
  "navigation_bar.domain_blocks": "Rejtett domainek",
  "navigation_bar.edit_profile": "Profil szerkesztése",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Szavazás törlése",
  "privacy.change": "Bejegyzés láthatóságának módosítása",
  "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Csak a megemlítettek",
+  "privacy.direct.short": "Közvetlen",
  "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követők",
-  "privacy.public.long": "Mindenki számára látható",
+  "privacy.private.short": "Csak követőknek",
+  "privacy.public.long": "Mindenki számára látható, nyilvános idővonalakon is szerepel",
  "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
+  "privacy.unlisted.long": "Ne mutassuk nyilvános idővonalon",
  "privacy.unlisted.short": "Listázatlan",
  "refresh": "Frissítés",
  "regeneration_indicator.label": "Töltődik…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
  "upload_form.audio_description": "Írja le a hallássérültek számára",
  "upload_form.description": "Leírás látáskorlátozottak számára",
-  "upload_form.description_missing": "Nincs leírás megadva",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Szerkesztés",
  "upload_form.thumbnail": "Előnézet megváltoztatása",
  "upload_form.undo": "Törlés",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -18,8 +18,8 @@
  "account.followers": "Հետեւողներ",
  "account.followers.empty": "Այս օգտատիրոջը դեռ ոչ մէկ չի հետեւում։",
  "account.followers_counter": "{count, plural, one {{counter} Հետեւորդ} other {{counter} Հետեւորդ}}",
-  "account.following": "Հետեւած",
-  "account.following_counter": "{count, plural, one {{counter} Հետեւած} other {{counter} Հետեւած}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} հետեւած} other {{counter} հետեւած}}",
  "account.follows.empty": "Այս օգտատէրը դեռ ոչ մէկի չի հետեւում։",
  "account.follows_you": "Հետեւում է քեզ",
  "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
@ -41,12 +41,12 @@
  "account.statuses_counter": "{count, plural, one {{counter} Գրառում} other {{counter} Գրառումներ}}",
  "account.unblock": "Ապաարգելափակել @{name}֊ին",
  "account.unblock_domain": "Ցուցադրել {domain} թաքցուած տիրոյթի գրառումները",
-  "account.unblock_short": "Արգելաբացել",
+  "account.unblock_short": "Unblock",
  "account.unendorse": "Չցուցադրել անձնական էջում",
  "account.unfollow": "Ապահետեւել",
  "account.unmute": "Ապալռեցնել @{name}֊ին",
  "account.unmute_notifications": "Միացնել ծանուցումները @{name}֊ից",
-  "account.unmute_short": "Ապախլացնել",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Սեղմէ՛ք գրառելու համար\n",
  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@ -70,7 +70,7 @@
  "column.blocks": "Արգելափակուած օգտատէրեր",
  "column.bookmarks": "Էջանիշեր",
  "column.community": "Տեղական հոսք",
-  "column.conversations": "Զրոյցներ",
+  "column.direct": "Հասցէագրուած հաղորդագրութիւններ",
  "column.directory": "Զննել անձնական էջերը",
  "column.domain_blocks": "Թաքցուած տիրոյթները",
  "column.favourites": "Հաւանածներ",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Միայն տեղական",
  "community.column_settings.media_only": "Միայն մեդիա",
  "community.column_settings.remote_only": "Միայն հեռակայ",
+  "compose_form.direct_message_warning": "Այս գրառումը տեսանելի կը լինի միայն նշուած օգտատէրերին։",
  "compose_form.direct_message_warning_learn_more": "Իմանալ աւելին",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Այս գրառումը չի հաշուառուի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարաւոր է որոնել պիտակներով։",
  "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
  "compose_form.lock_disclaimer.lock": "փակ",
@ -106,7 +106,7 @@
  "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
  "compose_form.publish": "Հրապարակել",
  "compose_form.publish_loud": "Հրապարակե՜լ",
-  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
+  "compose_form.save_changes": "Save changes",
  "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
  "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
  "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
  "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշուած գրառում։ Երբ էջանշես, դրանք կը երեւան այստեղ։",
  "empty_column.community": "Տեղական հոսքը դատարկ է։ Հրապարակային մի բան գրի՛ր շարժիչը գործարկելու համար։",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն այստեղ կերեւայ։",
  "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած գրառում։ Երբ հաւանես, դրանք կերեւան այստեղ։",
@ -187,12 +187,12 @@
  "error.unexpected_crash.next_steps_addons": "Փորձիր անջատել յաւելուածները եւ թարմացնել էջը։ Եթե դա չօգնի, կարող ես օգտուել Մաստադոնից այլ դիտարկիչով կամ յաւելուածով։",
  "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին",
  "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին",
-  "explore.search_results": "Որոնման արդիւնքներ",
-  "explore.suggested_follows": "Ձեզ համար",
-  "explore.title": "Բացայայտել",
-  "explore.trending_links": "Նորութիւններ",
-  "explore.trending_statuses": "Գրառումներ",
-  "explore.trending_tags": "Պիտակներ",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Աւարտուած է",
  "follow_recommendations.heading": "Հետեւիր այն մարդկանց, որոնց գրառումները կը ցանկանաս տեսնել։ Ահա մի քանի առաջարկ։",
  "follow_recommendations.lead": "Քո հոսքում, ժամանակագրական դասաւորութեամբ կը տեսնես այն մարդկանց գրառումները, որոնց հետեւում ես։ Մի վախեցիր սխալուել, դու միշտ կարող ես հեշտութեամբ ապահետեւել մարդկանց։",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "տարածելու համար",
  "keyboard_shortcuts.column": "սիւներից մէկի վրայ սեւեռուելու համար",
  "keyboard_shortcuts.compose": "շարադրման տիրոյթին սեւեռուելու համար",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Նկարագրութիւն",
+  "keyboard_shortcuts.direct": "հասցէագրուած գրուածքների հոսքը բացելու համար",
  "keyboard_shortcuts.down": "ցանկով ներքեւ շարժուելու համար",
  "keyboard_shortcuts.enter": "Գրառումը բացելու համար",
  "keyboard_shortcuts.favourite": "հաւանելու համար",
@ -290,10 +290,11 @@
  "navigation_bar.bookmarks": "Էջանիշեր",
  "navigation_bar.community_timeline": "Տեղական հոսք",
  "navigation_bar.compose": "Ստեղծել նոր գրառում",
+  "navigation_bar.direct": "Հասցէագրուած",
  "navigation_bar.discover": "Բացայայտել",
  "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
  "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
-  "navigation_bar.explore": "Բացայայտել",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Հաւանածներ",
  "navigation_bar.filters": "Լռեցուած բառեր",
  "navigation_bar.follow_requests": "Հետեւելու հայցեր",
@ -308,7 +309,7 @@
  "navigation_bar.preferences": "Նախապատուութիւններ",
  "navigation_bar.public_timeline": "Դաշնային հոսք",
  "navigation_bar.security": "Անվտանգութիւն",
-  "notification.admin.sign_up": "{name}-ը գրանցուած է",
+  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "{name} հաւանեց գրառումդ",
  "notification.follow": "{name} սկսեց հետեւել քեզ",
  "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
@ -317,10 +318,10 @@
  "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
  "notification.reblog": "{name} տարածեց գրառումդ",
  "notification.status": "{name} հենց նոր գրառում արեց",
-  "notification.update": "{name}-ը փոխել է գրառումը",
+  "notification.update": "{name} edited a post",
  "notifications.clear": "Մաքրել ծանուցումները",
  "notifications.clear_confirmation": "Վստա՞հ ես, որ ուզում ես մշտապէս մաքրել քո բոլոր ծանուցումները։",
-  "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
  "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
  "notifications.column_settings.favourite": "Հաւանածներից՝",
  "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
@ -337,7 +338,7 @@
  "notifications.column_settings.status": "Նոր գրառումներ։",
  "notifications.column_settings.unread_notifications.category": "Չկարդացուած ծանուցումներ",
  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Խմբագրածներ՝",
+  "notifications.column_settings.update": "Edits:",
  "notifications.filter.all": "Բոլորը",
  "notifications.filter.boosts": "Տարածածները",
  "notifications.filter.favourites": "Հաւանածները",
@ -361,55 +362,55 @@
  "poll.total_votes": "{count, plural, one {# ձայն} other {# ձայն}}",
  "poll.vote": "Քուէարկել",
  "poll.voted": "Դու քուէարկել ես այս տարբերակի համար",
-  "poll.votes": "{votes, plural, one {# ձայն} other {# ձայն}}",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
  "poll_button.add_poll": "Աւելացնել հարցում",
  "poll_button.remove_poll": "Հեռացնել հարցումը",
  "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
  "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Միայն նշածս մարդիկ",
+  "privacy.direct.short": "Հասցէագրուած",
  "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողները",
-  "privacy.public.long": "Տեսանելի բոլորին",
+  "privacy.private.short": "Միայն հետեւողներին",
+  "privacy.public.long": "Կը տեսնեն բոլոր,  հրապարակային հոսքում",
  "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Կը տեսնեն բոլոր,  բայց ոչ հրապարակային հոսքում",
  "privacy.unlisted.short": "Ծածուկ",
  "refresh": "Թարմացնել",
  "regeneration_indicator.label": "Բեռնւում է…",
  "regeneration_indicator.sublabel": "պատրաստւում է հիմնական հոսքդ",
  "relative_time.days": "{number}օր",
-  "relative_time.full.days": "{number, plural, one {# օր} other {# օր}} առաջ",
-  "relative_time.full.hours": "{number, plural, one {# ժամ} other {# ժամ}} առաջ",
-  "relative_time.full.just_now": "հէնց նոր",
-  "relative_time.full.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}} առաջ",
-  "relative_time.full.seconds": "{number, plural, one {# վայրկեան} other {# վայրկեան}} առաջ",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
  "relative_time.hours": "{number}ժ",
  "relative_time.just_now": "նոր",
  "relative_time.minutes": "{number}ր",
  "relative_time.seconds": "{number}վ",
  "relative_time.today": "Այսօր",
  "reply_indicator.cancel": "Չեղարկել",
-  "report.block": "Արգելափակել",
+  "report.block": "Block",
  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
-  "report.categories.other": "Այլ",
-  "report.categories.spam": "Սպամ",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
  "report.categories.violation": "Content violates one or more server rules",
  "report.category.subtitle": "Choose the best match",
  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "հաշիւ",
-  "report.category.title_status": "գրառում",
-  "report.close": "Աւարտել",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Փոխանցել {target}֊ին",
  "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
-  "report.mute": "Լռեցնել",
+  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Յաջորդ",
+  "report.next": "Next",
  "report.placeholder": "Լրացուցիչ մեկնաբանութիւններ",
-  "report.reasons.dislike": "Ինձ դուր չի գալիս",
+  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "Այլ բան է",
+  "report.reasons.other": "It's something else",
  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "Սպամ է",
+  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
@ -499,7 +500,7 @@
  "time_remaining.moments": "Մնացել է մի քանի վարկեան",
  "time_remaining.seconds": "{number, plural, one {# վարկեան} other {# վարկեան}} անց",
  "timeline_hint.remote_resource_not_displayed": "{resource} այլ սպասարկիչներից չեն ցուցադրվել:",
-  "timeline_hint.resources.followers": "Հետեւորդ",
+  "timeline_hint.resources.followers": "Հետևորդներ",
  "timeline_hint.resources.follows": "Հետեւել",
  "timeline_hint.resources.statuses": "Հին գրառումներ",
  "trends.counter_by_accounts": "{count, plural, one {{counter} մարդ} other {{counter} մարդիկ}} խօսում են",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -70,7 +70,7 @@
  "column.blocks": "Pengguna yang diblokir",
  "column.bookmarks": "Markah",
  "column.community": "Linimasa Lokal",
-  "column.conversations": "Percakapan",
+  "column.direct": "Pesan langsung",
  "column.directory": "Jelajahi profil",
  "column.domain_blocks": "Topik tersembunyi",
  "column.favourites": "Favorit",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Hanya lokal",
  "community.column_settings.media_only": "Hanya media",
  "community.column_settings.remote_only": "Hanya jarak jauh",
+  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Pelajari selengkapnya",
-  "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi end-to-end. Jangan bagikan informasi rahasial melalui Mastodon.",
  "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah diatur sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
  "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
  "compose_form.lock_disclaimer.lock": "terkunci",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Anda belum memblokir siapapun.",
  "empty_column.bookmarked_statuses": "Anda belum memiliki toot termarkah. Saat Anda menandainya sebagai markah, ia akan muncul di sini.",
  "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
-  "empty_column.conversations": "Saat Anda mengirim atau menerima kiriman yang hanya terlihat oleh orang yang disebutkan, itu akan muncul di sini.",
+  "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
  "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
  "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Silakan mengecek lagi nanti!",
  "empty_column.favourited_statuses": "Anda belum memiliki toot favorit. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "untuk menyebarkan",
  "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
  "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
-  "keyboard_shortcuts.conversations": "untuk membuka kolom percakapan",
  "keyboard_shortcuts.description": "Deskripsi",
+  "keyboard_shortcuts.direct": "buka kolom pesan langsung",
  "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
  "keyboard_shortcuts.enter": "untuk membuka status",
  "keyboard_shortcuts.favourite": "untuk memfavoritkan",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Markah",
  "navigation_bar.community_timeline": "Linimasa lokal",
  "navigation_bar.compose": "Tulis toot baru",
+  "navigation_bar.direct": "Pesan langsung",
  "navigation_bar.discover": "Temukan",
  "navigation_bar.domain_blocks": "Domain tersembunyi",
  "navigation_bar.edit_profile": "Ubah profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Hapus japat",
  "privacy.change": "Tentukan privasi status",
  "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Hanya orang yang saya sebut",
+  "privacy.direct.short": "Langsung",
  "privacy.private.long": "Kirim postingan hanya kepada pengikut",
-  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Terlihat oleh semua",
+  "privacy.private.short": "Pribadi",
+  "privacy.public.long": "Kirim ke linimasa publik",
  "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
+  "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
  "privacy.unlisted.short": "Tak Terdaftar",
  "refresh": "Segarkan",
  "regeneration_indicator.label": "Memuat…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
  "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
  "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
-  "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Sunting",
  "upload_form.thumbnail": "Ubah gambar kecil",
  "upload_form.undo": "Undo",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -1,76 +1,76 @@
 {
-  "account.account_note_header": "Noto",
-  "account.add_or_remove_from_list": "Insertez o removez de listi",
-  "account.badges.bot": "Boto",
-  "account.badges.group": "Grupo",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
  "account.block": "Blokusar @{name}",
  "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Restriktita",
-  "account.browse_more_on_origin_server": "Videz plu che originala profilo",
-  "account.cancel_follow_request": "Removez sequodemando",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Cancel follow request",
  "account.direct": "Direct Message @{name}",
-  "account.disable_notifications": "Cesez avizar me kande @{name} postas",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
  "account.domain_blocked": "Domain hidden",
  "account.edit_profile": "Modifikar profilo",
-  "account.enable_notifications": "Avizez me kande @{name} postas",
-  "account.endorse": "Traito di profilo",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
  "account.follow": "Sequar",
  "account.followers": "Sequanti",
-  "account.followers.empty": "Nulu sequas ca uzanto til nun.",
-  "account.followers_counter": "{count, plural, one {{counter} Sequanto} other {{counter} Sequanti}}",
-  "account.following": "Sequata",
-  "account.following_counter": "{count, plural, one {{counter} Sequas} other {{counter} Sequanti}}",
-  "account.follows.empty": "Ca uzanto ne sequa irgu til nun.",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
  "account.follows_you": "Sequas tu",
-  "account.hide_reblogs": "Celez busti de @{name}",
-  "account.joined": "Juntas ye {date}",
-  "account.link_verified_on": "Proprieteso di ca ligilo kontrolesis ye {date}",
-  "account.locked_info": "La privatesostaco di ca konto fixesas quale lokata. Proprietato manue kontrolas personi qui povas sequar.",
-  "account.media": "Medio",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined": "Joined {date}",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
  "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} movesis a:",
+  "account.moved_to": "{name} has moved to:",
  "account.mute": "Celar @{name}",
-  "account.mute_notifications": "Silencigez avizi de @{name}",
-  "account.muted": "Silencigata",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
  "account.posts": "Mesaji",
  "account.posts_with_replies": "Toots with replies",
  "account.report": "Denuncar @{name}",
  "account.requested": "Vartante aprobo",
-  "account.share": "Partigez profilo di @{name}",
-  "account.show_reblogs": "Montrez busti de @{name}",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
  "account.unblock": "Desblokusar @{name}",
  "account.unblock_domain": "Unhide {domain}",
-  "account.unblock_short": "Derestriktez",
-  "account.unendorse": "Ne publikigez che profilo",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
  "account.unfollow": "Ne plus sequar",
  "account.unmute": "Ne plus celar @{name}",
-  "account.unmute_notifications": "Desilencigez avizi de @{name}",
-  "account.unmute_short": "Desilencigez",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Click to add a note",
  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Averajo",
-  "admin.dashboard.retention.cohort": "Registromonato",
-  "admin.dashboard.retention.cohort_size": "Nova uzanti",
-  "alert.rate_limited.message": "Riprobez pos {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Limitizita multeso",
-  "alert.unexpected.message": "Neexpektita eroro eventis.",
-  "alert.unexpected.title": "Problemo!",
-  "announcement.announcement": "Anunco",
-  "attachments_list.unprocessed": "(neprocedita)",
-  "autosuggest_hashtag.per_week": "{count} dum singla semano",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "autosuggest_hashtag.per_week": "{count} per week",
  "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo",
-  "bundle_column_error.body": "Nulo ne functionis dum chargar ca kompozaj.",
-  "bundle_column_error.retry": "Probez itere",
-  "bundle_column_error.title": "Rederor",
-  "bundle_modal_error.close": "Klozez",
-  "bundle_modal_error.message": "Nulo ne functionis dum chargar ca kompozaj.",
-  "bundle_modal_error.retry": "Probez itere",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
  "column.blocks": "Blokusita uzeri",
  "column.bookmarks": "Bookmarks",
  "column.community": "Lokala tempolineo",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Hidden domains",
  "column.favourites": "Favorati",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Lokala tempolineo",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Modifikar profilo",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Aranjar privateso di mesaji",
  "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direte",
  "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Private",
+  "privacy.public.long": "Sendar a publika tempolinei",
  "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ne montrar en publika tempolinei",
  "privacy.unlisted.short": "Ne enlistigota",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -1,7 +1,7 @@
 {
  "account.account_note_header": "Minnispunktur",
  "account.add_or_remove_from_list": "Bæta við eða fjarlægja af listum",
-  "account.badges.bot": "Vélmenni",
+  "account.badges.bot": "Róbót",
  "account.badges.group": "Hópur",
  "account.block": "Loka á @{name}",
  "account.block_domain": "Útiloka lénið {domain}",
@ -31,7 +31,7 @@
  "account.moved_to": "{name} hefur verið færður til:",
  "account.mute": "Þagga niður í @{name}",
  "account.mute_notifications": "Þagga tilkynningar frá @{name}",
-  "account.muted": "Þaggaður",
+  "account.muted": "Þaggað",
  "account.posts": "Færslur",
  "account.posts_with_replies": "Færslur og svör",
  "account.report": "Kæra @{name}",
@ -70,8 +70,8 @@
  "column.blocks": "Útilokaðir notendur",
  "column.bookmarks": "Bókamerki",
  "column.community": "Staðvær tímalína",
-  "column.conversations": "Samtöl",
-  "column.directory": "Vafra notandasnið",
+  "column.direct": "Bein skilaboð",
+  "column.directory": "Skoða notandasnið",
  "column.domain_blocks": "Útilokuð lén",
  "column.favourites": "Eftirlæti",
  "column.follow_requests": "Beiðnir um að fylgjast með",
@ -92,11 +92,11 @@
  "community.column_settings.local_only": "Einungis staðvært",
  "community.column_settings.media_only": "Einungis myndskrár",
  "community.column_settings.remote_only": "Einungis fjartengt",
+  "compose_form.direct_message_warning": "Þessi færsla verður aðeins send á notendur sem minnst er á.",
  "compose_form.direct_message_warning_learn_more": "Kanna nánar",
-  "compose_form.encryption_warning": "Færslur á Mastodon eru ekki enda-í-enda dulritaðar. Ekki deila viðkvæmum upplýsingum á Mastodon.",
  "compose_form.hashtag_warning": "Þessi færsla verður ekki talin með undir nokkru myllumerki þar sem það er óskráð. Einungis er hægt að leita að opinberum færslum eftir myllumerkjum.",
-  "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þér til að sjá þær færslur sem einungis eru til fylgjenda þinna.",
-  "compose_form.lock_disclaimer.lock": "læstur",
+  "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þeim færslum þínum sem einungis eru til fylgjenda þinna.",
+  "compose_form.lock_disclaimer.lock": "læst",
  "compose_form.placeholder": "Hvað varstu að hugsa?",
  "compose_form.poll.add_option": "Bæta við valkosti",
  "compose_form.poll.duration": "Tímalengd könnunar",
@ -130,7 +130,7 @@
  "confirmations.mute.confirm": "Þagga",
  "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
  "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
-  "confirmations.redraft.confirm": "Eyða og endurvinna drög",
+  "confirmations.redraft.confirm": "Eyða og enduvinna drög",
  "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
  "confirmations.reply.confirm": "Svara",
  "confirmations.reply.message": "Ef þú svarar núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
@ -147,7 +147,7 @@
  "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
  "embed.preview": "Svona mun þetta líta út:",
  "emoji_button.activity": "Virkni",
-  "emoji_button.custom": "Sérsniðin",
+  "emoji_button.custom": "Sérsniðið",
  "emoji_button.flags": "Flögg",
  "emoji_button.food": "Matur og drykkur",
  "emoji_button.label": "Setja inn tjáningartákn",
@ -155,7 +155,7 @@
  "emoji_button.not_found": "Engin samsvarandi tjáningartákn fundust",
  "emoji_button.objects": "Hlutir",
  "emoji_button.people": "Fólk",
-  "emoji_button.recent": "Oft notuð",
+  "emoji_button.recent": "Oft notað",
  "emoji_button.search": "Leita...",
  "emoji_button.search_results": "Leitarniðurstöður",
  "emoji_button.symbols": "Tákn",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Þú hefur ekki ennþá útilokað neina notendur.",
  "empty_column.bookmarked_statuses": "Þú ert ekki ennþá með neinar bókamerktar færslur. Þegar þú bókamerkir færslu, mun það birtast hér.",
  "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!",
-  "empty_column.conversations": "Þegar þú hefur sent eða móttekið færslu sem er aðeins sýnileg fólki sem nefnt er í henni þá birtist hún hér.",
+  "empty_column.direct": "Þú átt ennþá engin bein skilaboð. Þegar þú sendir eða tekur á móti slíkum skilaboðum, munu þau birtast hér.",
  "empty_column.domain_blocks": "Það eru ennþá engin útilokuð lén.",
  "empty_column.explore_statuses": "Ekkert er á uppleið í augnablikinu. Athugaðu aftur síðar!",
  "empty_column.favourited_statuses": "Þú ert ekki ennþá með neinar eftirlætisfærslur. Þegar þú setur færslu í eftirlæti, munu þau birtast hér.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Endurbirta færslu",
  "keyboard_shortcuts.column": "Setja virkni í dálk",
  "keyboard_shortcuts.compose": "Setja virkni á textainnsetningarreit",
-  "keyboard_shortcuts.conversations": "að opna samtalsdálka",
  "keyboard_shortcuts.description": "Lýsing",
+  "keyboard_shortcuts.direct": "Opna dálk með beinum skilaboðum",
  "keyboard_shortcuts.down": "Fara neðar í listanum",
  "keyboard_shortcuts.enter": "Opna færslu",
  "keyboard_shortcuts.favourite": "Eftirlætisfærsla",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bókamerki",
  "navigation_bar.community_timeline": "Staðvær tímalína",
  "navigation_bar.compose": "Semja nýja færslu",
+  "navigation_bar.direct": "Bein skilaboð",
  "navigation_bar.discover": "Uppgötva",
  "navigation_bar.domain_blocks": "Útilokuð lén",
  "navigation_bar.edit_profile": "Breyta notandasniði",
@ -314,7 +315,7 @@
  "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
  "notification.mention": "{name} minntist á þig",
  "notification.own_poll": "Könnuninni þinni er lokið",
-  "notification.poll": "Könnun sem þú tókst þátt í er lokin",
+  "notification.poll": "Könnun sem þú tókst þátt í er lokið",
  "notification.reblog": "{name} endurbirti færsluna þína",
  "notification.status": "{name} sendi inn rétt í þessu",
  "notification.update": "{name} breytti færslu",
@ -355,7 +356,7 @@
  "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
  "notifications_permission_banner.title": "Aldrei missa af neinu",
  "picture_in_picture.restore": "Setja til baka",
-  "poll.closed": "Lokuð",
+  "poll.closed": "Lokað",
  "poll.refresh": "Endurlesa",
  "poll.total_people": "{count, plural, one {# aðili} other {# aðilar}}",
  "poll.total_votes": "{count, plural, one {# atkvæði} other {# atkvæði}}",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Fjarlægja könnun",
  "privacy.change": "Aðlaga gagnaleynd færslu",
  "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Aðeins fólk sem ég minnist á",
+  "privacy.direct.short": "Beint",
  "privacy.private.long": "Senda einungis á fylgjendur",
  "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Sýnilegt fyrir alla",
+  "privacy.public.long": "Senda á opinberar tímalínur",
  "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
+  "privacy.unlisted.long": "Ekki senda á opinberar tímalínur",
  "privacy.unlisted.short": "Óskráð",
  "refresh": "Endurlesa",
  "regeneration_indicator.label": "Hleð inn…",
@ -471,7 +472,7 @@
  "status.reblog_private": "Endurbirta til upphaflegra lesenda",
  "status.reblogged_by": "{name} endurbirti",
  "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
-  "status.redraft": "Eyða og endurvinna drög",
+  "status.redraft": "Eyða og enduvinna drög",
  "status.remove_bookmark": "Fjarlægja bókamerki",
  "status.reply": "Svara",
  "status.replyAll": "Svara þræði",
@ -514,7 +515,7 @@
  "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
  "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
  "upload_form.description": "Lýstu þessu fyrir sjónskerta",
-  "upload_form.description_missing": "Engri lýsingu bætt við",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Breyta",
  "upload_form.thumbnail": "Skipta um smámynd",
  "upload_form.undo": "Eyða",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -70,7 +70,7 @@
  "column.blocks": "Utenti bloccati",
  "column.bookmarks": "Segnalibri",
  "column.community": "Timeline locale",
-  "column.conversations": "Conversazioni",
+  "column.direct": "Messaggi diretti",
  "column.directory": "Sfoglia profili",
  "column.domain_blocks": "Domini bloccati",
  "column.favourites": "Preferiti",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Solo Locale",
  "community.column_settings.media_only": "Solo Media",
  "community.column_settings.remote_only": "Solo Remoto",
+  "compose_form.direct_message_warning": "Questo post sarà inviato solo agli utenti menzionati.",
  "compose_form.direct_message_warning_learn_more": "Scopri di più",
-  "compose_form.encryption_warning": "I messaggi su Mastodon non sono crittografati end-to-end. Non condividere alcuna informazione sensibile su Mastodon.",
  "compose_form.hashtag_warning": "Questo post non sarà elencato sotto alcun hashtag poiché senza elenco. Solo i toot pubblici possono essere ricercati per hashtag.",
  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti e vedere le tue pubblicazioni visibili solo dai follower.",
  "compose_form.lock_disclaimer.lock": "bloccato",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
  "empty_column.bookmarked_statuses": "Non hai ancora segnato alcun post. Quando ne segni uno, sarà mostrato qui.",
  "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
-  "empty_column.conversations": "Quando invii o ricevi un post visibile solo alle persone citate in esso, apparirà qui.",
+  "empty_column.direct": "Non hai ancora nessun messaggio privato. Quando ne manderai o riceverai qualcuno, apparirà qui.",
  "empty_column.domain_blocks": "Non vi sono domini nascosti.",
  "empty_column.explore_statuses": "Nulla è in tendenza in questo momento. Riprova più tardi!",
  "empty_column.favourited_statuses": "Non hai ancora segnato nessun post come apprezzato. Quando lo farai, comparirà qui.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Condividi il post",
  "keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne",
  "keyboard_shortcuts.compose": "per portare il focus nell'area di composizione",
-  "keyboard_shortcuts.conversations": "per aprire la colonna conversazioni",
  "keyboard_shortcuts.description": "Descrizione",
+  "keyboard_shortcuts.direct": "per aprire la colonna dei messaggi diretti",
  "keyboard_shortcuts.down": "Spostati in basso nella lista",
  "keyboard_shortcuts.enter": "Apri il post",
  "keyboard_shortcuts.favourite": "Apprezza post",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Segnalibri",
  "navigation_bar.community_timeline": "Timeline locale",
  "navigation_bar.compose": "Componi nuovo toot",
+  "navigation_bar.direct": "Messaggi diretti",
  "navigation_bar.discover": "Scopri",
  "navigation_bar.domain_blocks": "Domini nascosti",
  "navigation_bar.edit_profile": "Modifica profilo",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Rimuovi sondaggio",
  "privacy.change": "Modifica privacy del post",
  "privacy.direct.long": "Invia solo a utenti menzionati",
-  "privacy.direct.short": "Solo le persone che menziono",
+  "privacy.direct.short": "Diretto in privato",
  "privacy.private.long": "Invia solo ai follower",
-  "privacy.private.short": "Solo i seguaci",
-  "privacy.public.long": "Visibile a tutti",
+  "privacy.private.short": "Privato",
+  "privacy.public.long": "Invia alla timeline pubblica",
  "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
+  "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
  "privacy.unlisted.short": "Non elencato",
  "refresh": "Aggiorna",
  "regeneration_indicator.label": "Caricamento in corso…",
@ -459,7 +460,7 @@
  "status.history.edited": "{name} ha modificato {date}",
  "status.load_more": "Mostra di più",
  "status.media_hidden": "Allegato nascosto",
-  "status.mention": "Menziona @{name}",
+  "status.mention": "Nomina @{name}",
  "status.more": "Altro",
  "status.mute": "Silenzia @{name}",
  "status.mute_conversation": "Silenzia conversazione",
@ -514,7 +515,7 @@
  "upload_error.poll": "Caricamento file non consentito nei sondaggi.",
  "upload_form.audio_description": "Descrizione per persone con difetti uditivi",
  "upload_form.description": "Descrizione per utenti con disabilità visive",
-  "upload_form.description_missing": "Nessuna descrizione inserita",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Modifica",
  "upload_form.thumbnail": "Cambia miniatura",
  "upload_form.undo": "Cancella",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -9,10 +9,10 @@
  "account.browse_more_on_origin_server": "リモートで表示",
  "account.cancel_follow_request": "フォローリクエストを取り消す",
  "account.direct": "@{name}さんにダイレクトメッセージ",
-  "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
+  "account.disable_notifications": "@{name} の投稿時の通知を停止",
  "account.domain_blocked": "ドメインブロック中",
  "account.edit_profile": "プロフィール編集",
-  "account.enable_notifications": "@{name}さんの投稿時に通知",
+  "account.enable_notifications": "@{name} の投稿時に通知",
  "account.endorse": "プロフィールで紹介する",
  "account.follow": "フォロー",
  "account.followers": "フォロワー",
@ -27,7 +27,7 @@
  "account.link_verified_on": "このリンクの所有権は{date}に確認されました",
  "account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。",
  "account.media": "メディア",
-  "account.mention": "@{name}さんにメンション",
+  "account.mention": "@{name}さんに投稿",
  "account.moved_to": "{name}さんは引っ越しました:",
  "account.mute": "@{name}さんをミュート",
  "account.mute_notifications": "@{name}さんからの通知を受け取らない",
@ -70,7 +70,7 @@
  "column.blocks": "ブロックしたユーザー",
  "column.bookmarks": "ブックマーク",
  "column.community": "ローカルタイムライン",
-  "column.conversations": "会話",
+  "column.direct": "ダイレクトメッセージ",
  "column.directory": "ディレクトリ",
  "column.domain_blocks": "ブロックしたドメイン",
  "column.favourites": "お気に入り",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "ローカルのみ表示",
  "community.column_settings.media_only": "メディアのみ表示",
  "community.column_settings.remote_only": "リモートのみ表示",
+  "compose_form.direct_message_warning": "この投稿はメンションされた人にのみ送信されます。",
  "compose_form.direct_message_warning_learn_more": "もっと詳しく",
-  "compose_form.encryption_warning": "Mastodonの投稿はエンドツーエンド暗号化に対応していません。安全に送受信されるべき情報をMastodonで共有しないでください。",
  "compose_form.hashtag_warning": "この投稿は公開設定ではないのでハッシュタグの一覧に表示されません。公開投稿だけがハッシュタグで検索できます。",
  "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
  "compose_form.lock_disclaimer.lock": "承認制",
@ -166,7 +166,7 @@
  "empty_column.blocks": "まだ誰もブロックしていません。",
  "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
  "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
-  "empty_column.conversations": "メンションした相手にだけ表示されるメッセージを一度でも送受信した場合、ここに表示されます。",
+  "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
  "empty_column.domain_blocks": "ブロックしているドメインはありません。",
  "empty_column.explore_statuses": "まだ何もありません。後で確認してください。",
  "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
@ -198,18 +198,18 @@
  "follow_recommendations.lead": "あなたがフォローしている人の投稿は、ホームフィードに時系列で表示されます。いつでも簡単に解除できるので、気軽にフォローしてみてください！",
  "follow_request.authorize": "許可",
  "follow_request.reject": "拒否",
-  "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain} のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
  "generic.saved": "保存しました",
  "getting_started.developers": "開発",
  "getting_started.directory": "ディレクトリ",
  "getting_started.documentation": "ドキュメント",
  "getting_started.heading": "スタート",
  "getting_started.invite": "招待",
-  "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub ({github}) から開発に参加したり、問題を報告したりできます。",
+  "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub ( {github} ) から開発に参加したり、問題を報告したりできます。",
  "getting_started.security": "アカウント設定",
  "getting_started.terms": "プライバシーポリシー",
-  "hashtag.column_header.tag_mode.all": "と{additional}",
-  "hashtag.column_header.tag_mode.any": "か{additional}",
+  "hashtag.column_header.tag_mode.all": "と {additional}",
+  "hashtag.column_header.tag_mode.any": "か {additional}",
  "hashtag.column_header.tag_mode.none": "({additional} を除く)",
  "hashtag.column_settings.select.no_options_message": "提案はありません",
  "hashtag.column_settings.select.placeholder": "ハッシュタグを入力してください…",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "ブースト",
  "keyboard_shortcuts.column": "左からn番目のカラムの最新に移動",
  "keyboard_shortcuts.compose": "投稿の入力欄に移動",
-  "keyboard_shortcuts.conversations": "会話カラムを開く",
  "keyboard_shortcuts.description": "説明",
+  "keyboard_shortcuts.direct": "ダイレクトメッセージのカラムを開く",
  "keyboard_shortcuts.down": "カラム内一つ下に移動",
  "keyboard_shortcuts.enter": "投稿の詳細を表示",
  "keyboard_shortcuts.favourite": "お気に入り",
@ -277,7 +277,7 @@
  "lists.replies_policy.title": "リプライを表示:",
  "lists.search": "フォローしている人の中から検索",
  "lists.subheading": "あなたのリスト",
-  "load_pending": "{count}件の新着",
+  "load_pending": "{count} 件の新着",
  "loading_indicator.label": "読み込み中...",
  "media_gallery.toggle_visible": "メディアを隠す",
  "missing_indicator.label": "見つかりません",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "ブックマーク",
  "navigation_bar.community_timeline": "ローカルタイムライン",
  "navigation_bar.compose": "投稿の新規作成",
+  "navigation_bar.direct": "ダイレクトメッセージ",
  "navigation_bar.discover": "見つける",
  "navigation_bar.domain_blocks": "ブロックしたドメイン",
  "navigation_bar.edit_profile": "プロフィールを編集",
@ -299,7 +300,7 @@
  "navigation_bar.follow_requests": "フォローリクエスト",
  "navigation_bar.follows_and_followers": "フォロー・フォロワー",
  "navigation_bar.info": "このサーバーについて",
-  "navigation_bar.keyboard_shortcuts": "キーボードショートカット",
+  "navigation_bar.keyboard_shortcuts": "ホットキー",
  "navigation_bar.lists": "リスト",
  "navigation_bar.logout": "ログアウト",
  "navigation_bar.mutes": "ミュートしたユーザー",
@ -308,16 +309,16 @@
  "navigation_bar.preferences": "ユーザー設定",
  "navigation_bar.public_timeline": "連合タイムライン",
  "navigation_bar.security": "セキュリティ",
-  "notification.admin.sign_up": "{name}さんがサインアップしました",
+  "notification.admin.sign_up": "{name} がサインアップしました",
  "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
  "notification.follow": "{name}さんにフォローされました",
-  "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
+  "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
  "notification.mention": "{name}さんがあなたに返信しました",
  "notification.own_poll": "アンケートが終了しました",
  "notification.poll": "アンケートが終了しました",
  "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
  "notification.status": "{name}さんが投稿しました",
-  "notification.update": "{name}さんが投稿を編集しました",
+  "notification.update": "{name} が投稿を編集しました",
  "notifications.clear": "通知を消去",
  "notifications.clear_confirmation": "本当に通知を消去しますか？",
  "notifications.column_settings.admin.sign_up": "新規登録:",
@ -346,13 +347,13 @@
  "notifications.filter.polls": "アンケート結果",
  "notifications.filter.statuses": "フォローしている人の新着情報",
  "notifications.grant_permission": "権限の付与",
-  "notifications.group": "{count}件の通知",
+  "notifications.group": "{count} 件の通知",
  "notifications.mark_as_read": "すべて既読にする",
  "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
  "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
  "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
  "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
-  "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
+  "notifications_permission_banner.how_to_control": "Mastodon を閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
  "notifications_permission_banner.title": "お見逃しなく",
  "picture_in_picture.restore": "元に戻す",
  "poll.closed": "終了",
@ -366,22 +367,22 @@
  "poll_button.remove_poll": "アンケートを削除",
  "privacy.change": "公開範囲を変更",
  "privacy.direct.long": "送信した相手のみ閲覧可",
-  "privacy.direct.short": "メンションした相手のみ",
+  "privacy.direct.short": "ダイレクト",
  "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可",
+  "privacy.private.short": "フォロワー限定",
+  "privacy.public.long": "誰でも閲覧可、公開TLに表示",
  "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
+  "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
  "privacy.unlisted.short": "未収載",
  "refresh": "更新",
  "regeneration_indicator.label": "読み込み中…",
  "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
  "relative_time.days": "{number}日前",
-  "relative_time.full.days": "{number}日前",
-  "relative_time.full.hours": "{number}時間前",
+  "relative_time.full.days": "{number} 日前",
+  "relative_time.full.hours": "{number} 時間前",
  "relative_time.full.just_now": "今",
-  "relative_time.full.minutes": "{number}分前",
-  "relative_time.full.seconds": "{number}秒前",
+  "relative_time.full.minutes": "{number} 分前",
+  "relative_time.full.seconds": "{number} 秒前",
  "relative_time.hours": "{number}時間前",
  "relative_time.just_now": "今",
  "relative_time.minutes": "{number}分前",
@ -399,7 +400,7 @@
  "report.category.title_status": "投稿",
  "report.close": "完了",
  "report.comment.title": "その他に私たちに伝えておくべき事はありますか？",
-  "report.forward": "{target}に転送する",
+  "report.forward": "{target} に転送する",
  "report.forward_hint": "このアカウントは別のサーバーに所属しています。通報内容を匿名で転送しますか？",
  "report.mute": "ミュート",
  "report.mute_explanation": "相手の投稿は表示されなくなります。相手は引き続きあなたをフォローして、あなたの投稿を表示することができますが、ミュートされていることはわかりません。",
@ -420,10 +421,10 @@
  "report.submit": "通報する",
  "report.target": "{target}さんを通報する",
  "report.thanks.take_action": "次のような方法はいかがでしょうか？",
-  "report.thanks.take_action_actionable": "私達が確認している間でも、あなたは@{name}さんに対して対応することが出来ます：",
+  "report.thanks.take_action_actionable": "私達が確認している間でも、あなたは @{name} さんに対して対応することが出来ます：",
  "report.thanks.title": "見えないようにしたいですか？",
  "report.thanks.title_actionable": "ご報告ありがとうございます、追って確認します。",
-  "report.unfollow": "@{name}さんのフォローを解除",
+  "report.unfollow": "@{name}のフォローを解除",
  "report.unfollow_explanation": "このアカウントをフォローしています。ホームフィードに彼らの投稿を表示しないようにするには、彼らのフォローを外してください。",
  "search.placeholder": "検索",
  "search_popout.search_format": "高度な検索フォーマット",
@ -439,7 +440,7 @@
  "search_results.statuses": "投稿",
  "search_results.statuses_fts_disabled": "このサーバーでは投稿本文の検索は利用できません。",
  "search_results.total": "{count, number}件の結果",
-  "status.admin_account": "@{name}さんのモデレーション画面を開く",
+  "status.admin_account": "@{name} のモデレーション画面を開く",
  "status.admin_status": "この投稿をモデレーション画面で開く",
  "status.block": "@{name}さんをブロック",
  "status.bookmark": "ブックマーク",
@ -450,13 +451,13 @@
  "status.detailed_status": "詳細な会話ビュー",
  "status.direct": "@{name}さんにダイレクトメッセージ",
  "status.edit": "編集",
-  "status.edited": "{date}に編集",
-  "status.edited_x_times": "{count}回編集",
+  "status.edited": "{date} 編集済み",
+  "status.edited_x_times": "{count} 回編集",
  "status.embed": "埋め込み",
  "status.favourite": "お気に入り",
  "status.filtered": "フィルターされました",
-  "status.history.created": "{name}さんが{date}に作成",
-  "status.history.edited": "{name}さんが{date}に編集",
+  "status.history.created": "{name}さんが {date} に作成",
+  "status.history.edited": "{name}さんが {date} に編集",
  "status.load_more": "もっと見る",
  "status.media_hidden": "非表示のメディア",
  "status.mention": "@{name}さんに投稿",
@ -502,7 +503,7 @@
  "timeline_hint.resources.followers": "フォロワー",
  "timeline_hint.resources.follows": "フォロー",
  "timeline_hint.resources.statuses": "以前の投稿",
-  "trends.counter_by_accounts": "{counter}人が投稿",
+  "trends.counter_by_accounts": "{counter} 人が投稿",
  "trends.trending_now": "トレンドタグ",
  "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
  "units.short.billion": "{count}B",
@ -512,9 +513,9 @@
  "upload_button.label": "メディアを追加 (複数の画像または1つの動画か音声ファイル)",
  "upload_error.limit": "アップロードできる上限を超えています。",
  "upload_error.poll": "アンケートではファイルをアップロードできません。",
-  "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
+  "upload_form.audio_description": "聴取が難しいユーザーへの説明",
  "upload_form.description": "閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "説明を追加していません",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "編集",
  "upload_form.thumbnail": "サムネイルを変更",
  "upload_form.undo": "削除",
@ -527,7 +528,7 @@
  "upload_modal.detect_text": "画像からテキストを検出",
  "upload_modal.edit_media": "メディアを編集",
  "upload_modal.hint": "サムネイルの焦点にしたい場所をクリックするか円形の枠をその場所にドラッグしてください。",
-  "upload_modal.preparing_ocr": "OCRの準備中…",
+  "upload_modal.preparing_ocr": "OCR の準備中…",
  "upload_modal.preview_label": "プレビュー ({ratio})",
  "upload_progress.label": "アップロード中...",
  "video.close": "動画を閉じる",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@ -70,7 +70,7 @@
  "column.blocks": "დაბლოკილი მომხმარებლები",
  "column.bookmarks": "Bookmarks",
  "column.community": "ლოკალური თაიმლაინი",
-  "column.conversations": "Conversations",
+  "column.direct": "პირდაპირი წერილები",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "დამალული დომენები",
  "column.favourites": "ფავორიტები",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "მხოლოდ მედია",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "ეს ტუტი გაეგზავნება მხოლოდ ნახსენებ მომხმარებლებს.",
  "compose_form.direct_message_warning_learn_more": "გაიგე მეტი",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "ეს ტუტი არ მოექცევა ჰეშტეგების ქვეს, რამეთუ ის არაა მითითებული. მხოლოდ ღია ტუტები მოიძებნება ჰეშტეგით.",
  "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.",
  "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "ჯერ პირდაპირი წერილები არ გაქვთ. როდესაც მიიღებთ ან გააგზავნით, გამოჩნდება აქ.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "დასაბუსტად",
  "keyboard_shortcuts.column": "ერთ-ერთი სვეტში სტატუსზე ფოკუსირებისთვის",
  "keyboard_shortcuts.compose": "შედგენის ტექსტ-არეაზე ფოკუსირებისთვის",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "აღწერილობა",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "სიაში ქვემოთ გადასაადგილებლად",
  "keyboard_shortcuts.enter": "სტატუსის გასახსნელად",
  "keyboard_shortcuts.favourite": "ფავორიტად ქცევისთვის",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "პირდაპირი წერილები",
  "navigation_bar.discover": "აღმოაჩინე",
  "navigation_bar.domain_blocks": "დამალული დომენები",
  "navigation_bar.edit_profile": "შეცვალე პროფილი",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
  "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "პირდაპირი",
  "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "მხოლოდ-მიმდევრებისთვის",
+  "privacy.public.long": "დაიპოსტოს საჯარო თაიმლაინებზე",
  "privacy.public.short": "საჯარო",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "არ დაიპოსტოს საჯარო თაიმლაინებზე",
  "privacy.unlisted.short": "ჩამოუთვლელი",
  "refresh": "Refresh",
  "regeneration_indicator.label": "იტვირთება…",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -70,7 +70,7 @@
  "column.blocks": "Imiḍanen yettusḥebsen",
  "column.bookmarks": "Ticraḍ",
  "column.community": "Tasuddemt tadigant",
-  "column.conversations": "Conversations",
+  "column.direct": "Iznan usriden",
  "column.directory": "Inig deg imaɣnuten",
  "column.domain_blocks": "Taɣulin yeffren",
  "column.favourites": "Ismenyifen",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Adigan kan",
  "community.column_settings.media_only": "Allal n teywalt kan",
  "community.column_settings.remote_only": "Anmeggag kan",
+  "compose_form.direct_message_warning": "Tajewwaqt-a ad d-tettwasken kan i yimseqdacen i d-yettwabedren.",
  "compose_form.direct_message_warning_learn_more": "Issin ugar",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Amiḍan-ik ur yelli ara {locked}. Menwala yezmer ad k-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik.",
  "compose_form.lock_disclaimer.lock": "yettwacekkel",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
  "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
  "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Ulac ɣur-k ula yiwen n yizen usrid. Ad d-yettwasken da, ticki tuzneḍ neɣ teṭṭfeḍ-d yiwen.",
  "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "i beṭṭu tikelt-nniḍen",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Aglam",
+  "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
  "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
  "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
  "keyboard_shortcuts.favourite": "akken ad ternuḍ ɣer yismenyifen",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Ticraḍ",
  "navigation_bar.community_timeline": "Tasuddemt tadigant",
  "navigation_bar.compose": "Aru tajewwiqt tamaynut",
+  "navigation_bar.direct": "Iznan usridden",
  "navigation_bar.discover": "Ẓer",
  "navigation_bar.domain_blocks": "Tiɣula yeffren",
  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Kkes asenqed",
  "privacy.change": "Seggem tabaḍnit n yizen",
  "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Usrid",
  "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Imeḍfaṛen kan",
+  "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
  "privacy.public.short": "Azayez",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
  "privacy.unlisted.short": "War tabdert",
  "refresh": "Smiren",
  "regeneration_indicator.label": "Yessalay-d…",
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@ -70,7 +70,7 @@
  "column.blocks": "Бұғатталғандар",
  "column.bookmarks": "Бетбелгілер",
  "column.community": "Жергілікті желі",
-  "column.conversations": "Conversations",
+  "column.direct": "Жеке хаттар",
  "column.directory": "Профильдерді аралау",
  "column.domain_blocks": "Жасырылған домендер",
  "column.favourites": "Таңдаулылар",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Тек жергілікті",
  "community.column_settings.media_only": "Тек медиа",
  "community.column_settings.remote_only": "Тек сыртқы",
+  "compose_form.direct_message_warning": "Тек аталған қолданушыларға.",
  "compose_form.direct_message_warning_learn_more": "Көбірек білу",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Бұл пост іздеуде хэштегпен шықпайды, өйткені ол бәріне ашық емес. Тек ашық жазбаларды ғана хэштег арқылы іздеп табуға болады.",
  "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
  "compose_form.lock_disclaimer.lock": "жабық",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ешкімді бұғаттамағансыз.",
  "empty_column.bookmarked_statuses": "Ешқандай жазба Бетбелгілер тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
  "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Әзірше дым хат жоқ. Өзіңіз жазып көріңіз алдымен.",
  "empty_column.domain_blocks": "Бұғатталған домен жоқ.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Ешқандай жазба 'Таңдаулылар' тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "жазба бөлісу",
  "keyboard_shortcuts.column": "бағандардағы жазбаны оқу",
  "keyboard_shortcuts.compose": "пост жазу",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Сипаттама",
+  "keyboard_shortcuts.direct": "жеке хаттар бағаны",
  "keyboard_shortcuts.down": "тізімде төмен түсу",
  "keyboard_shortcuts.enter": "жазбаны ашу",
  "keyboard_shortcuts.favourite": "таңдаулыға қосу",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Бетбелгілер",
  "navigation_bar.community_timeline": "Жергілікті желі",
  "navigation_bar.compose": "Жаңа жазба бастау",
+  "navigation_bar.direct": "Жеке хаттар",
  "navigation_bar.discover": "шарлау",
  "navigation_bar.domain_blocks": "Жабық домендер",
  "navigation_bar.edit_profile": "Профиль түзету",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Сауалнаманы өшіру",
  "privacy.change": "Құпиялылықты реттеу",
  "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Тікелей",
  "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Оқырмандарға ғана",
+  "privacy.public.long": "Ашық желіге жібер",
  "privacy.public.short": "Ашық",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Тізімсіз",
  "refresh": "Жаңарту",
  "regeneration_indicator.label": "Жүктеу…",
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@ -70,7 +70,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Hidden domains",
  "column.favourites": "Favourites",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Post to followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Post to public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -3,7 +3,7 @@
  "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
  "account.badges.bot": "봇",
  "account.badges.group": "그룹",
-  "account.block": "@{name} 차단",
+  "account.block": "@{name}을 차단",
  "account.block_domain": "도메인 {domain}을 차단",
  "account.blocked": "차단됨",
  "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
@ -70,10 +70,10 @@
  "column.blocks": "차단한 사용자",
  "column.bookmarks": "보관함",
  "column.community": "로컬 타임라인",
-  "column.conversations": "대화",
+  "column.direct": "다이렉트 메시지",
  "column.directory": "프로필 둘러보기",
  "column.domain_blocks": "차단한 도메인",
-  "column.favourites": "좋아요",
+  "column.favourites": "즐겨찾기",
  "column.follow_requests": "팔로우 요청",
  "column.home": "홈",
  "column.lists": "리스트",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "로컬만",
  "community.column_settings.media_only": "미디어만",
  "community.column_settings.remote_only": "원격만",
+  "compose_form.direct_message_warning": "이 게시물은 멘션 된 유저들에게만 보여집니다.",
  "compose_form.direct_message_warning_learn_more": "더 알아보기",
-  "compose_form.encryption_warning": "마스토돈의 게시물들은 종단간 암호화가 되지 않습니아. 위험한 정보를 마스토돈을 통해 전달하지 마세요.",
  "compose_form.hashtag_warning": "이 게시물은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 게시물만이 해시태그로 검색 될 수 있습니다.",
  "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
  "compose_form.lock_disclaimer.lock": "비공개",
@ -128,10 +128,10 @@
  "confirmations.logout.confirm": "로그아웃",
  "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
  "confirmations.mute.confirm": "뮤트",
-  "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
+  "confirmations.mute.explanation": "이 동작은 그의 게시물, 그를 멘션하는 게시물을 숨깁니다, 하지만 여전히 그가 당신의 게시물을 보고 팔로우 할 수 있습니다.",
  "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?",
  "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
-  "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
+  "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 즐겨찾기를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
  "confirmations.reply.confirm": "답글",
  "confirmations.reply.message": "답글을 달기 위해 현재 작성 중인 메시지가 덮어 씌워집니다. 진행하시겠습니까?",
  "confirmations.unfollow.confirm": "팔로우 해제",
@ -140,7 +140,7 @@
  "conversation.mark_as_read": "읽은 상태로 표시",
  "conversation.open": "대화 보기",
  "conversation.with": "{names} 님과",
-  "directory.federated": "알려진 연합우주로부터",
+  "directory.federated": "알려진 별무리로부터",
  "directory.local": "{domain}에서만",
  "directory.new_arrivals": "새로운 사람들",
  "directory.recently_active": "최근 활동",
@ -166,11 +166,11 @@
  "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
  "empty_column.bookmarked_statuses": "아직 보관한 게시물이 없습니다. 게시물을 보관하면 여기에 나타납니다.",
  "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
-  "empty_column.conversations": "멘션한 사람만 볼 수 있는 게시물을 보내거나 받은 경우에, 여기에 나타납니다.",
+  "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
  "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
  "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
-  "empty_column.favourited_statuses": "아직 마음에 들어한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
-  "empty_column.favourites": "아직 아무도 이 게시물을 마음에 들어하지 않았습니다. 누군가 좋아요를 하면 여기에 나타납니다.",
+  "empty_column.favourited_statuses": "아직 즐겨찾기 한 게시물이 없습니다. 게시물을 즐겨찾기 하면 여기에 나타납니다.",
+  "empty_column.favourites": "아직 아무도 이 게시물을 즐겨찾기 하지 않았습니다. 누군가 즐겨찾기를 하면 여기에 나타납니다.",
  "empty_column.follow_recommendations": "당신을 위한 제안이 생성될 수 없는 것 같습니다. 알 수도 있는 사람을 검색하거나 유행하는 해시태그를 둘러볼 수 있습니다.",
  "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.",
  "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
@ -230,12 +230,12 @@
  "keyboard_shortcuts.boost": "게시물 부스트",
  "keyboard_shortcuts.column": "해당 컬럼에 포커스",
  "keyboard_shortcuts.compose": "작성창에 포커스",
-  "keyboard_shortcuts.conversations": "대화 컬럼 열기",
  "keyboard_shortcuts.description": "설명",
+  "keyboard_shortcuts.direct": "다이렉트 메시지 컬럼 열기",
  "keyboard_shortcuts.down": "리스트에서 아래로 이동",
  "keyboard_shortcuts.enter": "게시물 열기",
  "keyboard_shortcuts.favourite": "관심글 지정",
-  "keyboard_shortcuts.favourites": "좋아요 목록 열기",
+  "keyboard_shortcuts.favourites": "즐겨찾기 목록 열기",
  "keyboard_shortcuts.federated": "연합 타임라인 열기",
  "keyboard_shortcuts.heading": "키보드 단축키",
  "keyboard_shortcuts.home": "홈 타임라인 열기",
@ -290,11 +290,12 @@
  "navigation_bar.bookmarks": "보관함",
  "navigation_bar.community_timeline": "로컬 타임라인",
  "navigation_bar.compose": "새 게시물 작성",
+  "navigation_bar.direct": "다이렉트 메시지",
  "navigation_bar.discover": "발견하기",
  "navigation_bar.domain_blocks": "차단한 도메인",
  "navigation_bar.edit_profile": "프로필 편집",
  "navigation_bar.explore": "탐색하기",
-  "navigation_bar.favourites": "좋아요",
+  "navigation_bar.favourites": "즐겨찾기",
  "navigation_bar.filters": "뮤트한 단어",
  "navigation_bar.follow_requests": "팔로우 요청",
  "navigation_bar.follows_and_followers": "팔로우와 팔로워",
@ -309,7 +310,7 @@
  "navigation_bar.public_timeline": "연합 타임라인",
  "navigation_bar.security": "보안",
  "notification.admin.sign_up": "{name} 님이 가입했습니다",
-  "notification.favourite": "{name} 님이 당신의 게시물을 마음에 들어합니다",
+  "notification.favourite": "{name} 님이 즐겨찾기 했습니다",
  "notification.follow": "{name} 님이 나를 팔로우 했습니다",
  "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
  "notification.mention": "{name} 님이 답글을 보냈습니다",
@ -322,7 +323,7 @@
  "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
  "notifications.column_settings.admin.sign_up": "새로운 가입:",
  "notifications.column_settings.alert": "데스크탑 알림",
-  "notifications.column_settings.favourite": "좋아요:",
+  "notifications.column_settings.favourite": "즐겨찾기:",
  "notifications.column_settings.filter_bar.advanced": "카테고리의 모든 종류를 표시",
  "notifications.column_settings.filter_bar.category": "퀵 필터 바",
  "notifications.column_settings.filter_bar.show_bar": "필터 막대 표시",
@ -340,7 +341,7 @@
  "notifications.column_settings.update": "수정내역:",
  "notifications.filter.all": "모두",
  "notifications.filter.boosts": "부스트",
-  "notifications.filter.favourites": "좋아요",
+  "notifications.filter.favourites": "즐겨찾기",
  "notifications.filter.follows": "팔로우",
  "notifications.filter.mentions": "멘션",
  "notifications.filter.polls": "투표 결과",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "투표 삭제",
  "privacy.change": "게시물의 프라이버시 설정을 변경",
  "privacy.direct.long": "멘션한 사용자에게만 공개",
-  "privacy.direct.short": "내가 멘션한 사람만",
+  "privacy.direct.short": "다이렉트",
  "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "모두가 볼 수 있음",
+  "privacy.private.short": "비공개",
+  "privacy.public.long": "공개 타임라인에 표시",
  "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
+  "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
  "privacy.unlisted.short": "타임라인에 비표시",
  "refresh": "새로고침",
  "regeneration_indicator.label": "불러오는 중…",
@ -389,7 +390,7 @@
  "relative_time.today": "오늘",
  "reply_indicator.cancel": "취소",
  "report.block": "차단",
-  "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
+  "report.block_explanation": "당신은 그의 게시물을 보지 않게 됩니다. 그는 당신의 게시물을 보거나 팔로우 할 수 없습니다. 그가 차단되었다는 사실을 알 수 있습니다.",
  "report.categories.other": "기타",
  "report.categories.spam": "스팸",
  "report.categories.violation": "컨텐츠가 한 개 이상의 서버 규칙을 위반합니다",
@ -402,7 +403,7 @@
  "report.forward": "{target}에 포워드 됨",
  "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
  "report.mute": "침묵",
-  "report.mute_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 해당 계정은 자신이 뮤트 되었는지 알지 못합니다.",
+  "report.mute_explanation": "당신은 그의 게시물을 보지 않게 됩니다. 그는 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 뮤트 되었는지 알지 못합니다.",
  "report.next": "다음",
  "report.placeholder": "코멘트",
  "report.reasons.dislike": "마음에 안듭니다",
@ -453,7 +454,7 @@
  "status.edited": "{date}에 편집됨",
  "status.edited_x_times": "{count}번 수정됨",
  "status.embed": "공유하기",
-  "status.favourite": "좋아요",
+  "status.favourite": "즐겨찾기",
  "status.filtered": "필터로 걸러짐",
  "status.history.created": "{name} 님이 {date}에 생성함",
  "status.history.edited": "{name} 님이 {date}에 수정함",
@ -514,7 +515,7 @@
  "upload_error.poll": "파일 업로드는 투표와 함께 첨부할 수 없습니다.",
  "upload_form.audio_description": "청각 장애인을 위한 설명",
  "upload_form.description": "시각장애인을 위한 설명",
-  "upload_form.description_missing": "설명이 추가되지 않음",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "편집",
  "upload_form.thumbnail": "썸네일 변경",
  "upload_form.undo": "삭제",
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@ -70,7 +70,7 @@
  "column.blocks": "Bikarhênerên astengkirî",
  "column.bookmarks": "Şûnpel",
  "column.community": "Demnameya herêmî",
-  "column.conversations": "Axaftin",
+  "column.direct": "Peyamên taybet",
  "column.directory": "Li profîlan bigere",
  "column.domain_blocks": "Navperên astengkirî",
  "column.favourites": "Bijarte",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Tenê herêmî",
  "community.column_settings.media_only": "Tenê media",
  "community.column_settings.remote_only": "Tenê ji dûr ve",
+  "compose_form.direct_message_warning": "Ev şandî tenê ji bikarhênerên qalkirî re wê were şandin.",
  "compose_form.direct_message_warning_learn_more": "Bêtir fêr bibe",
-  "compose_form.encryption_warning": "Şandiyên li ser Mastodon dawî-bi-dawî ne şîfrekirî ne. Li ser Mastodon zanyariyên talûke parve neke.",
  "compose_form.hashtag_warning": "Ev şandî ji ber ku nehatiye tomarkirin dê di binê hashtagê de neyê tomar kirin. Tenê peyamên gelemperî dikarin bi hashtagê werin lêgerîn.",
  "compose_form.lock_disclaimer": "Ajimêrê te {locked} nîne. Herkes dikare te bişopîne da ku şandiyên te yên tenê şopînerên te ra xûya dibin bibînin.",
  "compose_form.lock_disclaimer.lock": "girtî ye",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Te tu bikarhêner asteng nekiriye.",
  "empty_column.bookmarked_statuses": "Hîn tu peyamên şûnpelkirî tuneye. Gava ku hûn yek şûnpel bikin, ew ê li vir xûya bike.",
  "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!",
-  "empty_column.conversations": "Dema tu şandiyekê bişîninî an jî bistînî ku tenê ji kesên qalkirî re xuyabar in, ew ê li vir xuya bibe.",
+  "empty_column.direct": "Hêj peyameke te yê rasterast tuneye. Gava ku tu yekî bişeynî an jî bigirî, ew ê li vir xûya bike.",
  "empty_column.domain_blocks": "Hê jî navperên hatine asteng kirin tune ne.",
  "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!",
  "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Şandiyê bilind bike",
  "keyboard_shortcuts.column": "Stûna balkişandinê",
  "keyboard_shortcuts.compose": "Bal bikşîne cîhê nivîsê/textarea",
-  "keyboard_shortcuts.conversations": "ji bo vekirina stûna axaftinan",
  "keyboard_shortcuts.description": "Danasîn",
+  "keyboard_shortcuts.direct": "Ji stûnê peyamên rasterast veke",
  "keyboard_shortcuts.down": "Di rêzokê de dakêşe jêr",
  "keyboard_shortcuts.enter": "Şandiyê veke",
  "keyboard_shortcuts.favourite": "Şandiya bijarte",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Şûnpel",
  "navigation_bar.community_timeline": "Demnameya herêmî",
  "navigation_bar.compose": "Şandiyeke nû binivsîne",
+  "navigation_bar.direct": "Peyamên rasterast",
  "navigation_bar.discover": "Vekolê",
  "navigation_bar.domain_blocks": "Navparên astengkirî",
  "navigation_bar.edit_profile": "Profîl serrast bike",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Rapirsî yê rake",
  "privacy.change": "Nepênîtiya şandiyan biguherîne",
  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Tenê mirovên ku min qalkirî",
+  "privacy.direct.short": "Taybet",
  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
  "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo hemûyan xuyabar e",
+  "privacy.public.long": "Ji bo herkesî li berçav e, di demnameyên gelemperî de dê xûyakirin",
  "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
+  "privacy.unlisted.long": "Ji herkesî ra tê xûya, lê demnameyê gelemperî ra nay xûyakirin",
  "privacy.unlisted.short": "Nerêzok",
  "refresh": "Nû bike",
  "regeneration_indicator.label": "Tê barkirin…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
  "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
  "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
-  "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Serrast bike",
  "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
  "upload_form.undo": "Jê bibe",
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@ -70,7 +70,7 @@
  "column.blocks": "Devnydhyoryon lettys",
  "column.bookmarks": "Folennosow",
  "column.community": "Amserlin leel",
-  "column.conversations": "Conversations",
+  "column.direct": "Messajys didro",
  "column.directory": "Peuri profilys",
  "column.domain_blocks": "Gorfarthow lettys",
  "column.favourites": "Re drudh",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Leel hepken",
  "community.column_settings.media_only": "Myski hepken",
  "community.column_settings.remote_only": "A-bell hepken",
+  "compose_form.direct_message_warning": "An post ma a vydh danvenys dhe'n dhevnydhyoryon menegys hepken.",
  "compose_form.direct_message_warning_learn_more": "Dyski moy",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Ny vydh an post ma diskwedhys yn-dann vòlnos vyth awos y vos mes a rol. Ny yllir hwilas saw poblow postek dre vòlnos.",
  "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
  "compose_form.lock_disclaimer.lock": "Alhwedhys",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ny wrussowgh lettya devnydhyoryon vyth hwath.",
  "empty_column.bookmarked_statuses": "Nyns eus dhywgh postow gans folennos hwath. Pan wrewgh gorra onan, ev a wra omdhiskwedhes omma.",
  "empty_column.community": "An amserlin leel yw gwag. Skrifewgh neppytn yn poblek dh'y lonchya!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Nyns eus dhywgh messajys didro hwath. Pan wrewgh dannvon po degemeres onan, ev a wra omdhiskwedhes omma.",
  "empty_column.domain_blocks": "Nyns eus gorfarthow lettys hwath.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Nyns eus dhywgh postow drudh hwath. Pan wrewgh merkya onan vel drudh, ev a wra omdhiskwedhes omma.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Kenertha post",
  "keyboard_shortcuts.column": "Fogella koloven",
  "keyboard_shortcuts.compose": "Fogella tekstva gomposya",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Deskrifans",
+  "keyboard_shortcuts.direct": "Ygeri koloven messajys didro",
  "keyboard_shortcuts.down": "Movya war-nans y'n rol",
  "keyboard_shortcuts.enter": "Ygeri post",
  "keyboard_shortcuts.favourite": "Merkya post vel drudh",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Folennosow",
  "navigation_bar.community_timeline": "Amserlin leel",
  "navigation_bar.compose": "Komposya post nowydh",
+  "navigation_bar.direct": "Messajys didro",
  "navigation_bar.discover": "Diskudha",
  "navigation_bar.domain_blocks": "Gorfarthow lettys",
  "navigation_bar.edit_profile": "Golegi profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Dilea sondyans",
  "privacy.change": "Chanjya privetter an post",
  "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Didro",
  "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Holyoryon-hepken",
+  "privacy.public.long": "Gweladow dhe beub, diskwedhys yn amserlinyow poblek",
  "privacy.public.short": "Poblek",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Gweladow dhe beub, a-der yn amserlinyow poblek",
  "privacy.unlisted.short": "Anrelys",
  "refresh": "Daskarga",
  "regeneration_indicator.label": "Ow karga…",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -70,7 +70,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Hidden domains",
  "column.favourites": "Mėgstamiausi",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Post to followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Post to public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -70,7 +70,7 @@
  "column.blocks": "Bloķētie lietotāji",
  "column.bookmarks": "Grāmatzīmes",
  "column.community": "Vietējā ziņu līnija",
-  "column.conversations": "Sarunas",
+  "column.direct": "Privātās ziņas",
  "column.directory": "Pārlūkot profilus",
  "column.domain_blocks": "Bloķētie domēni",
  "column.favourites": "Izlase",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Tikai vietējie",
  "community.column_settings.media_only": "Tikai mediji",
  "community.column_settings.remote_only": "Tikai attālinātie",
+  "compose_form.direct_message_warning": "Šis ziņojums tiks nosūtīts tikai pieminētajiem lietotājiem.",
  "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
-  "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar bīstamu informāciju caur Mastodon.",
  "compose_form.hashtag_warning": "Ziņojumu nebūs iespējams atrast zem haštagiem jo tas nav publisks. Tikai publiskos ziņojumus ir iespējams meklēt pēc tiem.",
  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot lai apskatītu tikai sekotājiem paredzētos ziņojumus.",
  "compose_form.lock_disclaimer.lock": "slēgts",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Patreiz tu neesi nevienu bloķējis.",
  "empty_column.bookmarked_statuses": "Patreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
  "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.conversations": "Kad nosūtīsi vai saņemsi ziņu, kas ir redzama tikai tajā minētajām personām, tā tiks parādīta šeit.",
+  "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
  "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
  "empty_column.explore_statuses": "Pašlaik nekas nav tendēts. Pārbaudiet vēlāk!",
  "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Palielināt ziņu",
  "keyboard_shortcuts.column": "Fokusēt kolonnu",
  "keyboard_shortcuts.compose": "Fokusēt veidojamā teksta lauku",
-  "keyboard_shortcuts.conversations": "lai atvērtu sarunu kolonnu",
  "keyboard_shortcuts.description": "Apraksts",
+  "keyboard_shortcuts.direct": "Atvērt privāto ziņojumu kolonnu",
  "keyboard_shortcuts.down": "Pārvietot sarakstā uz leju",
  "keyboard_shortcuts.enter": "Atvērt ziņu",
  "keyboard_shortcuts.favourite": "Pievienot izlasei",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Grāmatzīmes",
  "navigation_bar.community_timeline": "Vietējā ziņu lenta",
  "navigation_bar.compose": "Veidot jaunu ziņu",
+  "navigation_bar.direct": "Privātās ziņas",
  "navigation_bar.discover": "Atklāt",
  "navigation_bar.domain_blocks": "Bloķētie domēni",
  "navigation_bar.edit_profile": "Rediģēt profilu",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Noņemt aptauju",
  "privacy.change": "Mainīt ziņas privātumu",
  "privacy.direct.long": "Redzams tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai cilvēki, kurus es pieminu",
+  "privacy.direct.short": "Tiešs",
  "privacy.private.long": "Redzams tikai sekotājiem",
  "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzama visiem",
+  "privacy.public.long": "Redzams visiem, rāda publiskajās ziņu lentās",
  "privacy.public.short": "Publisks",
-  "privacy.unlisted.long": "Redzama visiem, bet atteicās no atklāšanas funkcijām",
+  "privacy.unlisted.long": "Redzams visiem, bet ne publiskajās ziņu lentās",
  "privacy.unlisted.short": "Neminētie",
  "refresh": "Atsvaidzināt",
  "regeneration_indicator.label": "Ielādē…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
  "upload_form.audio_description": "Aprakstiet cilvēkiem ar dzirdes zudumu",
  "upload_form.description": "Aprakstiet vājredzīgajiem",
-  "upload_form.description_missing": "Apraksts nav pievienots",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Rediģēt",
  "upload_form.thumbnail": "Nomainīt sīktēlu",
  "upload_form.undo": "Dzēst",
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@ -70,7 +70,7 @@
  "column.blocks": "Блокирани корисници",
  "column.bookmarks": "Bookmarks",
  "column.community": "Локална временска зона",
-  "column.conversations": "Conversations",
+  "column.direct": "Директна порака",
  "column.directory": "Види профили",
  "column.domain_blocks": "Скриени домеини",
  "column.favourites": "Омилени",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Само медиа",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Научи повеќе",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "заклучен",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Немате сеуште блокирано корисници.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "Локалниот времеплов е празен. Објавете нешто јавно за да може да почне шоуто!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Немате директни пораки. Кога ќе пратите или примите, ќе се појават тука.",
  "empty_column.domain_blocks": "Немате сокриени домеини уште.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Уреди профил",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Избришете анкета",
  "privacy.change": "Штеловај статус на приватност",
  "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Директно",
  "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Само следбеници",
+  "privacy.public.long": "Објави во јавни времплови",
  "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Не објавувај на јавни времеплови",
  "privacy.unlisted.short": "Необјавено",
  "refresh": "Освежи",
  "regeneration_indicator.label": "Вчитување…",
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@ -70,7 +70,7 @@
  "column.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
  "column.bookmarks": "ബുക്ക്മാർക്കുകൾ",
  "column.community": "പ്രാദേശികമായ സമയരേഖ",
-  "column.conversations": "Conversations",
+  "column.direct": "നേരിട്ടുള്ള സന്ദേശങ്ങൾ",
  "column.directory": "പ്രൊഫൈലുകൾ മറിച്ചുനോക്കുക",
  "column.domain_blocks": "മറയ്ക്കപ്പെട്ട മേഖലകൾ",
  "column.favourites": "പ്രിയപ്പെട്ടവ",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
  "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "പരാമർശിക്കപ്പെട്ടിരിക്കുന്ന ഉപയോഗ്താക്കൾക്കെ ഈ ടൂട്ട് അയക്കപ്പെടുകയുള്ളു.",
  "compose_form.direct_message_warning_learn_more": "കൂടുതൽ പഠിക്കുക",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "ഈ ടൂട്ട് പട്ടികയിൽ ഇല്ലാത്തതിനാൽ ഒരു ചർച്ചാവിഷയത്തിന്റെ പട്ടികയിലും പെടുകയില്ല. പരസ്യമായ ടൂട്ടുകൾ മാത്രമേ ചർച്ചാവിഷയം അടിസ്ഥാനമാക്കി തിരയുവാൻ സാധിക്കുകയുള്ളു.",
  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
@ -166,7 +166,7 @@
  "empty_column.blocks": "നിങ്ങൾ ഇതുവരെ ഒരു ഉപയോക്താക്കളെയും തടഞ്ഞിട്ടില്ല.",
  "empty_column.bookmarked_statuses": "നിങ്ങൾക് ഇതുവരെ അടയാളപ്പെടുത്തിയ ടൂട്ടുകൾ ഇല്ല. അടയാളപ്പെടുത്തിയാൽ അത് ഇവിടെ വരും.",
  "empty_column.community": "പ്രാദേശികമായ സമയരേഖ ശൂന്യമാണ്. എന്തെങ്കിലും പരസ്യമായി എഴുതി തുടക്കം കുറിക്കു!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "നിങ്ങൾക്ക് ഇതുവരെ നേരിട്ടുള്ള സന്ദേശങ്ങൾ ഒന്നുമില്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് അയക്കുകയോ, നിങ്ങൾക്ക് ലഭിക്കുകയോ ചെയ്യുന്നപക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
  "empty_column.domain_blocks": "മറയ്ക്കപ്പെട്ടിരിക്കുന്ന മേഖലകൾ ഇതുവരെ ഇല്ല.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "നിങ്ങൾക്ക് ഇത് വരെ ഒരു പ്രിയപ്പെട്ട ടൂട്ടും ഇല്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് പ്രിയപ്പെടുന്ന പക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "ബൂസ്റ്റ് ചെയ്യുക",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "വിവരണം",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "ടൂട്ട് എടുക്കാൻ",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
  "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
  "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
+  "navigation_bar.direct": "നേരിട്ടുള്ള സന്ദേശങ്ങൾ",
  "navigation_bar.discover": "കണ്ടെത്തുക",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
  "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "നേരിട്ട്",
  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "പിന്തുടരുന്നവർക്ക് മാത്രം",
+  "privacy.public.long": "Post to public timelines",
  "privacy.public.short": "എല്ലാവര്‍ക്കും",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "പുതുക്കുക",
  "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@ -70,7 +70,7 @@
  "column.blocks": "ब्लॉक केलेले खातेधारक",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "थेट संदेश",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "गुप्त डोमेन्स",
  "column.favourites": "आवडते",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "केवळ मीडिया",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "अधिक जाणून घ्या",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no hidden domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Post to followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Post to public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Do not show in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@ -70,7 +70,7 @@
  "column.blocks": "Pengguna yang disekat",
  "column.bookmarks": "Tanda buku",
  "column.community": "Garis masa tempatan",
-  "column.conversations": "Conversations",
+  "column.direct": "Mesej terus",
  "column.directory": "Layari profil",
  "column.domain_blocks": "Domain disekat",
  "column.favourites": "Kegemaran",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Tempatan sahaja",
  "community.column_settings.media_only": "Media sahaja",
  "community.column_settings.remote_only": "Jauh sahaja",
+  "compose_form.direct_message_warning": "Hantaran ini hanya akan dihantar kepada pengguna yang disebut.",
  "compose_form.direct_message_warning_learn_more": "Ketahui lebih lanjut",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Hantaran ini tidak akan disenaraikan di bawah mana-mana tanda pagar kerana ia tidak tersenarai. Hanya hantaran awam sahaja boleh dicari menggunakan tanda pagar.",
  "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
  "compose_form.lock_disclaimer.lock": "dikunci",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Anda belum menyekat sesiapa.",
  "empty_column.bookmarked_statuses": "Anda belum ada hantaran yang ditanda buku. Apabila anda menanda buku sesuatu, ia akan muncul di sini.",
  "empty_column.community": "Garis masa tempatan kosong. Tulislah secara awam untuk memulakan sesuatu!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Anda tidak mempunyai mesej terus. Apabila anda menghantar atau menerimanya, ia akan muncul di sini.",
  "empty_column.domain_blocks": "Belum ada domain yang disekat.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Anda belum ada hantaran yang digemari. Apabila anda menggemari sesuatu, ia akan muncul di sini.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "Tumpu pada lajur",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Keterangan",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "Buka hantaran",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Tanda buku",
  "navigation_bar.community_timeline": "Garis masa tempatan",
  "navigation_bar.compose": "Karang hantaran baharu",
+  "navigation_bar.direct": "Mesej terus",
  "navigation_bar.discover": "Teroka",
  "navigation_bar.domain_blocks": "Domain disekat",
  "navigation_bar.edit_profile": "Sunting profil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Buang undian",
  "privacy.change": "Ubah privasi hantaran",
  "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Terus",
  "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Pengikut sahaja",
+  "privacy.public.long": "Boleh dilihat oleh semua orang, ditunjukkan di garis masa awam",
  "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Boleh dilihat oleh semua orang, tapi jangan tunjukkan di garis masa awam",
  "privacy.unlisted.short": "Tidak tersenarai",
  "refresh": "Muat semula",
  "regeneration_indicator.label": "Memuatkan…",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -70,7 +70,7 @@
  "column.blocks": "Geblokkeerde gebruikers",
  "column.bookmarks": "Bladwijzers",
  "column.community": "Lokale tijdlijn",
-  "column.conversations": "Gesprekken",
+  "column.direct": "Directe berichten",
  "column.directory": "Gebruikersgids",
  "column.domain_blocks": "Geblokkeerde domeinen",
  "column.favourites": "Favorieten",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Alleen lokaal",
  "community.column_settings.media_only": "Alleen media",
  "community.column_settings.remote_only": "Alleen andere servers",
+  "compose_form.direct_message_warning": "Dit bericht wordt alleen naar vermelde gebruikers verstuurd.",
  "compose_form.direct_message_warning_learn_more": "Meer leren",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Dit bericht valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare berichten kunnen via hashtags gevonden worden.",
  "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
  "compose_form.lock_disclaimer.lock": "besloten",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
  "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
  "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
  "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
  "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
  "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je er een aan jouw favorieten toevoegt, valt deze hier te zien.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Bericht boosten",
  "keyboard_shortcuts.column": "Op één van de kolommen focussen",
  "keyboard_shortcuts.compose": "Tekstveld om een bericht te schrijven focussen",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Omschrijving",
+  "keyboard_shortcuts.direct": "Jouw directe berichten tonen",
  "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen",
  "keyboard_shortcuts.enter": "Volledig bericht tonen",
  "keyboard_shortcuts.favourite": "Aan jouw favorieten toevoegen",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bladwijzers",
  "navigation_bar.community_timeline": "Lokale tijdlijn",
  "navigation_bar.compose": "Nieuw bericht schrijven",
+  "navigation_bar.direct": "Directe berichten",
  "navigation_bar.discover": "Ontdekken",
  "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
  "navigation_bar.edit_profile": "Profiel bewerken",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Poll verwijderen",
  "privacy.change": "Zichtbaarheid van bericht aanpassen",
  "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Alleen gebruikers die ik noem",
+  "privacy.direct.short": "Direct",
  "privacy.private.long": "Alleen aan volgers tonen",
  "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar",
+  "privacy.public.long": "Voor iedereen zichtbaar en op openbare tijdlijnen tonen",
  "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet op openbare tijdlijnen tonen",
  "privacy.unlisted.short": "Minder openbaar",
  "refresh": "Vernieuwen",
  "regeneration_indicator.label": "Aan het laden…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Het uploaden van bestanden is in polls niet toegestaan.",
  "upload_form.audio_description": "Omschrijf dit voor mensen met een auditieve beperking",
  "upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
-  "upload_form.description_missing": "Geen omschrijving toegevoegd",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Bewerken",
  "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
  "upload_form.undo": "Verwijderen",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -18,7 +18,7 @@
  "account.followers": "Fylgjarar",
  "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
  "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
-  "account.following": "Følger",
+  "account.following": "Following",
  "account.following_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjar}}",
  "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
  "account.follows_you": "Fylgjer deg",
@ -41,16 +41,16 @@
  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tut}}",
  "account.unblock": "Slutt å blokera @{name}",
  "account.unblock_domain": "Vis {domain}",
-  "account.unblock_short": "Opphev blokkering",
+  "account.unblock_short": "Unblock",
  "account.unendorse": "Ikkje framhev på profil",
  "account.unfollow": "Slutt å fylgja",
  "account.unmute": "Av-demp @{name}",
  "account.unmute_notifications": "Vis varsel frå @{name}",
-  "account.unmute_short": "Opphev demping",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Klikk for å leggja til merknad",
  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Gjennomsnitt",
+  "admin.dashboard.retention.average": "Average",
  "admin.dashboard.retention.cohort": "Sign-up month",
  "admin.dashboard.retention.cohort_size": "Nye brukere",
  "alert.rate_limited.message": "Ver venleg å prøva igjen etter {retry_time, time, medium}.",
@ -70,7 +70,7 @@
  "column.blocks": "Blokkerte brukarar",
  "column.bookmarks": "Bokmerke",
  "column.community": "Lokal tidsline",
-  "column.conversations": "Conversations",
+  "column.direct": "Meldingar",
  "column.directory": "Sjå gjennom profilar",
  "column.domain_blocks": "Gøymde domene",
  "column.favourites": "Favorittar",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Berre lokalt",
  "community.column_settings.media_only": "Berre media",
  "community.column_settings.remote_only": "Berre eksternt",
+  "compose_form.direct_message_warning": "Dette tutet vert berre synleg for nemnde brukarar.",
  "compose_form.direct_message_warning_learn_more": "Lær meir",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Dette tutet vert ikkje oppført under nokon emneknagg sidan det ikkje er oppført. Berre offentlege tut kan verta søkt etter med emneknagg.",
  "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine som berre visast til fylgjarar.",
  "compose_form.lock_disclaimer.lock": "låst",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Du har ikkje blokkert nokon brukarar enno.",
  "empty_column.bookmarked_statuses": "Du har ikkje nokon bokmerkte tut enno. Når du bokmerkjer eit, dukkar det opp her.",
  "empty_column.community": "Den lokale samtiden er tom. Skriv noko offentleg å få ballen til å rulle!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Du har ingen direktemeldingar ennå. Når du sender eller får ein vil den dukke opp her.",
  "empty_column.domain_blocks": "Det er ingen gøymde domene ennå.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer ein som favoritt, så dukkar det opp her.",
@ -187,11 +187,11 @@
  "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
  "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace til utklippstavla",
  "errors.unexpected_crash.report_issue": "Rapporter problem",
-  "explore.search_results": "Søkeresultater",
-  "explore.suggested_follows": "For deg",
-  "explore.title": "Utforsk",
-  "explore.trending_links": "Nyheter",
-  "explore.trending_statuses": "Innlegg",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Ferdig",
  "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "for å framheva",
  "keyboard_shortcuts.column": "for å fokusera på ein status i ei av kolonnane",
  "keyboard_shortcuts.compose": "for å fokusera tekstfeltet for skriving",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Skildring",
+  "keyboard_shortcuts.direct": "for å opna direktemeldingskolonna",
  "keyboard_shortcuts.down": "for å flytta seg opp og ned i lista",
  "keyboard_shortcuts.enter": "for å opna status",
  "keyboard_shortcuts.favourite": "for å merkja som favoritt",
@ -290,10 +290,11 @@
  "navigation_bar.bookmarks": "Bokmerke",
  "navigation_bar.community_timeline": "Lokal tidsline",
  "navigation_bar.compose": "Lag eit nytt tut",
+  "navigation_bar.direct": "Direktemeldingar",
  "navigation_bar.discover": "Oppdag",
  "navigation_bar.domain_blocks": "Skjulte domene",
  "navigation_bar.edit_profile": "Rediger profil",
-  "navigation_bar.explore": "Utforsk",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favorittar",
  "navigation_bar.filters": "Målbundne ord",
  "navigation_bar.follow_requests": "Fylgjeførespurnader",
@ -337,7 +338,7 @@
  "notifications.column_settings.status": "Nye tuter:",
  "notifications.column_settings.unread_notifications.category": "Unread notifications",
  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Redigeringer:",
+  "notifications.column_settings.update": "Edits:",
  "notifications.filter.all": "Alle",
  "notifications.filter.boosts": "Framhevingar",
  "notifications.filter.favourites": "Favorittar",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Fjern røyst",
  "privacy.change": "Juster status-synlegheit",
  "privacy.direct.long": "Legg berre ut for nemnde brukarar",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direkte",
  "privacy.private.long": "Post kun til følgjarar",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Kun følgjarar",
+  "privacy.public.long": "Post til offentlege tidslinjer",
  "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ikkje post til offentlege tidslinjer",
  "privacy.unlisted.short": "Uoppført",
  "refresh": "Oppdater",
  "regeneration_indicator.label": "Lastar…",
@ -388,28 +389,28 @@
  "relative_time.seconds": "{number}sek",
  "relative_time.today": "i dag",
  "reply_indicator.cancel": "Avbryt",
-  "report.block": "Blokker",
+  "report.block": "Block",
  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.other": "Other",
-  "report.categories.spam": "Søppelpost",
+  "report.categories.spam": "Spam",
  "report.categories.violation": "Content violates one or more server rules",
  "report.category.subtitle": "Choose the best match",
  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "innlegg",
-  "report.close": "Utført",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Vidaresend til {target}",
  "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
-  "report.mute": "Demp",
+  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Neste",
+  "report.next": "Next",
  "report.placeholder": "Tilleggskommentarar",
-  "report.reasons.dislike": "Jeg liker det ikke",
+  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
  "report.reasons.other": "It's something else",
  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "Det er spam",
+  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
@ -514,7 +515,7 @@
  "upload_error.poll": "Filopplasting ikkje tillate med meiningsmålingar.",
  "upload_form.audio_description": "Grei ut for folk med nedsett høyrsel",
  "upload_form.description": "Skildr for synshemja",
-  "upload_form.description_missing": "Ingen beskrivelse lagt til",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Rediger",
  "upload_form.thumbnail": "Bytt miniatyrbilete",
  "upload_form.undo": "Slett",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -18,7 +18,7 @@
  "account.followers": "Følgere",
  "account.followers.empty": "Ingen følger denne brukeren ennå.",
  "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
-  "account.following": "Følger",
+  "account.following": "Following",
  "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
  "account.follows.empty": "Denne brukeren følger ikke noen enda.",
  "account.follows_you": "Følger deg",
@ -41,16 +41,16 @@
  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tuter}}",
  "account.unblock": "Avblokker @{name}",
  "account.unblock_domain": "Vis {domain}",
-  "account.unblock_short": "Opphev blokkering",
+  "account.unblock_short": "Unblock",
  "account.unendorse": "Ikke vis frem på profilen",
  "account.unfollow": "Avfølg",
  "account.unmute": "Avdemp @{name}",
  "account.unmute_notifications": "Vis varsler fra @{name}",
-  "account.unmute_short": "Opphev demping",
+  "account.unmute_short": "Unmute",
  "account_note.placeholder": "Klikk for å legge til et notat",
  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
-  "admin.dashboard.retention.average": "Gjennomsnitt",
+  "admin.dashboard.retention.average": "Average",
  "admin.dashboard.retention.cohort": "Sign-up month",
  "admin.dashboard.retention.cohort_size": "Nye brukere",
  "alert.rate_limited.message": "Vennligst prøv igjen etter kl. {retry_time, time, medium}.",
@ -70,7 +70,7 @@
  "column.blocks": "Blokkerte brukere",
  "column.bookmarks": "Bokmerker",
  "column.community": "Lokal tidslinje",
-  "column.conversations": "Conversations",
+  "column.direct": "Direktemeldinger",
  "column.directory": "Bla gjennom profiler",
  "column.domain_blocks": "Skjulte domener",
  "column.favourites": "Likt",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Kun lokalt",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Kun eksternt",
+  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Lær mer",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Denne tuten blir ikke listet under noen emneknagger da den er ulistet. Kun offentlige tuter kan søktes etter med emneknagg.",
  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
  "compose_form.lock_disclaimer.lock": "låst",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Du har ikke blokkert noen brukere enda.",
  "empty_column.bookmarked_statuses": "Du har ikke bokmerket noen tuter enda. Når du bokmerker en, vil den dukke opp her.",
  "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Du har ingen direktemeldinger enda. Når du mottar eller sender en, vil den dukke opp her.",
  "empty_column.domain_blocks": "Det er ingen skjulte domener enda.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Du har ikke likt noen tuter enda. Når du liker en, vil den dukke opp her.",
@ -187,11 +187,11 @@
  "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
  "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace-en til utklippstavlen",
  "errors.unexpected_crash.report_issue": "Rapporter en feil",
-  "explore.search_results": "Søkeresultater",
-  "explore.suggested_follows": "For deg",
-  "explore.title": "Utforsk",
-  "explore.trending_links": "Nyheter",
-  "explore.trending_statuses": "Innlegg",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Utført",
  "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "å fremheve",
  "keyboard_shortcuts.column": "å fokusere en status i en av kolonnene",
  "keyboard_shortcuts.compose": "å fokusere komponeringsfeltet",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Beskrivelse",
+  "keyboard_shortcuts.direct": "åpne direktemeldingskolonnen",
  "keyboard_shortcuts.down": "for å flytte ned i listen",
  "keyboard_shortcuts.enter": "å åpne status",
  "keyboard_shortcuts.favourite": "for å favorittmarkere",
@ -290,10 +290,11 @@
  "navigation_bar.bookmarks": "Bokmerker",
  "navigation_bar.community_timeline": "Lokal tidslinje",
  "navigation_bar.compose": "Skriv en ny tut",
+  "navigation_bar.direct": "Direktemeldinger",
  "navigation_bar.discover": "Oppdag",
  "navigation_bar.domain_blocks": "Skjulte domener",
  "navigation_bar.edit_profile": "Rediger profil",
-  "navigation_bar.explore": "Utforsk",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favoritter",
  "navigation_bar.filters": "Stilnede ord",
  "navigation_bar.follow_requests": "Følgeforespørsler",
@ -337,7 +338,7 @@
  "notifications.column_settings.status": "Nye tuter:",
  "notifications.column_settings.unread_notifications.category": "Unread notifications",
  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Redigeringer:",
+  "notifications.column_settings.update": "Edits:",
  "notifications.filter.all": "Alle",
  "notifications.filter.boosts": "Fremhevinger",
  "notifications.filter.favourites": "Favoritter",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Fjern avstemningen",
  "privacy.change": "Justér synlighet",
  "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direkte",
  "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Privat",
+  "privacy.public.long": "Post kun til offentlige tidslinjer",
  "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
  "privacy.unlisted.short": "Uoppført",
  "refresh": "Oppfrisk",
  "regeneration_indicator.label": "Laster…",
@ -388,28 +389,28 @@
  "relative_time.seconds": "{number}s",
  "relative_time.today": "i dag",
  "reply_indicator.cancel": "Avbryt",
-  "report.block": "Blokker",
+  "report.block": "Block",
  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.other": "Other",
-  "report.categories.spam": "Søppelpost",
+  "report.categories.spam": "Spam",
  "report.categories.violation": "Content violates one or more server rules",
  "report.category.subtitle": "Choose the best match",
  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "innlegg",
-  "report.close": "Utført",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Videresend til {target}",
  "report.forward_hint": "Denne kontoen er fra en annen tjener. Vil du sende en anonymisert kopi av rapporten dit også?",
-  "report.mute": "Demp",
+  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Neste",
+  "report.next": "Next",
  "report.placeholder": "Tilleggskommentarer",
-  "report.reasons.dislike": "Jeg liker det ikke",
+  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
  "report.reasons.other": "It's something else",
  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "Det er spam",
+  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
@ -514,7 +515,7 @@
  "upload_error.poll": "Filopplasting inni avstemninger er ikke tillatt.",
  "upload_form.audio_description": "Beskriv det for folk med hørselstap",
  "upload_form.description": "Beskriv for synshemmede",
-  "upload_form.description_missing": "Ingen beskrivelse lagt til",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Rediger",
  "upload_form.thumbnail": "Endre miniatyrbilde",
  "upload_form.undo": "Angre",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -70,7 +70,7 @@
  "column.blocks": "Personas blocadas",
  "column.bookmarks": "Marcadors",
  "column.community": "Flux public local",
-  "column.conversations": "Conversations",
+  "column.direct": "Messatges dirèctes",
  "column.directory": "Percórrer los perfils",
  "column.domain_blocks": "Domenis resconduts",
  "column.favourites": "Favorits",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Sonque local",
  "community.column_settings.media_only": "Solament los mèdias",
  "community.column_settings.remote_only": "Sonque alonhat",
+  "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.",
  "compose_form.direct_message_warning_learn_more": "Ne saber mai",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.",
  "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
  "compose_form.lock_disclaimer.lock": "clavat",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Avètz pas blocat degun pel moment.",
  "empty_column.bookmarked_statuses": "Avètz pas cap de tuts marcats pel moment. Quand ne marquetz un, serà mostrat aquí.",
  "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Avètz pas encara cap de messatges. Quand ne mandatz un o que ne recebètz un, serà mostrat aquí.",
  "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Avètz pas encara cap de tut favorit. Quand n’auretz un, apareisserà aquí.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "partejar",
  "keyboard_shortcuts.column": "centrar un estatut a una colomna",
  "keyboard_shortcuts.compose": "anar al camp tèxte",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "descripcion",
+  "keyboard_shortcuts.direct": "dobrir la colomna de messatges dirèctes",
  "keyboard_shortcuts.down": "far davalar dins la lista",
  "keyboard_shortcuts.enter": "dobrir los estatuts",
  "keyboard_shortcuts.favourite": "apondre als favorits",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcadors",
  "navigation_bar.community_timeline": "Flux public local",
  "navigation_bar.compose": "Escriure un nòu tut",
+  "navigation_bar.direct": "Messatges dirèctes",
  "navigation_bar.discover": "Trobar",
  "navigation_bar.domain_blocks": "Domenis resconduts",
  "navigation_bar.edit_profile": "Modificar lo perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Levar lo sondatge",
  "privacy.change": "Ajustar la confidencialitat del messatge",
  "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Dirècte",
  "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Privat",
+  "privacy.public.long": "Mostrar dins los fluxes publics",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
  "privacy.unlisted.short": "Pas-listat",
  "refresh": "Actualizar",
  "regeneration_indicator.label": "Cargament…",
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@ -70,7 +70,7 @@
  "column.blocks": "Blocked users",
  "column.bookmarks": "Bookmarks",
  "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
  "column.domain_blocks": "Blocked domains",
  "column.favourites": "Favourites",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "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.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
  "compose_form.lock_disclaimer.lock": "locked",
@ -166,7 +166,7 @@
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
  "empty_column.domain_blocks": "There are no blocked domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Visible for followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -48,8 +48,8 @@
  "account.unmute_notifications": "Cofnij wyciszenie powiadomień od @{name}",
  "account.unmute_short": "Włącz dźwięki",
  "account_note.placeholder": "Naciśnij aby dodać notatkę",
-  "admin.dashboard.daily_retention": "Wskaźnik utrzymania użytkowników po dniach od rejestracji",
-  "admin.dashboard.monthly_retention": "Wskaźnik utrzymania użytkowników po miesiącach od rejestracji",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
  "admin.dashboard.retention.average": "Średnia",
  "admin.dashboard.retention.cohort": "Miesiąc rejestracji",
  "admin.dashboard.retention.cohort_size": "Nowi użytkownicy",
@ -70,7 +70,7 @@
  "column.blocks": "Zablokowani użytkownicy",
  "column.bookmarks": "Zakładki",
  "column.community": "Lokalna oś czasu",
-  "column.conversations": "Konwersacje",
+  "column.direct": "Wiadomości bezpośrednie",
  "column.directory": "Przeglądaj profile",
  "column.domain_blocks": "Ukryte domeny",
  "column.favourites": "Ulubione",
@ -92,9 +92,9 @@
  "community.column_settings.local_only": "Tylko Lokalne",
  "community.column_settings.media_only": "Tylko zawartość multimedialna",
  "community.column_settings.remote_only": "Tylko Zdalne",
+  "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.",
  "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej",
-  "compose_form.encryption_warning": "Posty na Mastodon nie są szyfrowane end-to-end. Nie udostępniaj żadnych wrażliwych informacji przez Mastodon.",
-  "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hasztagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hasztagów.",
+  "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.",
  "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.",
  "compose_form.lock_disclaimer.lock": "zablokowane",
  "compose_form.placeholder": "Co Ci chodzi po głowie?",
@ -166,14 +166,14 @@
  "empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
  "empty_column.bookmarked_statuses": "Nie dodałeś(-aś) żadnego wpisu do zakładek. Kiedy to zrobisz, pojawi się on tutaj.",
  "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
-  "empty_column.conversations": "Gdy wyślesz lub otrzymasz wpis, który jest widoczny tylko dla osób w nim wymienionych, pojawi się on tutaj.",
+  "empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
  "empty_column.domain_blocks": "Brak ukrytych domen.",
-  "empty_column.explore_statuses": "Nic nie jest w tej chwili popularne. Sprawdź później!",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Nie dodałeś(-aś) żadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.",
  "empty_column.favourites": "Nikt nie dodał tego wpisu do ulubionych. Gdy ktoś to zrobi, pojawi się tutaj.",
-  "empty_column.follow_recommendations": "Wygląda na to, że nie można wygenerować dla Ciebie żadnych sugestii. Możesz spróbować wyszukać osoby, które znasz, lub przeglądać popularne hasztagi.",
+  "empty_column.follow_recommendations": "Wygląda na to, że nie można wygenerować dla Ciebie żadnych sugestii. Możesz spróbować wyszukać osoby, które znasz, lub przeglądać popularne hashtagi.",
  "empty_column.follow_requests": "Nie masz żadnych próśb o możliwość śledzenia. Kiedy ktoś utworzy ją, pojawi się tutaj.",
-  "empty_column.hashtag": "Nie ma wpisów oznaczonych tym hasztagiem. Możesz napisać pierwszy(-a).",
+  "empty_column.hashtag": "Nie ma wpisów oznaczonych tym hashtagiem. Możesz napisać pierwszy(-a)!",
  "empty_column.home": "Nie śledzisz nikogo. Odwiedź globalną oś czasu lub użyj wyszukiwarki, aby znaleźć interesujące Cię profile.",
  "empty_column.home.suggestions": "Zobacz kilka sugestii",
  "empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
@ -187,12 +187,12 @@
  "error.unexpected_crash.next_steps_addons": "Spróbuj je wyłączyć lub odświeżyć stronę. Jeśli to nie pomoże, możesz wciąż korzystać z Mastodona w innej przeglądarce lub natywnej aplikacji.",
  "errors.unexpected_crash.copy_stacktrace": "Skopiuj ślad stosu do schowka",
  "errors.unexpected_crash.report_issue": "Zgłoś problem",
-  "explore.search_results": "Wyniki wyszukiwania",
-  "explore.suggested_follows": "Dla ciebie",
-  "explore.title": "Odkrywaj",
-  "explore.trending_links": "Aktualności",
-  "explore.trending_statuses": "Posty",
-  "explore.trending_tags": "Hasztagi",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Gotowe",
  "follow_recommendations.heading": "Śledź ludzi, których wpisy chcesz czytać. Oto kilka propozycji.",
  "follow_recommendations.lead": "Wpisy osób, które śledzisz będą pojawiać się w porządku chronologicznym na stronie głównej. Nie bój się popełniać błędów, możesz bez problemu przestać śledzić każdego w każdej chwili!",
@ -212,7 +212,7 @@
  "hashtag.column_header.tag_mode.any": "lub {additional}",
  "hashtag.column_header.tag_mode.none": "bez {additional}",
  "hashtag.column_settings.select.no_options_message": "Nie odnaleziono sugestii",
-  "hashtag.column_settings.select.placeholder": "Wprowadź hasztagi…",
+  "hashtag.column_settings.select.placeholder": "Wprowadź hashtagi…",
  "hashtag.column_settings.tag_mode.all": "Wszystkie",
  "hashtag.column_settings.tag_mode.any": "Dowolne",
  "hashtag.column_settings.tag_mode.none": "Żadne",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "aby podbić wpis",
  "keyboard_shortcuts.column": "aby przejść do wpisu z jednej z kolumn",
  "keyboard_shortcuts.compose": "aby przejść do pola tworzenia wpisu",
-  "keyboard_shortcuts.conversations": "aby otworzyć kolumnę konwersacji",
  "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "aby otworzyć kolumnę wiadomości bezpośrednich",
  "keyboard_shortcuts.down": "aby przejść na dół listy",
  "keyboard_shortcuts.enter": "aby otworzyć wpis",
  "keyboard_shortcuts.favourite": "aby dodać do ulubionych",
@ -290,10 +290,11 @@
  "navigation_bar.bookmarks": "Zakładki",
  "navigation_bar.community_timeline": "Lokalna oś czasu",
  "navigation_bar.compose": "Utwórz nowy wpis",
+  "navigation_bar.direct": "Wiadomości bezpośrednie",
  "navigation_bar.discover": "Odkrywaj",
  "navigation_bar.domain_blocks": "Ukryte domeny",
  "navigation_bar.edit_profile": "Edytuj profil",
-  "navigation_bar.explore": "Odkrywaj",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Ulubione",
  "navigation_bar.filters": "Wyciszone słowa",
  "navigation_bar.follow_requests": "Prośby o śledzenie",
@ -308,7 +309,7 @@
  "navigation_bar.preferences": "Preferencje",
  "navigation_bar.public_timeline": "Globalna oś czasu",
  "navigation_bar.security": "Bezpieczeństwo",
-  "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
+  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
  "notification.follow": "{name} zaczął(-ęła) Cię śledzić",
  "notification.follow_request": "{name} poprosił(a) o możliwość śledzenia Cię",
@ -320,7 +321,7 @@
  "notification.update": "{name} edytował post",
  "notifications.clear": "Wyczyść powiadomienia",
  "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
-  "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
  "notifications.column_settings.alert": "Powiadomienia na pulpicie",
  "notifications.column_settings.favourite": "Dodanie do ulubionych:",
  "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Usuń głosowanie",
  "privacy.change": "Dostosuj widoczność wpisów",
  "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspominane osoby",
+  "privacy.direct.short": "Bezpośrednio",
  "privacy.private.long": "Widoczny tylko dla osób, które Cię śledzą",
-  "privacy.private.short": "Tylko śledzący",
-  "privacy.public.long": "Widoczne dla każdego",
+  "privacy.private.short": "Tylko dla śledzących",
+  "privacy.public.long": "Widoczny na publicznych osiach czasu",
  "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
+  "privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu",
  "privacy.unlisted.short": "Niewidoczny",
  "refresh": "Odśwież",
  "regeneration_indicator.label": "Ładuję…",
@ -388,54 +389,54 @@
  "relative_time.seconds": "{number} s.",
  "relative_time.today": "dzisiaj",
  "reply_indicator.cancel": "Anuluj",
-  "report.block": "Zablokuj",
-  "report.block_explanation": "Nie zobaczysz ich postów. Nie będą mogli zobaczyć Twoich postów ani cię śledzić. Będą mogli domyślić się, że są zablokowani.",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.other": "Inne",
  "report.categories.spam": "Spam",
  "report.categories.violation": "Zawartość narusza co najmniej jedną zasadę serwera",
-  "report.category.subtitle": "Wybierz najbardziej pasującą opcję",
-  "report.category.title": "Powiedz, co się dzieje z tym {type}",
-  "report.category.title_account": "profil",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
  "report.category.title_status": "post",
-  "report.close": "Gotowe",
-  "report.comment.title": "Czy jest jeszcze coś, co uważasz, że powinniśmy wiedzieć?",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
  "report.forward": "Przekaż na {target}",
  "report.forward_hint": "To konto znajduje się na innej instancji. Czy chcesz wysłać anonimową kopię zgłoszenia rnież na nią?",
-  "report.mute": "Wycisz",
-  "report.mute_explanation": "Nie zobaczysz ich wpisów. Mimo to będą mogli wciąż śledzić cię i widzieć twoje wpisy, ale nie będą widzieli, że są wyciszeni.",
-  "report.next": "Dalej",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
  "report.placeholder": "Dodatkowe komentarze",
-  "report.reasons.dislike": "Nie podoba mi się to",
-  "report.reasons.dislike_description": "Nie jest to coś, co chciałoby się zobaczyć",
-  "report.reasons.other": "Coś innego",
-  "report.reasons.other_description": "Zgłoszenie nie pasuje do żadnej z pozostałych kategorii",
-  "report.reasons.spam": "To spam",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Niebezpieczne linki, fałszywe zaangażowanie lub powtarzające się odpowiedzi",
-  "report.reasons.violation": "Narusza to zasady serwera",
-  "report.reasons.violation_description": "Zdajesz sobie sprawę, że narusza to szczególne zasady",
-  "report.rules.subtitle": "Wybierz wszystkie pasujące",
-  "report.rules.title": "Które zasady zostały złamane?",
-  "report.statuses.subtitle": "Wybierz wszystkie pasujące",
-  "report.statuses.title": "Czy są jakieś wpisy, które obrazują opisany w zgłoszeniu problem?",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
  "report.submit": "Wyślij",
  "report.target": "Zgłaszanie {target}",
-  "report.thanks.take_action": "Oto opcje, dzięki którym możesz kontrolować, co widzisz na Mastodon:",
-  "report.thanks.take_action_actionable": "W trakcie jak będziemy się przyglądać tej sprawie, możesz podjąć akcje przeciwko @{name}:",
-  "report.thanks.title": "Nie chcesz tego widzieć?",
-  "report.thanks.title_actionable": "Dziękujemy za zgłoszenie. Przyjrzymy się tej sprawie.",
-  "report.unfollow": "Przestań śledzić @{name}",
-  "report.unfollow_explanation": "Śledzisz to konto. Jeśli nie chcesz już widzieć postów z tego konta w swojej głównej osi czasu, przestań je śledzić.",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
  "search.placeholder": "Szukaj",
  "search_popout.search_format": "Zaawansowane wyszukiwanie",
  "search_popout.tips.full_text": "Pozwala na wyszukiwanie wpisów które napisałeś(-aś), dodałeś(-aś) do ulubionych lub podbiłeś(-aś), w których o Tobie wspomniano, oraz pasujące nazwy użytkowników, pełne nazwy i hashtagi.",
  "search_popout.tips.hashtag": "hasztag",
  "search_popout.tips.status": "wpis",
-  "search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hasztagów",
+  "search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hashtagów",
  "search_popout.tips.user": "użytkownik",
  "search_results.accounts": "Ludzie",
-  "search_results.all": "Wszystkie",
-  "search_results.hashtags": "Hasztagi",
-  "search_results.nothing_found": "Nie znaleziono innych wyników dla tego wyszukania",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtagi",
+  "search_results.nothing_found": "Could not find anything for these search terms",
  "search_results.statuses": "Wpisy",
  "search_results.statuses_fts_disabled": "Szukanie wpisów przy pomocy ich zawartości nie jest włączone na tym serwerze Mastodona.",
  "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
@ -451,12 +452,12 @@
  "status.direct": "Wyślij wiadomość bezpośrednią do @{name}",
  "status.edit": "Edytuj",
  "status.edited": "Edytowano {date}",
-  "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
  "status.embed": "Osadź",
  "status.favourite": "Dodaj do ulubionych",
  "status.filtered": "Filtrowany(-a)",
-  "status.history.created": "{name} utworzył(a) {date}",
-  "status.history.edited": "{name} edytował(a) {date}",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
  "status.load_more": "Załaduj więcej",
  "status.media_hidden": "Zawartość multimedialna ukryta",
  "status.mention": "Wspomnij o @{name}",
@ -514,7 +515,7 @@
  "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
  "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
  "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
-  "upload_form.description_missing": "Nie dodano opisu",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Edytuj",
  "upload_form.thumbnail": "Zmień miniaturę",
  "upload_form.undo": "Usuń",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -70,7 +70,7 @@
  "column.blocks": "Usuários bloqueados",
  "column.bookmarks": "Salvos",
  "column.community": "Linha local",
-  "column.conversations": "Conversations",
+  "column.direct": "Toots Diretos",
  "column.directory": "Explorar perfis",
  "column.domain_blocks": "Domínios bloqueados",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Somente local",
  "community.column_settings.media_only": "Somente mídia",
  "community.column_settings.remote_only": "Somente global",
+  "compose_form.direct_message_warning": "Este toot só será enviado aos usuários mencionados.",
  "compose_form.direct_message_warning_learn_more": "Saiba mais",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Este toot não aparecerá em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.",
  "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
  "compose_form.lock_disclaimer.lock": "trancado",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Nada aqui.",
  "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
  "empty_column.community": "A linha local está vazia. Publique algo para começar!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Nada aqui. Quando você enviar ou receber toots diretos, eles aparecerão aqui.",
  "empty_column.domain_blocks": "Nada aqui.",
  "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!",
  "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.",
@ -190,7 +190,7 @@
  "explore.search_results": "Resultado da pesquisa",
  "explore.suggested_follows": "Para você",
  "explore.title": "Explorar",
-  "explore.trending_links": "Notícias",
+  "explore.trending_links": "Novidades",
  "explore.trending_statuses": "Posts",
  "explore.trending_tags": "Hashtags",
  "follow_recommendations.done": "Salvar",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "dar boost",
  "keyboard_shortcuts.column": "focar na coluna",
  "keyboard_shortcuts.compose": "focar no compositor",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Descrição",
+  "keyboard_shortcuts.direct": "abrir toots diretos",
  "keyboard_shortcuts.down": "mover para baixo",
  "keyboard_shortcuts.enter": "abrir toot",
  "keyboard_shortcuts.favourite": "favoritar toot",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Salvos",
  "navigation_bar.community_timeline": "Linha do tempo local",
  "navigation_bar.compose": "Compor novo toot",
+  "navigation_bar.direct": "Toots diretos",
  "navigation_bar.discover": "Descobrir",
  "navigation_bar.domain_blocks": "Domínios bloqueados",
  "navigation_bar.edit_profile": "Editar perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remover enquete",
  "privacy.change": "Alterar privacidade do toot",
  "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direto",
  "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Privado",
+  "privacy.public.long": "Postar em linhas públicas",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Não postar em linhas públicas",
  "privacy.unlisted.short": "Não-listado",
  "refresh": "Atualizar",
  "regeneration_indicator.label": "Carregando…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
  "upload_form.audio_description": "Descrever para deficientes auditivos",
  "upload_form.description": "Descrever para deficientes visuais",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Alterar miniatura",
  "upload_form.undo": "Excluir",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@ -70,7 +70,7 @@
  "column.blocks": "Utilizadores Bloqueados",
  "column.bookmarks": "Itens salvos",
  "column.community": "Cronologia local",
-  "column.conversations": "Conversações",
+  "column.direct": "Mensagens diretas",
  "column.directory": "Procurar perfis",
  "column.domain_blocks": "Domínios escondidos",
  "column.favourites": "Favoritos",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Local apenas",
  "community.column_settings.media_only": "Somente media",
  "community.column_settings.remote_only": "Remoto apenas",
+  "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
  "compose_form.direct_message_warning_learn_more": "Conhecer mais",
-  "compose_form.encryption_warning": "As publicações no Mastodon não são criptografadas de ponta a ponta. Não partilhe nenhuma informação sensível através do Mastodon.",
  "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
  "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
  "compose_form.lock_disclaimer.lock": "bloqueado",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
  "empty_column.bookmarked_statuses": "Ainda não adicionou nenhum toot aos Itens salvos. Quando adicionar, eles serão exibidos aqui.",
  "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
-  "empty_column.conversations": "Quando enviar ou receber uma publicação que seja visível apenas para as pessoas nela mencionadas, ela aparecerá aqui.",
+  "empty_column.direct": "Ainda não tem qualquer mensagem direta. Quando enviar ou receber alguma, ela irá aparecer aqui.",
  "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
  "empty_column.explore_statuses": "Nada em destaque por agora. Volte mais tarde!",
  "empty_column.favourited_statuses": "Ainda não tens quaisquer toots favoritos. Quando tiveres algum, ele irá aparecer aqui.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "para partilhar",
  "keyboard_shortcuts.column": "para focar uma publicação numa das colunas",
  "keyboard_shortcuts.compose": "para focar na área de publicação",
-  "keyboard_shortcuts.conversations": "para abrir a coluna de conversações",
  "keyboard_shortcuts.description": "Descrição",
+  "keyboard_shortcuts.direct": "para abrir a coluna das mensagens diretas",
  "keyboard_shortcuts.down": "para mover para baixo na lista",
  "keyboard_shortcuts.enter": "para expandir uma publicação",
  "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Itens salvos",
  "navigation_bar.community_timeline": "Cronologia local",
  "navigation_bar.compose": "Escrever novo toot",
+  "navigation_bar.direct": "Mensagens diretas",
  "navigation_bar.discover": "Descobrir",
  "navigation_bar.domain_blocks": "Domínios escondidos",
  "navigation_bar.edit_profile": "Editar perfil",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Remover votação",
  "privacy.change": "Ajustar a privacidade da publicação",
  "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas que menciono",
+  "privacy.direct.short": "Directo",
  "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.private.short": "Privado",
+  "privacy.public.long": "Publicar em todos os feeds",
  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
+  "privacy.unlisted.long": "Não publicar nos feeds públicos",
  "privacy.unlisted.short": "Não listar",
  "refresh": "Actualizar",
  "regeneration_indicator.label": "A carregar…",
@ -514,7 +515,7 @@
  "upload_error.poll": "Carregamento de ficheiros não é permitido em votações.",
  "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
  "upload_form.description": "Descrição da imagem para pessoas com dificuldades visuais",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Alterar miniatura",
  "upload_form.undo": "Eliminar",
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@ -70,7 +70,7 @@
  "column.blocks": "Utilizatori blocați",
  "column.bookmarks": "Marcaje",
  "column.community": "Cronologie locală",
-  "column.conversations": "Conversations",
+  "column.direct": "Mesaje directe",
  "column.directory": "Explorează profiluri",
  "column.domain_blocks": "Domenii blocate",
  "column.favourites": "Favorite",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Doar local",
  "community.column_settings.media_only": "Doar media",
  "community.column_settings.remote_only": "Doar la distanţă",
+  "compose_form.direct_message_warning": "Această postare va fi trimisă doar utilizatorilor menționați.",
  "compose_form.direct_message_warning_learn_more": "Află mai multe",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "Această postare nu va fi listată sub niciun hashtag deoarece este nelistată. Doar postările publice pot fi căutate cu un hashtag.",
  "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
  "compose_form.lock_disclaimer.lock": "privat",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Momentan nu ai blocat niciun utilizator.",
  "empty_column.bookmarked_statuses": "Momentan nu ai nicio postare marcată. Când vei marca una, va apărea aici.",
  "empty_column.community": "Nu există nimic în cronologia locală. Postează ceva public pentru a sparge gheața!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Momentan nu ai niciun mesaj direct. Când trimiți sau primești un mesaj, va apărea aici.",
  "empty_column.domain_blocks": "Momentan nu există domenii blocate.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "Momentan nu ai nicio postare favorită. Când vei adăuga una, va apărea aici.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "Distribuie postarea",
  "keyboard_shortcuts.column": "Focalizează pe coloană",
  "keyboard_shortcuts.compose": "Focalizează pe zona de text",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Descriere",
+  "keyboard_shortcuts.direct": "Deschide coloana de mesaje directe",
  "keyboard_shortcuts.down": "Coboară în listă",
  "keyboard_shortcuts.enter": "Deschide postarea",
  "keyboard_shortcuts.favourite": "Adaugă postarea la favorite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Marcaje",
  "navigation_bar.community_timeline": "Cronologie locală",
  "navigation_bar.compose": "Compune o nouă postare",
+  "navigation_bar.direct": "Mesaje directe",
  "navigation_bar.discover": "Descoperă",
  "navigation_bar.domain_blocks": "Domenii blocate",
  "navigation_bar.edit_profile": "Modifică profilul",
@ -368,10 +369,10 @@
  "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Doar abonați",
+  "privacy.public.long": "Vizibil pentru toți, afișat în cronologiile publice",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Vizibil pentru toți, dar nu și în cronologiile publice",
  "privacy.unlisted.short": "Nelistat",
  "refresh": "Reîncarcă",
  "regeneration_indicator.label": "Se încarcă…",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@ -70,7 +70,7 @@
  "column.blocks": "Заблокированные пользователи",
  "column.bookmarks": "Закладки",
  "column.community": "Локальная лента",
-  "column.conversations": "Диалоги",
+  "column.direct": "Личные сообщения",
  "column.directory": "Просмотр профилей",
  "column.domain_blocks": "Заблокированные домены",
  "column.favourites": "Избранное",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "Только локальные",
  "community.column_settings.media_only": "Только с медиафайлами",
  "community.column_settings.remote_only": "Только удалённые",
+  "compose_form.direct_message_warning": "Адресованные посты отправляются и видны только упомянутым в них пользователям.",
  "compose_form.direct_message_warning_learn_more": "Подробнее",
-  "compose_form.encryption_warning": "Посты в Mastodon не защищены сквозным шифрованием. Не делитесь потенциально опасной информацией.",
  "compose_form.hashtag_warning": "Так как этот пост не публичный, он не отобразится в поиске по хэштегам.",
  "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
  "compose_form.lock_disclaimer.lock": "не закрыта",
@ -166,7 +166,7 @@
  "empty_column.blocks": "Вы ещё никого не заблокировали.",
  "empty_column.bookmarked_statuses": "У вас пока нет постов в закладках. Как добавите один, он отобразится здесь.",
  "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
-  "empty_column.conversations": "Здесь отображаются адресованные посты. Как только вы отправите или получите один, он отобразится здесь.",
+  "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
  "empty_column.domain_blocks": "Скрытых доменов пока нет.",
  "empty_column.explore_statuses": "Нет актуального. Проверьте позже!",
  "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "продвинуть пост",
  "keyboard_shortcuts.column": "фокус на одном из столбцов",
  "keyboard_shortcuts.compose": "фокус на поле ввода",
-  "keyboard_shortcuts.conversations": "открыть колонку диалогов",
  "keyboard_shortcuts.description": "Описание",
+  "keyboard_shortcuts.direct": "чтобы показать колонку личных сообщений",
  "keyboard_shortcuts.down": "вниз по списку",
  "keyboard_shortcuts.enter": "открыть пост",
  "keyboard_shortcuts.favourite": "в избранное",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Закладки",
  "navigation_bar.community_timeline": "Локальная лента",
  "navigation_bar.compose": "Создать новый пост",
+  "navigation_bar.direct": "Личные сообщения",
  "navigation_bar.discover": "Изучайте",
  "navigation_bar.domain_blocks": "Скрытые домены",
  "navigation_bar.edit_profile": "Изменить профиль",
@ -366,12 +367,12 @@
  "poll_button.remove_poll": "Удалить опрос",
  "privacy.change": "Изменить видимость поста",
  "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Для упомянутых",
+  "privacy.direct.short": "Адресованный",
  "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Виден всем",
+  "privacy.private.short": "Приватный",
+  "privacy.public.long": "Показать в публичных лентах",
  "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
+  "privacy.unlisted.long": "Не показывать в публичных лентах",
  "privacy.unlisted.short": "Скрытый",
  "refresh": "Обновить",
  "regeneration_indicator.label": "Загрузка…",
@ -435,7 +436,7 @@
  "search_results.accounts": "Люди",
  "search_results.all": "Все",
  "search_results.hashtags": "Хэштеги",
-  "search_results.nothing_found": "Ничего не найдено по этому запросу",
+  "search_results.nothing_found": "Could not find anything for these search terms",
  "search_results.statuses": "Посты",
  "search_results.statuses_fts_disabled": "Поиск постов по их содержанию не поддерживается данным сервером Mastodon.",
  "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
@ -514,7 +515,7 @@
  "upload_error.poll": "К опросам нельзя прикреплять файлы.",
  "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
  "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
-  "upload_form.description_missing": "Описание не добавлено",
+  "upload_form.description_missing": "No description added",
  "upload_form.edit": "Изменить",
  "upload_form.thumbnail": "Изменить обложку",
  "upload_form.undo": "Отменить",
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@ -70,7 +70,7 @@
  "column.blocks": "निषिद्धभोक्तारः",
  "column.bookmarks": "पुटचिह्नानि",
  "column.community": "स्थानीयसमयतालिका",
-  "column.conversations": "Conversations",
+  "column.direct": "प्रत्यक्षसन्देशाः",
  "column.directory": "व्यक्तित्वानि दृश्यन्ताम्",
  "column.domain_blocks": "निषिद्धप्रदेशाः",
  "column.favourites": "प्रियाः",
@ -92,8 +92,8 @@
  "community.column_settings.local_only": "केवलं स्थानीयम्",
  "community.column_settings.media_only": "सामग्री केवलम्",
  "community.column_settings.remote_only": "दर्गमः केवलम्",
+  "compose_form.direct_message_warning": "दौत्यमेतत्केवलमुल्लेखितजनानां कृते वर्तते",
  "compose_form.direct_message_warning_learn_more": "अधिकं ज्ञायताम्",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
  "compose_form.hashtag_warning": "न कस्मिन्नपि प्रचलितवस्तुषु सूचितमिदं दौत्यम् । केवलं सार्वजनिकदौत्यानि प्रचलितवस्तुचिह्नेन अन्वेषयितुं शक्यते ।",
  "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि दौत्यानि द्रष्टुं शक्नोति ।",
  "compose_form.lock_disclaimer.lock": "अवरुद्धः",
@ -166,7 +166,7 @@
  "empty_column.blocks": "नैकोऽप्युपभोक्ता निषिद्धो वर्तते",
  "empty_column.bookmarked_statuses": "नैकमपि पुटचिह्नयुक्तदौत्यानि सन्ति । यदा भविष्यति तदत्र दृश्यते ।",
  "empty_column.community": "स्थानीयसमयतालिका रिक्ता । सार्वजनिकत्वेनाऽत्र किमपि लिख्यताम् ।",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "नैकोऽपि प्रत्यक्षसन्देशो वर्तते । यदा प्रेष्यते वा प्राप्यतेऽत्र दृश्यते",
  "empty_column.domain_blocks": "न निषिद्धप्रदेशाः सन्ति ।",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "न प्रियदौत्यानि सन्ति । यदा प्रीतिरित्यङ्क्यतेऽत्र दृश्यते ।",
@ -230,8 +230,8 @@
  "keyboard_shortcuts.boost": "to boost",
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
  "keyboard_shortcuts.down": "to move down in the list",
  "keyboard_shortcuts.enter": "to open status",
  "keyboard_shortcuts.favourite": "to favourite",
@ -290,6 +290,7 @@
  "navigation_bar.bookmarks": "Bookmarks",
  "navigation_bar.community_timeline": "Local timeline",
  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.edit_profile": "Edit profile",
@ -369,9 +370,9 @@
  "privacy.direct.short": "Direct",
  "privacy.private.long": "Visible for followers only",
  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Claire	c216d3a885	Fix crash in alias settings page (#18004 ) (cherry picked from commit `dc50347247`)	2022-04-27 12:54:10 +02:00
778a69cd	b4865749c6	Customize Content of the tagline, set custom CSS properties	2022-04-09 02:11:43 +02:00
778a69cd	5651d6d8e4	Warn users that emails can be late	2022-04-09 02:11:43 +02:00
778a69cd	56aa6b5590	Notify users about valid usernames	2022-04-09 02:11:43 +02:00
778a69cd	c5ed892578	use custom links.potsda.mn logo	2022-04-09 02:11:43 +02:00