From 0e0a94f4839322e6eaf805c06865bc4c89886388 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 03:53:44 -0500
Subject: [PATCH 01/43] Handle CLI failure exit status at the top-level script
 (#28322)

---
 .rubocop.yml                                  |   3 +-
 bin/tootctl                                   |   7 +-
 lib/mastodon/cli/accounts.rb                  | 152 +++++-------------
 lib/mastodon/cli/base.rb                      |   4 +
 lib/mastodon/cli/cache.rb                     |   3 +-
 lib/mastodon/cli/domains.rb                   |   6 +-
 lib/mastodon/cli/email_domain_blocks.rb       |  10 +-
 lib/mastodon/cli/emoji.rb                     |  10 +-
 lib/mastodon/cli/federation.rb                |  16 +-
 lib/mastodon/cli/feeds.rb                     |   8 +-
 lib/mastodon/cli/ip_blocks.rb                 |  10 +-
 lib/mastodon/cli/maintenance.rb               |  16 +-
 lib/mastodon/cli/media.rb                     |  47 ++----
 lib/mastodon/cli/progress_helper.rb           |   5 +-
 lib/mastodon/cli/search.rb                    |  10 +-
 lib/mastodon/cli/statuses.rb                  |   5 +-
 lib/mastodon/cli/upgrade.rb                   |   6 +-
 spec/lib/mastodon/cli/accounts_spec.rb        |  90 ++++-------
 spec/lib/mastodon/cli/cache_spec.rb           |   3 +-
 .../mastodon/cli/email_domain_blocks_spec.rb  |   6 +-
 spec/lib/mastodon/cli/feeds_spec.rb           |   3 +-
 spec/lib/mastodon/cli/ip_blocks_spec.rb       |   6 +-
 spec/lib/mastodon/cli/main_spec.rb            |   6 +-
 spec/lib/mastodon/cli/maintenance_spec.rb     |   8 +-
 spec/lib/mastodon/cli/media_spec.rb           |  21 +--
 spec/lib/mastodon/cli/search_spec.rb          |   6 +-
 spec/lib/mastodon/cli/statuses_spec.rb        |   3 +-
 27 files changed, 150 insertions(+), 320 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 64021b4cec9dc4..69989411443558 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,12 +96,11 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed in `tootctl` CLI code and in boot ENV checker
+# Reason: Allowed in boot ENV checker
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
 Rails/Exit:
   Exclude:
     - 'config/boot.rb'
-    - 'lib/mastodon/cli/*.rb'
 
 # Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
diff --git a/bin/tootctl b/bin/tootctl
index b3311c6b2a391f..ff64eb2e42c6e4 100755
--- a/bin/tootctl
+++ b/bin/tootctl
@@ -6,8 +6,13 @@ require_relative '../lib/mastodon/cli/main'
 
 begin
   Chewy.strategy(:mastodon) do
-    Mastodon::CLI::Main.start(ARGV)
+    Mastodon::CLI::Main.start(ARGV, debug: true) # Enables the script to rescue `Thor::Error`
   end
+rescue Thor::Error => e
+  Thor::Shell::Color
+    .new
+    .say_error(e.message, :red)
+  exit(1)
 rescue Interrupt
   exit(130)
 end
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 9dc65c1477d8fd..b5308e2b7625ac 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -39,8 +39,7 @@ def rotate(username = nil)
         rotate_keys_for_account(Account.find_local(username))
         say('OK', :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -74,10 +73,7 @@ def create(username)
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         role_id = role.id
       end
@@ -114,7 +110,6 @@ def create(username)
         say("New password: #{password}")
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -152,18 +147,12 @@ def create(username)
     def modify(username)
       user = Account.find_local(username)&.user
 
-      if user.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if user.nil?
 
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         user.role_id = role.id
       elsif options[:remove_role]
@@ -185,7 +174,6 @@ def modify(username)
         say("New password: #{password}") if options[:reset_password]
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -200,27 +188,19 @@ def modify(username)
     LONG_DESC
     def delete(username = nil)
       if username.present? && options[:email].present?
-        say('Use username or --email, not both', :red)
-        exit(1)
+        fail_with_message  'Use username or --email, not both'
       elsif username.blank? && options[:email].blank?
-        say('No username provided', :red)
-        exit(1)
+        fail_with_message 'No username provided'
       end
 
       account = nil
 
       if username.present?
         account = Account.find_local(username)
-        if account.nil?
-          say('No user with such username', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such username' if account.nil?
       else
         account = Account.left_joins(:user).find_by(user: { email: options[:email] })
-        if account.nil?
-          say('No user with such email', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such email' if account.nil?
       end
 
       say("Deleting user with #{account.statuses_count} statuses, this might take a while...#{dry_run_mode_suffix}")
@@ -243,23 +223,18 @@ def merge(from_acct, to_acct)
       username, domain = from_acct.split('@')
       from_account = Account.find_remote(username, domain)
 
-      if from_account.nil? || from_account.local?
-        say("No such account (#{from_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{from_acct})" if from_account.nil? || from_account.local?
 
       username, domain = to_acct.split('@')
       to_account = Account.find_remote(username, domain)
 
-      if to_account.nil? || to_account.local?
-        say("No such account (#{to_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{to_acct})" if to_account.nil? || to_account.local?
 
       if from_account.public_key != to_account.public_key && !options[:force]
-        say("Accounts don't have the same public key, might not be duplicates!", :red)
-        say('Override with --force', :red)
-        exit(1)
+        fail_with_message <<~ERROR
+          Accounts don't have the same public key, might not be duplicates!
+          Override with --force
+        ERROR
       end
 
       to_account.merge_with!(from_account)
@@ -298,10 +273,7 @@ def fix_duplicates
     def backup(username)
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if account.nil?
 
       backup = account.user.backups.create!
       BackupWorker.perform_async(backup.id)
@@ -387,10 +359,7 @@ def refresh(*usernames)
           user, domain = user.split('@')
           account = Account.find_remote(user, domain)
 
-          if account.nil?
-            say('No such account', :red)
-            exit(1)
-          end
+          fail_with_message 'No such account' if account.nil?
 
           next if dry_run?
 
@@ -405,8 +374,7 @@ def refresh(*usernames)
 
         say("OK#{dry_run_mode_suffix}", :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -416,10 +384,7 @@ def refresh(*usernames)
     def follow(username)
       target_account = Account.find_local(username)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(Account.local.without_suspended) do |account|
         FollowService.new.call(account, target_account, bypass_limit: true)
@@ -435,10 +400,7 @@ def unfollow(acct)
       username, domain = acct.split('@')
       target_account = Account.find_remote(username, domain)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(target_account.followers.local) do |account|
         UnfollowService.new.call(account, target_account)
@@ -459,17 +421,11 @@ def unfollow(acct)
       With the --followers option, the command removes all followers of the account.
     LONG_DESC
     def reset_relationships(username)
-      unless options[:follows] || options[:followers]
-        say('Please specify either --follows or --followers, or both', :red)
-        exit(1)
-      end
+      fail_with_message 'Please specify either --follows or --followers, or both' unless options[:follows] || options[:followers]
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       total     = 0
       total    += account.following.reorder(nil).count if options[:follows]
@@ -515,6 +471,8 @@ def reset_relationships(username)
       account identified by its username.
     LONG_DESC
     def approve(username = nil)
+      fail_with_message 'Number must be positive' if options[:number]&.negative?
+
       if options[:all]
         User.pending.find_each(&:approve!)
         say('OK', :green)
@@ -524,16 +482,10 @@ def approve(username = nil)
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         account.user&.approve!
         say('OK', :green)
-      else
-        say('Number must be positive', :red) if options[:number]
-        exit(1)
       end
     end
 
@@ -587,56 +539,34 @@ def prune
       redirects to a different account that the one specified.
     LONG_DESC
     def migrate(username)
-      if options[:replay].present? && options[:target].present?
-        say('Use --replay or --target, not both', :red)
-        exit(1)
-      end
+      fail_with_message 'Use --replay or --target, not both' if options[:replay].present? && options[:target].present?
 
-      if options[:replay].blank? && options[:target].blank?
-        say('Use either --replay or --target', :red)
-        exit(1)
-      end
+      fail_with_message 'Use either --replay or --target' if options[:replay].blank? && options[:target].blank?
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say("No such account: #{username}", :red)
-        exit(1)
-      end
+      fail_with_message "No such account: #{username}" if account.nil?
 
       migration = nil
 
       if options[:replay]
         migration = account.migrations.last
-        if migration.nil?
-          say('The specified account has not performed any migration', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account has not performed any migration' if migration.nil?
 
-        unless options[:force] || migration.target_account_id == account.moved_to_account_id
-          say('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway' unless options[:force] || migration.target_account_id == account.moved_to_account_id
       end
 
       if options[:target]
         target_account = ResolveAccountService.new.call(options[:target])
 
-        if target_account.nil?
-          say("The specified target account could not be found: #{options[:target]}", :red)
-          exit(1)
-        end
+        fail_with_message "The specified target account could not be found: #{options[:target]}" if target_account.nil?
 
-        unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
-          say('The specified account is redirecting to a different target account. Use --force if you want to change the migration target', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target' unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
 
         begin
           migration = account.migrations.create!(acct: target_account.acct)
         rescue ActiveRecord::RecordInvalid => e
-          say("Error: #{e.message}", :red)
-          exit(1)
+          fail_with_message "Error: #{e.message}"
         end
       end
 
@@ -648,18 +578,18 @@ def migrate(username)
     private
 
     def report_errors(errors)
-      errors.each do |error|
-        say('Failure/Error: ', :red)
-        say(error.attribute)
-        say("    #{error.type}", :red)
-      end
+      message = errors.map do |error|
+        <<~STRING
+          Failure/Error: #{error.attribute}
+              #{error.type}
+        STRING
+      end.join
+
+      fail_with_message message
     end
 
     def rotate_keys_for_account(account, delay = 0)
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       old_key = account.private_key
       new_key = OpenSSL::PKey::RSA.new(2048)
diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index 8c222bbb2b3040..93dec1fb8fefc3 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -18,6 +18,10 @@ def self.exit_on_failure?
 
       private
 
+      def fail_with_message(message)
+        raise Thor::Error, message
+      end
+
       def pastel
         @pastel ||= Pastel.new
       end
diff --git a/lib/mastodon/cli/cache.rb b/lib/mastodon/cli/cache.rb
index e8a2ac1610aa47..f32ab292ee29b2 100644
--- a/lib/mastodon/cli/cache.rb
+++ b/lib/mastodon/cli/cache.rb
@@ -31,8 +31,7 @@ def recount(type)
           recount_status_stats(status)
         end
       else
-        say("Unknown type: #{type}", :red)
-        exit(1)
+        fail_with_message "Unknown type: #{type}"
       end
 
       say
diff --git a/lib/mastodon/cli/domains.rb b/lib/mastodon/cli/domains.rb
index e092497dc9edb6..c247463af52b13 100644
--- a/lib/mastodon/cli/domains.rb
+++ b/lib/mastodon/cli/domains.rb
@@ -41,11 +41,9 @@ def purge(*domains)
 
       # Sanity check on command arguments
       if options[:limited_federation_mode] && !domains.empty?
-        say('DOMAIN parameter not supported with --limited-federation-mode', :red)
-        exit(1)
+        fail_with_message 'DOMAIN parameter not supported with --limited-federation-mode'
       elsif domains.empty? && !options[:limited_federation_mode]
-        say('No domain(s) given', :red)
-        exit(1)
+        fail_with_message 'No domain(s) given'
       end
 
       # Build scopes from command arguments
diff --git a/lib/mastodon/cli/email_domain_blocks.rb b/lib/mastodon/cli/email_domain_blocks.rb
index 022b1dcbb17ec3..6b9107c8ade6a6 100644
--- a/lib/mastodon/cli/email_domain_blocks.rb
+++ b/lib/mastodon/cli/email_domain_blocks.rb
@@ -30,10 +30,7 @@ def list
       it at the root.
     LONG_DESC
     def add(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
@@ -76,10 +73,7 @@ def add(*domains)
 
     desc 'remove DOMAIN...', 'Remove e-mail domain blocks'
     def remove(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
diff --git a/lib/mastodon/cli/emoji.rb b/lib/mastodon/cli/emoji.rb
index 912c0991240374..4a8949de0e412c 100644
--- a/lib/mastodon/cli/emoji.rb
+++ b/lib/mastodon/cli/emoji.rb
@@ -86,14 +86,8 @@ def export(path)
       category         = CustomEmojiCategory.find_by(name: options[:category])
       export_file_name = File.join(path, 'export.tar.gz')
 
-      if File.file?(export_file_name) && !options[:overwrite]
-        say("Archive already exists! Use '--overwrite' to overwrite it!")
-        exit 1
-      end
-      if category.nil? && options[:category]
-        say("Unable to find category '#{options[:category]}'!")
-        exit 1
-      end
+      fail_with_message "Archive already exists! Use '--overwrite' to overwrite it!" if File.file?(export_file_name) && !options[:overwrite]
+      fail_with_message "Unable to find category '#{options[:category]}'!" if category.nil? && options[:category]
 
       File.open(export_file_name, 'wb') do |file|
         Zlib::GzipWriter.wrap(file) do |gzip|
diff --git a/lib/mastodon/cli/federation.rb b/lib/mastodon/cli/federation.rb
index 8bb46ecb1ae5af..c7387965573d3c 100644
--- a/lib/mastodon/cli/federation.rb
+++ b/lib/mastodon/cli/federation.rb
@@ -43,10 +43,10 @@ def self_destruct
             say('Every deletion notice has been sent! You can safely delete all data and decomission your servers!', :green)
           end
 
-          exit(0)
+          raise(SystemExit)
         end
 
-        exit(1) unless ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+        fail_with_message 'Domains do not match. Stopping self-destruct initiation.' unless domain_match_confirmed?
 
         say(<<~WARNING, :yellow)
           This operation WILL NOT be reversible.
@@ -54,19 +54,25 @@ def self_destruct
           The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).
         WARNING
 
-        exit(1) if no?('Are you sure you want to proceed?')
+        fail_with_message 'Operation cancelled. Self-destruct will not begin.' if proceed_prompt_negative?
 
         say(<<~INSTRUCTIONS, :green)
           To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:
             SELF_DESTRUCT=#{self_destruct_value}
           You can re-run this command to see the state of the self-destruct process.
         INSTRUCTIONS
-      rescue Interrupt
-        exit(1)
       end
 
       private
 
+      def domain_match_confirmed?
+        ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+      end
+
+      def proceed_prompt_negative?
+        no?('Are you sure you want to proceed?')
+      end
+
       def self_destruct_value
         Rails
           .application
diff --git a/lib/mastodon/cli/feeds.rb b/lib/mastodon/cli/feeds.rb
index 3467dd427cf7f6..39affd5e8ee9e7 100644
--- a/lib/mastodon/cli/feeds.rb
+++ b/lib/mastodon/cli/feeds.rb
@@ -27,17 +27,13 @@ def build(username = nil)
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         PrecomputeFeedService.new.call(account) unless dry_run?
 
         say("OK #{dry_run_mode_suffix}", :green, true)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index d12919c36015a7..100bf7bada587a 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -20,10 +20,7 @@ class IpBlocks < Base
       option to overwrite it.
     LONG_DESC
     def add(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       skipped   = 0
       processed = 0
@@ -70,10 +67,7 @@ def add(*addresses)
       cover the given IP(s).
     LONG_DESC
     def remove(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       processed = 0
       skipped   = 0
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index a64206065d518a..9f234e386030d4 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -199,26 +199,24 @@ def schema_has_instances_view?
 
     def verify_schema_version!
       if migrator_version < MIN_SUPPORTED_VERSION
-        say 'Your version of the database schema is too old and is not supported by this script.', :red
-        say 'Please update to at least Mastodon 3.0.0 before running this script.', :red
-        exit(1)
+        fail_with_message <<~ERROR
+          Your version of the database schema is too old and is not supported by this script.
+          Please update to at least Mastodon 3.0.0 before running this script.
+        ERROR
       elsif migrator_version > MAX_SUPPORTED_VERSION
         say 'Your version of the database schema is more recent than this script, this may cause unexpected errors.', :yellow
-        exit(1) unless yes?('Continue anyway? (Yes/No)')
+        fail_with_message 'Stopping maintenance script because data is more recent than script version.' unless yes?('Continue anyway? (Yes/No)')
       end
     end
 
     def verify_sidekiq_not_active!
-      if Sidekiq::ProcessSet.new.any?
-        say 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.', :red
-        exit(1)
-      end
+      fail_with_message 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.' if Sidekiq::ProcessSet.new.any?
     end
 
     def verify_backup_warning!
       say 'This task will take a long time to run and is potentially destructive.', :yellow
       say 'Please make sure to stop Mastodon and have a backup.', :yellow
-      exit(1) unless yes?('Continue? (Yes/No)')
+      fail_with_message 'Maintenance process stopped.' unless yes?('Continue? (Yes/No)')
     end
 
     def deduplicate_accounts!
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index a796bb729a73d6..87946e0262f35b 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -31,15 +31,9 @@ class Media < Base
       following anyone locally are pruned.
     DESC
     def remove
-      if options[:prune_profiles] && options[:remove_headers]
-        say('--prune-profiles and --remove-headers should not be specified simultaneously', :red, true)
-        exit(1)
-      end
+      fail_with_message '--prune-profiles and --remove-headers should not be specified simultaneously' if options[:prune_profiles] && options[:remove_headers]
 
-      if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
-        say('--include-follows can only be used with --prune-profiles or --remove-headers', :red, true)
-        exit(1)
-      end
+      fail_with_message '--include-follows can only be used with --prune-profiles or --remove-headers' if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
       time_ago = options[:days].days.ago
 
       if options[:prune_profiles] || options[:remove_headers]
@@ -156,11 +150,9 @@ def remove_orphans
           end
         end
       when :fog
-        say('The fog storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The fog storage driver is not supported for this operation at this time'
       when :azure
-        say('The azure storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The azure storage driver is not supported for this operation at this time'
       when :filesystem
         require 'find'
 
@@ -254,10 +246,7 @@ def refresh
         username, domain = options[:account].split('@')
         account = Account.find_remote(username, domain)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         scope = MediaAttachment.where(account_id: account.id)
       elsif options[:domain]
@@ -265,8 +254,7 @@ def refresh
       elsif options[:days].present?
         scope = MediaAttachment.remote
       else
-        say('Specify the source of media attachments', :red)
-        exit(1)
+        fail_with_message 'Specify the source of media attachments'
       end
 
       scope = scope.where('media_attachments.id > ?', Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false)) if options[:days].present?
@@ -306,38 +294,25 @@ def lookup(url)
       path_segments = path.split('/')[2..]
       path_segments.delete('cache')
 
-      unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
-        say('Not a media URL', :red)
-        exit(1)
-      end
+      fail_with_message 'Not a media URL' unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
 
       model_name = path_segments.first.classify
       record_id  = path_segments[2..-2].join.to_i
 
-      unless PRELOAD_MODEL_WHITELIST.include?(model_name)
-        say("Cannot find corresponding model: #{model_name}", :red)
-        exit(1)
-      end
+      fail_with_message "Cannot find corresponding model: #{model_name}" unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 
       record = model_name.constantize.find_by(id: record_id)
       record = record.status if record.respond_to?(:status)
 
-      unless record
-        say('Cannot find corresponding record', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot find corresponding record' unless record
 
       display_url = ActivityPub::TagManager.instance.url_for(record)
 
-      if display_url.blank?
-        say('No public URL for this type of record', :red)
-        exit(1)
-      end
+      fail_with_message 'No public URL for this type of record' if display_url.blank?
 
       say(display_url, :blue)
     rescue Addressable::URI::InvalidURIError
-      say('Invalid URL', :red)
-      exit(1)
+      fail_with_message 'Invalid URL'
     end
 
     private
diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb
index 1fa2745c180453..4fcc47a7f74b2f 100644
--- a/lib/mastodon/cli/progress_helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -25,10 +25,7 @@ def create_progress_bar(total = nil)
     end
 
     def parallelize_with_progress(scope)
-      if options[:concurrency] < 1
-        say('Cannot run with this concurrency setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
 
       reset_connection_pools!
 
diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 77c455f0498bda..5901c07776b337 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -110,17 +110,11 @@ def verify_deploy_options!
     end
 
     def verify_deploy_concurrency!
-      return unless options[:concurrency] < 1
-
-      say('Cannot run with this concurrency setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
     end
 
     def verify_deploy_batch_size!
-      return unless options[:batch_size] < 1
-
-      say('Cannot run with this batch_size setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
     end
 
     def progress_output_options
diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 48d76e028850f1..57b03c941c4a87 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -26,10 +26,7 @@ class Statuses < Base
       indices before commencing, and removes them afterward.
     LONG_DESC
     def remove
-      if options[:batch_size] < 1
-        say('Cannot run with this batch_size setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
 
       remove_statuses
       vacuum_and_analyze_statuses
diff --git a/lib/mastodon/cli/upgrade.rb b/lib/mastodon/cli/upgrade.rb
index cf839868448762..2cb510579484a5 100644
--- a/lib/mastodon/cli/upgrade.rb
+++ b/lib/mastodon/cli/upgrade.rb
@@ -103,13 +103,11 @@ def upgrade_storage_s3(progress, attachment, style)
     end
 
     def upgrade_storage_fog(_progress, _attachment, _style)
-      say('The fog storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The fog storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_azure(_progress, _attachment, _style)
-      say('The azure storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The azure storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_filesystem(progress, attachment, style)
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 26ad983bbced97..98be2b2027d43e 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -65,8 +65,7 @@ def account_from_options
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('Failure/Error: email')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, %r{Failure/Error: email})
           end
         end
       end
@@ -127,8 +126,7 @@ def account_from_options
 
           it 'exits with an error message indicating the role name was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
       end
@@ -191,8 +189,7 @@ def account_from_options
 
       it 'exits with an error message indicating the user was not found' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -214,8 +211,7 @@ def account_from_options
 
           it 'exits with an error message indicating the role was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
 
@@ -364,8 +360,7 @@ def account_from_options
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('Failure/Error: email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, %r{Failure/Error: email})
         end
       end
     end
@@ -387,16 +382,14 @@ def account_from_options
 
       it 'exits with an error message indicating that only one should be used' do
         expect { subject }
-          .to output_results('Use username or --email, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use username or --email, not both')
       end
     end
 
     context 'when neither username nor --email are provided' do
       it 'exits with an error message indicating that no username was provided' do
         expect { subject }
-          .to output_results('No username provided')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No username provided')
       end
     end
 
@@ -425,8 +418,7 @@ def account_from_options
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such username')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such username')
         end
       end
     end
@@ -458,8 +450,7 @@ def account_from_options
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such email')
         end
       end
     end
@@ -511,8 +502,7 @@ def pending_registrations
 
         it 'exits with an error message indicating that the number must be positive' do
           expect { subject }
-            .to output_results('Number must be positive')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'Number must be positive')
         end
       end
 
@@ -545,8 +535,7 @@ def pending_registrations
 
         it 'exits with an error message indicating that no such account was found' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
     end
@@ -560,8 +549,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -596,8 +584,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -634,8 +621,7 @@ def pending_registrations
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -795,8 +781,7 @@ def latest_backup
           allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
 
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
@@ -892,8 +877,7 @@ def latest_backup
     context 'when neither a list of accts nor options are provided' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
   end
@@ -904,8 +888,7 @@ def latest_backup
     context 'when neither username nor --all option are given' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
 
@@ -940,8 +923,7 @@ def latest_backup
 
       it 'exits with an error message when the specified username is not found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -980,8 +962,7 @@ def latest_backup
     shared_examples 'an account not found' do |acct|
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account (#{acct})")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account (#{acct})")
       end
     end
 
@@ -1031,8 +1012,7 @@ def latest_backup
 
       it 'exits with an error message indicating that the accounts do not have the same pub key' do
         expect { subject }
-          .to output_results("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "Accounts don't have the same public key, might not be duplicates!\nOverride with --force\n")
       end
 
       context 'with --force option' do
@@ -1200,8 +1180,7 @@ def expect_skip_accounts_from_unavailable_domain
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option is required' do
         expect { subject }
-          .to output_results('Please specify either --follows or --followers, or both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Please specify either --follows or --followers, or both')
       end
     end
 
@@ -1211,8 +1190,7 @@ def expect_skip_accounts_from_unavailable_domain
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -1368,16 +1346,14 @@ def expect_no_account_prunes
 
       it 'exits with an error message indicating that using both options is not possible' do
         expect { subject }
-          .to output_results('Use --replay or --target, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use --replay or --target, not both')
       end
     end
 
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option must be used' do
         expect { subject }
-          .to output_results('Use either --replay or --target')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use either --replay or --target')
       end
     end
 
@@ -1387,8 +1363,7 @@ def expect_no_account_prunes
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account: #{arguments.first}")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account: #{arguments.first}")
       end
     end
 
@@ -1398,8 +1373,7 @@ def expect_no_account_prunes
       context 'when the specified account has no previous migrations' do
         it 'exits with an error message indicating that the given account has no previous migrations' do
           expect { subject }
-            .to output_results('The specified account has not performed any migration')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account has not performed any migration')
         end
       end
 
@@ -1421,8 +1395,7 @@ def expect_no_account_prunes
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
           end
         end
 
@@ -1449,8 +1422,7 @@ def expect_no_account_prunes
 
         it 'exits with an error message indicating that there is no such account' do
           expect { subject }
-            .to output_results("The specified target account could not be found: #{options[:target]}")
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, "The specified target account could not be found: #{options[:target]}")
         end
       end
 
@@ -1474,8 +1446,7 @@ def expect_no_account_prunes
       context 'when the migration record is invalid' do
         it 'exits with an error indicating that the validation failed' do
           expect { subject }
-            .to output_results('Error: Validation failed')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Error: Validation failed/)
         end
       end
 
@@ -1486,8 +1457,7 @@ def expect_no_account_prunes
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
         end
       end
 
diff --git a/spec/lib/mastodon/cli/cache_spec.rb b/spec/lib/mastodon/cli/cache_spec.rb
index b1515801eb5e7a..247a14f9e2713f 100644
--- a/spec/lib/mastodon/cli/cache_spec.rb
+++ b/spec/lib/mastodon/cli/cache_spec.rb
@@ -64,8 +64,7 @@
 
       it 'Exits with an error message' do
         expect { subject }
-          .to output_results('Unknown')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Unknown/)
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index 13deb05b6cf277..55e3da0bb89be7 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -35,8 +35,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
@@ -72,8 +71,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
diff --git a/spec/lib/mastodon/cli/feeds_spec.rb b/spec/lib/mastodon/cli/feeds_spec.rb
index 199798052705a6..420cb3d5872893 100644
--- a/spec/lib/mastodon/cli/feeds_spec.rb
+++ b/spec/lib/mastodon/cli/feeds_spec.rb
@@ -42,8 +42,7 @@
 
       it 'displays an error and exits' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index 82be10813ed02a..d44b1b9fe44e3e 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -144,8 +144,7 @@ def blocked_ips_severity
 
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
@@ -235,8 +234,7 @@ def other_ranges
     context 'when no IP address is provided' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 081cd2dd47df0a..99d770a81dd188 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -104,9 +104,9 @@
           answer_hostname_incorrectly
         end
 
-        it 'exits silently' do
+        it 'exits with mismatch error message' do
           expect { subject }
-            .to raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Domains do not match/)
         end
       end
 
@@ -119,7 +119,7 @@
         it 'passes first step but stops before instructions' do
           expect { subject }
             .to output_results('operation WILL NOT')
-            .and raise_error(SystemExit)
+            .and raise_error(Thor::Error, /Self-destruct will not begin/)
         end
       end
 
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index ca492bbf69c8c9..cde25d39eda357 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -22,8 +22,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('is too old')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /is too old/)
       end
     end
 
@@ -36,7 +35,7 @@
       it 'Exits with error message' do
         expect { subject }
           .to output_results('more recent')
-          .and raise_error(SystemExit)
+          .and raise_error(Thor::Error, /more recent/)
       end
     end
 
@@ -48,8 +47,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('Sidekiq is running')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Sidekiq is running/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 10005107aa510a..ecc7101b6cf8c8 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -20,8 +20,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--prune-profiles and --remove-headers should not be specified simultaneously')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--prune-profiles and --remove-headers should not be specified simultaneously')
       end
     end
 
@@ -30,8 +29,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--include-follows can only be used with --prune-profiles or --remove-headers')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--include-follows can only be used with --prune-profiles or --remove-headers')
       end
     end
 
@@ -98,8 +96,7 @@
 
       it 'warns about url and exits' do
         expect { subject }
-          .to output_results('Not a media URL')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Not a media URL')
       end
     end
 
@@ -121,8 +118,7 @@
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('Specify the source')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Specify the source/)
       end
     end
 
@@ -147,8 +143,7 @@
 
         it 'warns about usage and exits' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
@@ -221,8 +216,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('azure storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /azure storage driver is not supported/)
       end
     end
 
@@ -233,8 +227,7 @@
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('fog storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /fog storage driver is not supported/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index cb0c80c11dbfd7..8cce2c6ee22a96 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -20,8 +20,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this concurrency setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this concurrency setting/)
       end
     end
 
@@ -30,8 +29,7 @@
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this batch_size setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this batch_size setting/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/statuses_spec.rb b/spec/lib/mastodon/cli/statuses_spec.rb
index 63d494bbb65203..161b7c02bbf64a 100644
--- a/spec/lib/mastodon/cli/statuses_spec.rb
+++ b/spec/lib/mastodon/cli/statuses_spec.rb
@@ -20,8 +20,7 @@
 
       it 'exits with error message' do
         expect { subject }
-          .to output_results('Cannot run')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Cannot run/)
       end
     end
 

From 45287049abc0587ece709acc1d366f9e1acc3d71 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:15:55 +0100
Subject: [PATCH 02/43] New Crowdin Translations (automated) (#28923)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      | 16 ------
 app/javascript/mastodon/locales/an.json      | 21 --------
 app/javascript/mastodon/locales/ar.json      | 21 --------
 app/javascript/mastodon/locales/ast.json     | 16 +-----
 app/javascript/mastodon/locales/be.json      | 21 --------
 app/javascript/mastodon/locales/bg.json      | 36 +++++++-------
 app/javascript/mastodon/locales/bn.json      | 18 -------
 app/javascript/mastodon/locales/br.json      | 21 --------
 app/javascript/mastodon/locales/bs.json      |  2 -
 app/javascript/mastodon/locales/ca.json      | 34 ++++++-------
 app/javascript/mastodon/locales/ckb.json     | 21 --------
 app/javascript/mastodon/locales/co.json      | 16 ------
 app/javascript/mastodon/locales/cs.json      | 21 --------
 app/javascript/mastodon/locales/cy.json      | 21 --------
 app/javascript/mastodon/locales/da.json      | 37 +++++++-------
 app/javascript/mastodon/locales/de.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/el.json      | 51 +++++++++++++-------
 app/javascript/mastodon/locales/en-GB.json   | 21 --------
 app/javascript/mastodon/locales/eo.json      | 21 --------
 app/javascript/mastodon/locales/es-AR.json   | 27 ++++-------
 app/javascript/mastodon/locales/es-MX.json   | 39 ++++++++-------
 app/javascript/mastodon/locales/es.json      | 31 +++++-------
 app/javascript/mastodon/locales/et.json      | 32 ++++++------
 app/javascript/mastodon/locales/eu.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fa.json      | 33 ++++++-------
 app/javascript/mastodon/locales/fi.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fo.json      | 37 +++++++-------
 app/javascript/mastodon/locales/fr-CA.json   | 21 --------
 app/javascript/mastodon/locales/fr.json      | 21 --------
 app/javascript/mastodon/locales/fy.json      | 21 --------
 app/javascript/mastodon/locales/ga.json      | 15 ------
 app/javascript/mastodon/locales/gd.json      | 21 --------
 app/javascript/mastodon/locales/gl.json      | 21 --------
 app/javascript/mastodon/locales/he.json      | 38 +++++++--------
 app/javascript/mastodon/locales/hi.json      | 19 --------
 app/javascript/mastodon/locales/hr.json      | 20 --------
 app/javascript/mastodon/locales/hu.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/hy.json      | 19 --------
 app/javascript/mastodon/locales/ia.json      | 11 -----
 app/javascript/mastodon/locales/id.json      | 21 --------
 app/javascript/mastodon/locales/ie.json      | 30 +++++-------
 app/javascript/mastodon/locales/ig.json      |  3 --
 app/javascript/mastodon/locales/io.json      | 21 --------
 app/javascript/mastodon/locales/is.json      | 33 ++++++-------
 app/javascript/mastodon/locales/it.json      | 39 ++++++++-------
 app/javascript/mastodon/locales/ja.json      | 21 --------
 app/javascript/mastodon/locales/ka.json      | 11 -----
 app/javascript/mastodon/locales/kab.json     | 18 -------
 app/javascript/mastodon/locales/kk.json      | 15 ------
 app/javascript/mastodon/locales/kn.json      |  4 --
 app/javascript/mastodon/locales/ko.json      | 37 +++++++-------
 app/javascript/mastodon/locales/ku.json      | 21 --------
 app/javascript/mastodon/locales/kw.json      | 16 ------
 app/javascript/mastodon/locales/la.json      |  6 ---
 app/javascript/mastodon/locales/lad.json     | 21 --------
 app/javascript/mastodon/locales/lt.json      | 34 ++++++-------
 app/javascript/mastodon/locales/lv.json      | 21 --------
 app/javascript/mastodon/locales/mk.json      | 13 -----
 app/javascript/mastodon/locales/ml.json      | 12 -----
 app/javascript/mastodon/locales/mr.json      |  8 ---
 app/javascript/mastodon/locales/ms.json      | 21 --------
 app/javascript/mastodon/locales/my.json      | 21 --------
 app/javascript/mastodon/locales/ne.json      |  9 +---
 app/javascript/mastodon/locales/nl.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/nn.json      | 40 ++++++++-------
 app/javascript/mastodon/locales/no.json      | 34 ++++++-------
 app/javascript/mastodon/locales/oc.json      | 21 --------
 app/javascript/mastodon/locales/pa.json      |  6 ---
 app/javascript/mastodon/locales/pl.json      | 26 ++++------
 app/javascript/mastodon/locales/pt-BR.json   | 33 ++++++-------
 app/javascript/mastodon/locales/pt-PT.json   | 35 +++++++-------
 app/javascript/mastodon/locales/ro.json      | 21 --------
 app/javascript/mastodon/locales/ru.json      | 21 --------
 app/javascript/mastodon/locales/sa.json      | 20 --------
 app/javascript/mastodon/locales/sc.json      | 18 -------
 app/javascript/mastodon/locales/sco.json     | 21 --------
 app/javascript/mastodon/locales/si.json      | 16 ------
 app/javascript/mastodon/locales/sk.json      | 21 --------
 app/javascript/mastodon/locales/sl.json      | 21 --------
 app/javascript/mastodon/locales/sq.json      | 41 ++++++++--------
 app/javascript/mastodon/locales/sr-Latn.json | 21 --------
 app/javascript/mastodon/locales/sr.json      | 39 ++++++++-------
 app/javascript/mastodon/locales/sv.json      | 31 ++++--------
 app/javascript/mastodon/locales/szl.json     |  2 -
 app/javascript/mastodon/locales/ta.json      | 18 -------
 app/javascript/mastodon/locales/tai.json     |  2 -
 app/javascript/mastodon/locales/te.json      | 13 -----
 app/javascript/mastodon/locales/th.json      | 21 --------
 app/javascript/mastodon/locales/tr.json      | 21 --------
 app/javascript/mastodon/locales/tt.json      | 17 -------
 app/javascript/mastodon/locales/ug.json      |  2 -
 app/javascript/mastodon/locales/uk.json      | 22 +--------
 app/javascript/mastodon/locales/ur.json      | 16 ------
 app/javascript/mastodon/locales/uz.json      | 14 ------
 app/javascript/mastodon/locales/vi.json      | 21 --------
 app/javascript/mastodon/locales/zgh.json     |  7 ---
 app/javascript/mastodon/locales/zh-CN.json   | 35 +++++++-------
 app/javascript/mastodon/locales/zh-HK.json   | 39 ++++++++-------
 app/javascript/mastodon/locales/zh-TW.json   | 35 +++++++-------
 config/locales/bg.yml                        |  3 ++
 config/locales/eu.yml                        |  6 +--
 config/locales/fa.yml                        |  1 +
 config/locales/hi.yml                        |  9 ++++
 config/locales/hu.yml                        |  3 +-
 config/locales/ie.yml                        |  3 ++
 config/locales/ja.yml                        |  3 ++
 config/locales/zh-TW.yml                     |  2 +-
 107 files changed, 568 insertions(+), 1727 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d1873d6dce1e5d..d2ac2f8f27f45d 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -66,7 +66,6 @@
   "alert.unexpected.message": "Iets het skeefgeloop.",
   "alert.unexpected.title": "Oeps!",
   "announcement.announcement": "Aankondiging",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
   "bundle_column_error.error.title": "Ag nee!",
   "bundle_column_error.network.title": "Netwerkfout",
@@ -111,19 +110,12 @@
   "compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
   "compose_form.lock_disclaimer.lock": "gesluit",
   "compose_form.placeholder": "Wat wil jy deel?",
-  "compose_form.poll.add_option": "Voeg ’n keuse by",
   "compose_form.poll.duration": "Duur van peiling",
-  "compose_form.poll.option_placeholder": "Keuse {number}",
-  "compose_form.poll.remove_option": "Verwyder hierdie keuse",
   "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
   "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
-  "compose_form.publish": "Publiseer",
   "compose_form.publish_form": "Publiseer",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Stoor veranderinge",
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
-  "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
   "confirmation_modal.cancel": "Kanselleer",
   "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
@@ -234,7 +226,6 @@
   "navigation_bar.community_timeline": "Plaaslike tydlyn",
   "navigation_bar.compose": "Skep nuwe plasing",
   "navigation_bar.domain_blocks": "Geblokkeerde domeine",
-  "navigation_bar.edit_profile": "Redigeer profiel",
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
   "navigation_bar.personal": "Persoonlik",
@@ -267,14 +258,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Verander privaatheid van plasing",
-  "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
-  "privacy.direct.short": "Slegs genoemde persone",
-  "privacy.private.long": "Slegs sigbaar vir volgelinge",
-  "privacy.private.short": "Slegs volgelinge",
-  "privacy.public.long": "Sigbaar vir almal",
   "privacy.public.short": "Publiek",
-  "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
-  "privacy.unlisted.short": "Ongelys",
   "privacy_policy.last_updated": "Laaste bywerking op {date}",
   "privacy_policy.title": "Privaatheidsbeleid",
   "regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 23899b10072d4d..e9d609a1ce30ae 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Amagar audio",
-  "autosuggest_hashtag.per_week": "{count} per semana",
   "boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
   "bundle_column_error.copy_stacktrace": "Copiar informe d'error",
   "bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
   "compose_form.lock_disclaimer.lock": "blocau",
   "compose_form.placeholder": "En qué yes pensando?",
-  "compose_form.poll.add_option": "Anyadir una opción",
   "compose_form.poll.duration": "Duración d'a enqüesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
   "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Alzar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
-  "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
@@ -345,7 +334,6 @@
   "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.filters": "Parolas silenciadas",
   "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
@@ -429,14 +417,7 @@
   "poll_button.add_poll": "Anyadir una enqüesta",
   "poll_button.remove_poll": "Eliminar enqüesta",
   "privacy.change": "Achustar privacidat",
-  "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
-  "privacy.direct.short": "Nomás contas mencionadas",
-  "privacy.private.long": "Nomás amostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible pa totz",
   "privacy.public.short": "Publico",
-  "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
-  "privacy.unlisted.short": "No listau",
   "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
   "privacy_policy.title": "Politica de Privacidat",
   "refresh": "Actualizar",
@@ -590,10 +571,8 @@
   "upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
   "upload_form.audio_description": "Describir pa personas con problemas auditivos",
   "upload_form.description": "Describir pa los usuarios con dificultat visual",
-  "upload_form.description_missing": "Garra descripción anyadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
   "upload_modal.analyzing_picture": "Analisando imachen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c0d07cc6484a8f..5f2d151fae78f4 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
-  "autosuggest_hashtag.per_week": "{count} في الأسبوع",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
-  "compose_form.poll.add_option": "إضافة خيار",
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
-  "compose_form.poll.option_placeholder": "الخيار {number}",
-  "compose_form.poll.remove_option": "إزالة هذا الخيار",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
-  "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "احفظ التعديلات",
-  "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
   "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
-  "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "الإشارات الخاصة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
   "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
-  "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
-  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
-  "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "مرئي للكل",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
-  "privacy.unlisted.short": "غير مدرج",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
   "refresh": "أنعِش",
@@ -696,10 +677,8 @@
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
   "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
   "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "لم يُضف وصف",
   "upload_form.edit": "تعديل",
   "upload_form.thumbnail": "غيّر الصورة المصغرة",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
   "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
   "upload_modal.apply": "طبّق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 1467f8891eb2c3..479c9c9243caf9 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -66,7 +66,6 @@
   "alert.unexpected.title": "¡Meca!",
   "announcement.announcement": "Anunciu",
   "attachments_list.unprocessed": "(ensin procesar)",
-  "autosuggest_hashtag.per_week": "{count} per selmana",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
@@ -109,13 +108,9 @@
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
-  "compose_form.poll.add_option": "Amestar una opción",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
-  "compose_form.publish": "Espublizar",
+  "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar los cambeos",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
@@ -286,7 +281,6 @@
   "navigation_bar.community_timeline": "Llinia de tiempu llocal",
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.edit_profile": "Editar el perfil",
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -346,12 +340,7 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
-  "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
-  "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
-  "privacy.private.short": "Namás pa siguidores",
-  "privacy.public.long": "Tol mundu pue ver l'artículu",
   "privacy.public.short": "Artículu públicu",
-  "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
@@ -368,6 +357,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
@@ -492,9 +482,7 @@
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
   "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
-  "upload_form.description_missing": "Nun s'amestó la descripción",
   "upload_form.edit": "Editar",
-  "upload_form.undo": "Desaniciar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
   "upload_modal.applying": "Aplicando…",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 773af40343c6a9..e069515109fcb4 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
-  "autosuggest_hashtag.per_week": "{count} за тыдзень",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
   "compose_form.placeholder": "Што здарылася?",
-  "compose_form.poll.add_option": "Дадаць варыянт",
   "compose_form.poll.duration": "Працягласць апытання",
-  "compose_form.poll.option_placeholder": "Варыянт {number}",
-  "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
-  "compose_form.publish": "Апублікаваць",
   "compose_form.publish_form": "Апублікаваць",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Захаваць змены",
-  "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
-  "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
   "confirmation_modal.cancel": "Скасаваць",
   "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Асабістыя згадванні",
   "navigation_bar.discover": "Даведайцесь",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.edit_profile": "Рэдагаваць профіль",
   "navigation_bar.explore": "Агляд",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Дадаць апытанне",
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
-  "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
-  "privacy.direct.short": "Толькі згаданыя людзі",
-  "privacy.private.long": "Паказаць толькі падпісчыкам",
-  "privacy.private.short": "Толькі для падпісчыкаў",
-  "privacy.public.long": "Бачны для ўсіх",
   "privacy.public.short": "Публічны",
-  "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
-  "privacy.unlisted.short": "Не ў стужках",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
   "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
   "upload_form.description": "Апісаць для людзей са слабым зрокам",
-  "upload_form.description_missing": "Апісанне адсутнічае",
   "upload_form.edit": "Рэдагаваць",
   "upload_form.thumbnail": "Змяніць мініяцюру",
-  "upload_form.undo": "Выдаліць",
   "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
   "upload_modal.analyzing_picture": "Аналіз выявы…",
   "upload_modal.apply": "Ужыць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7ee3c868ae1f16..213ac090a7cec2 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
-  "autosuggest_hashtag.per_week": "{count} на седмица",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Какво мислите?",
   "compose_form.poll.add_option": "Добавяне на избор",
   "compose_form.poll.duration": "Времетраене на анкетата",
+  "compose_form.poll.multiple": "Множествен избор",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на този избор",
+  "compose_form.poll.remove_option": "Премахване на тази възможност",
+  "compose_form.poll.single": "Подберете нещо",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
-  "compose_form.publish": "Публикуване",
+  "compose_form.poll.type": "Стил",
+  "compose_form.publish": "Публикация",
   "compose_form.publish_form": "Публикуване",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Запазване на промените",
-  "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
-  "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
+  "compose_form.reply": "Отговор",
+  "compose_form.save_changes": "Обновяване",
   "compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание",
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
-  "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
+  "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
   "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.edit_profile": "Редактиране на профила",
   "navigation_bar.explore": "Изследване",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
-  "privacy.direct.long": "Видимо само за споменатите потребители",
-  "privacy.direct.short": "Само споменатите хора",
-  "privacy.private.long": "Видимо само за последователите",
-  "privacy.private.short": "Само последователи",
-  "privacy.public.long": "Видимо за всички",
+  "privacy.direct.long": "Всеки споменат в публикацията",
+  "privacy.direct.short": "Определени хора",
+  "privacy.private.long": "Само последователите ви",
+  "privacy.private.short": "Последователи",
+  "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
-  "privacy.unlisted.short": "Несписъчно",
+  "privacy.unlisted.long": "По-малко алгоритмични фанфари",
+  "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
   "recommended": "Препоръчано",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}м.",
   "relative_time.seconds": "{number}с.",
   "relative_time.today": "днес",
+  "reply_indicator.attachments": "{count, plural, one {# прикаване} other {# прикачвания}}",
   "reply_indicator.cancel": "Отказ",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокиране",
   "report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
   "report.categories.legal": "Правни въпроси",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
-  "upload_form.description_missing": "Няма добавен опис",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
-  "upload_form.undo": "Изтриване",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
   "upload_modal.analyzing_picture": "Снимков анализ…",
   "upload_modal.apply": "Прилагане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index fe3d2a627c3f23..508caa2f42708d 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "ঘোষণা",
   "attachments_list.unprocessed": "(প্রক্রিয়া করা যায়নি)",
   "audio.hide": "অডিও লুকান",
-  "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
   "boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
   "bundle_column_error.copy_stacktrace": "এরর রিপোর্ট কপি করুন",
   "bundle_column_error.error.body": "অনুরোধ করা পৃষ্ঠাটি রেন্ডার করা যায়নি। এটি আমাদের কোডে একটি বাগ বা ব্রাউজার সামঞ্জস্যের সমস্যার কারণে হতে পারে।",
@@ -142,22 +141,12 @@
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
   "compose_form.placeholder": "আপনি কি ভাবছেন ?",
-  "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
   "compose_form.poll.duration": "ভোটগ্রহনের সময়",
-  "compose_form.poll.option_placeholder": "বিকল্প {number}",
-  "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
   "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
   "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
-  "compose_form.publish": "প্রকাশ করুন",
   "compose_form.publish_form": "প্রকাশ করুন",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "পরিবর্তনগুলো প্রকাশ করুন",
-  "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
-  "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
-  "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
-  "compose_form.spoiler_placeholder": "আপনার লেখা দেখার সাবধানবাণী লিখুন",
   "confirmation_modal.cancel": "বাতিল করুন",
   "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
@@ -324,7 +313,6 @@
   "navigation_bar.compose": "নতুন টুট লিখুন",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
   "navigation_bar.explore": "পরিব্রাজন",
   "navigation_bar.favourites": "পছন্দসমূহ",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
@@ -395,12 +383,7 @@
   "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
-  "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.short": "প্রকাশ্য নয়",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",
   "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
@@ -506,7 +489,6 @@
   "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
   "upload_form.edit": "সম্পাদন",
   "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
-  "upload_form.undo": "মুছে ফেলতে",
   "upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
   "upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
   "upload_modal.apply": "প্রয়োগ করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ad6e55c5e1ed7f..5e83ab4e6dc8b4 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
-  "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
-  "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
   "compose_form.poll.duration": "Pad ar sontadeg",
-  "compose_form.poll.option_placeholder": "Dibab {number}",
-  "compose_form.poll.remove_option": "Lemel an dibab-mañ",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
-  "compose_form.publish": "Embann",
   "compose_form.publish_form": "Embann",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
-  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
-  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
-  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
@@ -383,7 +372,6 @@
   "navigation_bar.direct": "Menegoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.edit_profile": "Kemmañ ar profil",
   "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
@@ -487,14 +475,7 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an toud",
-  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "Tud meneget hepken",
-  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Tud koumanantet hepken",
-  "privacy.public.long": "Gwelus d'an holl",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
-  "privacy.unlisted.short": "Anlistennet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
   "recommended": "Erbedet",
@@ -667,10 +648,8 @@
   "upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
   "upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
   "upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
-  "upload_form.description_missing": "Deskrivadur diank",
   "upload_form.edit": "Kemmañ",
   "upload_form.thumbnail": "Kemmañ ar velvenn",
-  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
   "upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
   "upload_modal.apply": "Arloañ",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 9b6b49c3d666f0..c978a8b01fcfb4 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -66,8 +66,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c763a32ba846dc..0d089bf8b895da 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
   "compose_form.placeholder": "Què tens al cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
+  "compose_form.poll.add_option": "Afegiu una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
+  "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Elimina aquesta opció",
+  "compose_form.poll.remove_option": "Treu aquesta opció",
+  "compose_form.poll.single": "Trieu-ne una",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
-  "compose_form.publish": "Tut",
+  "compose_form.poll.type": "Estil",
+  "compose_form.publish": "Publica",
   "compose_form.publish_form": "Nou tut",
-  "compose_form.publish_loud": "Tut!",
-  "compose_form.save_changes": "Desa els canvis",
-  "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 {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.reply": "Responeu",
+  "compose_form.save_changes": "Actualitza",
   "compose_form.spoiler.marked": "Elimina l'avís de contingut",
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
-  "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
+  "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
   "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Mencions privades",
   "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.edit_profile": "Edita el perfil",
   "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Paraules silenciades",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
-  "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només gent mencionada",
-  "privacy.private.long": "Visible només per als seguidors",
-  "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per a tothom",
+  "privacy.direct.long": "Tothom mencionat en aquesta publicació",
+  "privacy.direct.short": "Persones concretes",
+  "privacy.private.long": "Només els vostres seguidors",
+  "privacy.private.short": "Seguidors",
+  "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
-  "privacy.unlisted.short": "No llistada",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
@@ -715,10 +711,8 @@
   "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
   "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
   "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
-  "upload_form.description_missing": "No s'hi ha afegit cap descripció",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Canvia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
   "upload_modal.analyzing_picture": "S'analitza la imatge…",
   "upload_modal.apply": "Aplica",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index f1cafd1ac474e3..73910f9b7c7027 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "بانگەواز",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "شاردنەوەی دەنگ",
-  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
   "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
   "bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
   "bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
   "compose_form.placeholder": "چی لە مێشکتدایە?",
-  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
   "compose_form.poll.duration": "ماوەی ڕاپرسی",
-  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
-  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
   "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
   "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
-  "compose_form.publish": "بڵاوی بکەوە",
   "compose_form.publish_form": "بڵاوی بکەوە",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
-  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
-  "compose_form.sensitive.marked": "وادەی کۆتایی",
-  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
   "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
-  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
   "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
@@ -354,7 +343,6 @@
   "navigation_bar.direct": "ئاماژەی تایبەت",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
   "navigation_bar.explore": "گەڕان",
   "navigation_bar.filters": "وشە کپەکان",
   "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
@@ -439,14 +427,7 @@
   "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
   "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
   "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
-  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "تەنها کەسانی باس کراو",
-  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنیا شوێنکەوتووان",
-  "privacy.public.long": "بۆ هەمووان دیارە",
   "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
-  "privacy.unlisted.short": "لە لیست نەکراو",
   "privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
   "privacy_policy.title": "سیاسەتی تایبەتێتی",
   "refresh": "نوێکردنەوە",
@@ -610,10 +591,8 @@
   "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
   "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
   "upload_form.description": "پەیامەکەت بۆ نابیناکان",
-  "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
   "upload_form.edit": "دەستکاری",
   "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "بیسڕەوە",
   "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
   "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
   "upload_modal.apply": "بیسەپێنە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9f90c3d211dffa..9d0b0306c8e5c4 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -45,7 +45,6 @@
   "alert.unexpected.title": "Uups!",
   "announcement.announcement": "Annunziu",
   "attachments_list.unprocessed": "(micca trattata)",
-  "autosuggest_hashtag.per_week": "{count} per settimana",
   "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
   "bundle_column_error.retry": "Pruvà torna",
   "bundle_modal_error.close": "Chjudà",
@@ -80,20 +79,12 @@
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
   "compose_form.placeholder": "À chè pensate?",
-  "compose_form.poll.add_option": "Aghjunghje scelta",
   "compose_form.poll.duration": "Durata di u scandagliu",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Toglie sta scelta",
   "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
   "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
-  "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
   "confirmation_modal.cancel": "Annullà",
   "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
@@ -245,7 +236,6 @@
   "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
-  "navigation_bar.edit_profile": "Mudificà u prufile",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
@@ -318,12 +308,7 @@
   "poll_button.add_poll": "Aghjunghje",
   "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.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.short": "Micca listatu",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",
   "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
@@ -409,7 +394,6 @@
   "upload_form.description": "Discrizzione per i malvistosi",
   "upload_form.edit": "Mudificà",
   "upload_form.thumbnail": "Cambià vignetta",
-  "upload_form.undo": "Sguassà",
   "upload_form.video_description": "Discrizzione per i ciochi o cechi",
   "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
   "upload_modal.apply": "Affettà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e18cabcec1f194..7d91670de0629a 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "autosuggest_hashtag.per_week": "{count} za týden",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -144,22 +143,12 @@
   "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": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
-  "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Doba trvání ankety",
-  "compose_form.poll.option_placeholder": "Volba {number}",
-  "compose_form.poll.remove_option": "Odebrat tuto volbu",
   "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
   "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
-  "compose_form.publish": "Zveřejnit",
   "compose_form.publish_form": "Zveřejnit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Uložit změny",
-  "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
   "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
-  "compose_form.spoiler_placeholder": "Sem napište vaše varování",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
@@ -401,7 +390,6 @@
   "navigation_bar.direct": "Soukromé zmínky",
   "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.edit_profile": "Upravit profil",
   "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
@@ -508,14 +496,7 @@
   "poll_button.add_poll": "Přidat anketu",
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze zmínění lidé",
-  "privacy.private.long": "Viditelný pouze pro sledující",
-  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelný pro všechny",
   "privacy.public.short": "Veřejné",
-  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
-  "privacy.unlisted.short": "Neveřejný",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
   "refresh": "Obnovit",
@@ -695,10 +676,8 @@
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "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.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
-  "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
   "upload_modal.analyzing_picture": "Analyzuji obrázek…",
   "upload_modal.apply": "Použít",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 04b39904e48136..3cd090e186155b 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
-  "autosuggest_hashtag.per_week": "{count} yr wythnos",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -146,22 +145,12 @@
   "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.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
-  "compose_form.poll.add_option": "Ychwanegu dewis",
   "compose_form.poll.duration": "Cyfnod pleidlais",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Tynnu'r dewis",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
-  "compose_form.publish": "Cyhoeddi",
   "compose_form.publish_form": "Cyhoeddi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Cadw newidiadau",
-  "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",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
-  "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
   "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Crybwylliadau preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
-  "navigation_bar.edit_profile": "Golygu proffil",
   "navigation_bar.explore": "Darganfod",
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
-  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
-  "privacy.private.short": "Dilynwyr yn unig",
-  "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
-  "privacy.unlisted.short": "Heb ei restru",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Nid oes modd llwytho 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.edit": "Golygu",
   "upload_form.thumbnail": "Newid llun bach",
-  "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
   "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
   "upload_modal.apply": "Gosod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 3bc830ad27f2fe..5d6cac69d83108 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} pr. uge",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -146,22 +145,22 @@
   "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",
   "compose_form.placeholder": "Hvad tænker du på?",
-  "compose_form.poll.add_option": "Tilføj valgmulighed",
+  "compose_form.poll.add_option": "Tilføj mulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
+  "compose_form.poll.multiple": "Multivalg",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
   "compose_form.poll.remove_option": "Fjern denne valgmulighed",
+  "compose_form.poll.single": "Vælg én",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
-  "compose_form.publish": "Publicér",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Indsend",
   "compose_form.publish_form": "Publicér",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gem ændringer",
-  "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Opdatér",
   "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
-  "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.edit_profile": "Redigér profil",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord (mutede)",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun omtalte personer",
-  "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.short": "Bestemte personer",
+  "privacy.private.long": "Kun dine følgere",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
-  "privacy.unlisted.short": "Diskret",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Tavsgøre offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
   "reply_indicator.cancel": "Afbryd",
+  "reply_indicator.poll": "Afstemning",
   "report.block": "Blokér",
   "report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
   "report.categories.legal": "Juridisk",
@@ -715,10 +716,8 @@
   "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.edit": "Redigér",
   "upload_form.thumbnail": "Skift miniature",
-  "upload_form.undo": "Slet",
   "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
   "upload_modal.analyzing_picture": "Analyserer billede…",
   "upload_modal.apply": "Anvend",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 462352750c35c2..a6dd098bb20049 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
-  "autosuggest_hashtag.per_week": "{count} pro Woche",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
-  "compose_form.poll.add_option": "Auswahl",
+  "compose_form.poll.add_option": "Auswahl hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.option_placeholder": "{number}. Auswahl",
-  "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+  "compose_form.poll.multiple": "Mehrfachauswahl",
+  "compose_form.poll.option_placeholder": "{number}. Auswahlmöglichkeit",
+  "compose_form.poll.remove_option": "Dieses Auswahlfeld entfernen",
+  "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
-  "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+  "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
+  "compose_form.poll.type": "Art",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Änderungen speichern",
-  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+  "compose_form.reply": "Antworten",
+  "compose_form.save_changes": "Aktualisieren",
   "compose_form.spoiler.marked": "Inhaltswarnung entfernen",
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
-  "compose_form.spoiler_placeholder": "Inhaltswarnung",
+  "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
   "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private Erwähnungen",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
-  "privacy.direct.long": "Nur für die erwähnten Profile sichtbar",
-  "privacy.direct.short": "Nur erwähnte Profile",
-  "privacy.private.long": "Nur für deine Follower sichtbar",
-  "privacy.private.short": "Nur Follower",
-  "privacy.public.long": "Für alle sichtbar",
+  "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
+  "privacy.direct.short": "Bestimmte Profile",
+  "privacy.private.long": "Nur deine Follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Alle auf und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
-  "privacy.unlisted.short": "Nicht gelistet",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} Min.",
   "relative_time.seconds": "{number} Sek.",
   "relative_time.today": "heute",
+  "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
+  "reply_indicator.poll": "Umfrage",
   "report.block": "Blockieren",
   "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
   "report.categories.legal": "Rechtlich",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
   "upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
   "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
-  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",
   "upload_form.thumbnail": "Vorschaubild ändern",
-  "upload_form.undo": "Löschen",
   "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
   "upload_modal.analyzing_picture": "Bild wird analysiert …",
   "upload_modal.apply": "Übernehmen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 53e55fa950ad00..068d2289066738 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "Ανακοίνωση",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
-  "autosuggest_hashtag.per_week": "{count} ανά εβδομάδα",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
   "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -111,6 +110,7 @@
   "column.direct": "Ιδιωτικές αναφορές",
   "column.directory": "Περιήγηση στα προφίλ",
   "column.domain_blocks": "Αποκλεισμένοι τομείς",
+  "column.favourites": "Αγαπημένα",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
@@ -131,6 +131,9 @@
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
   "compose.language.change": "Αλλαγή γλώσσας",
   "compose.language.search": "Αναζήτηση γλωσσών...",
+  "compose.published.body": "Η ανάρτηση δημοσιεύτηκε.",
+  "compose.published.open": "Άνοιγμα",
+  "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
   "compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
   "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
@@ -139,20 +142,19 @@
   "compose_form.placeholder": "Τι σκέφτεσαι;",
   "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
+  "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
   "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
-  "compose_form.publish": "Δημοσίευση",
+  "compose_form.poll.type": "Στυλ",
+  "compose_form.publish": "Ανάρτηση",
   "compose_form.publish_form": "Δημοσίευση",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Αποθήκευση αλλαγών",
-  "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημειωθεί ως ευαίσθητα}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημειωθεί ως ευαίσθητα}}",
+  "compose_form.reply": "Απάντηση",
+  "compose_form.save_changes": "Ενημέρωση",
   "compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου",
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
-  "compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
+  "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
   "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
@@ -184,6 +186,7 @@
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
+  "copy_icon_button.copied": "Αντιγράφηκε στο πρόχειρο",
   "copypaste.copied": "Αντιγράφηκε",
   "copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
   "directory.federated": "Από το γνωστό fediverse",
@@ -380,7 +383,6 @@
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -450,6 +452,12 @@
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.profile.note": "Βιογραφικό",
+  "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+  "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
+  "onboarding.profile.title": "Ρύθμιση προφίλ",
+  "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
+  "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -458,6 +466,7 @@
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Κάντε την πρώτη σας δημοσίευση",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -467,6 +476,7 @@
   "picture_in_picture.restore": "Βάλε το πίσω",
   "poll.closed": "Κλειστή",
   "poll.refresh": "Ανανέωση",
+  "poll.reveal": "Δείτε τα αποτελέσματα",
   "poll.total_people": "{count, plural, one {# άτομο} other {# άτομα}}",
   "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll.vote": "Ψήφισε",
@@ -475,16 +485,14 @@
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
-  "privacy.direct.long": "Δημοσίευση μόνο σε όσους επισημαίνονται",
-  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
-  "privacy.private.long": "Ορατό μόνο για τους ακολούθους",
-  "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Ορατό σε όλους",
+  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+  "privacy.direct.short": "Συγκεκριμένα άτομα",
+  "privacy.private.long": "Μόνο οι ακόλουθοί σας",
+  "privacy.private.short": "Ακόλουθοι",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Ορατό για όλους, εκτός αυτών που δεν συμμετέχουν σε δυνατότητες ανακάλυψης",
-  "privacy.unlisted.short": "Μη καταχωρημένα",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
+  "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",
   "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -500,8 +508,10 @@
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
   "reply_indicator.cancel": "Άκυρο",
+  "reply_indicator.poll": "Δημοσκόπηση",
   "report.block": "Αποκλεισμός",
   "report.block_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Δεν θα μπορεί να δει τις αναρτήσεις σου ή να σε ακολουθήσει. Θα μπορεί να δει ότι έχει αποκλειστεί.",
+  "report.categories.legal": "Νομικό περιεχόμενο",
   "report.categories.other": "Άλλες",
   "report.categories.spam": "Ανεπιθύμητα",
   "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
@@ -519,6 +529,8 @@
   "report.placeholder": "Επιπλέον σχόλια",
   "report.reasons.dislike": "Δεν μου αρέσει",
   "report.reasons.dislike_description": "Δεν είναι κάτι που θα ήθελες να δεις",
+  "report.reasons.legal": "Είναι παράνομο",
+  "report.reasons.legal_description": "Πιστεύετε ότι παραβιάζει το νόμο της χώρας σας ή της χώρας του διακομιστή",
   "report.reasons.other": "Είναι κάτι άλλο",
   "report.reasons.other_description": "Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες",
   "report.reasons.spam": "Είναι σπαμ",
@@ -552,10 +564,12 @@
   "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
   "search_popout.quick_actions": "Γρήγορες ενέργειες",
   "search_popout.recent": "Πρόσφατες αναζητήσεις",
+  "search_popout.user": "χρήστης",
   "search_results.accounts": "Προφίλ",
   "search_results.all": "Όλα",
   "search_results.hashtags": "Ετικέτες",
   "search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
+  "search_results.see_all": "Δες τα όλα",
   "search_results.statuses": "Αναρτήσεις",
   "search_results.title": "Αναζήτηση για {q}",
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
@@ -566,6 +580,8 @@
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.sign_in": "Σύνδεση",
+  "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -582,6 +598,7 @@
   "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
+  "status.favourite": "Αγαπημένα",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.filtered": "Φιλτραρισμένα",
   "status.hide": "Απόκρυψη ανάρτησης",
@@ -646,10 +663,8 @@
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
   "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
-  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
   "upload_form.edit": "Επεξεργασία",
   "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
-  "upload_form.undo": "Διαγραφή",
   "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
   "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
   "upload_modal.apply": "Εφαρμογή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 37e5efa5baddf6..2cf1b4dbaec4fb 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -144,22 +143,12 @@
   "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": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -406,7 +395,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -524,14 +512,7 @@
   "poll_button.add_poll": "Add a poll",
   "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.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -713,10 +694,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analysing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 643329ba993215..907a918af08d53 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
-  "autosuggest_hashtag.per_week": "po {count} por semajno",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn afiŝojn nur al la sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
-  "compose_form.poll.add_option": "Aldoni elekteblon",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
-  "compose_form.poll.option_placeholder": "Elekteblo {number}",
-  "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
-  "compose_form.publish": "Afiŝi",
   "compose_form.publish_form": "Afiŝi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Konservi ŝanĝojn",
-  "compose_form.sensitive.hide": "{count, plural, one {Marki la plurmedio kiel tikla} other {Marki la plurmedioj kiel tiklaj}}",
-  "compose_form.sensitive.marked": "{count, plural, one {La plurmedio estas markita kiel tikla} other {La plurmedioj estas markitaj kiel tiklaj}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {La plurmedio ne estas markita kiel tikla} other {La plurmedioj ne estas markitaj kiel tiklaj}}",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
-  "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
   "confirmation_modal.cancel": "Nuligi",
   "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privataj mencioj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
-  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Nur menciitaj personoj",
-  "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur abonantoj",
-  "privacy.public.long": "Videbla por ĉiuj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
-  "privacy.unlisted.short": "Nelistigita",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
@@ -715,10 +696,8 @@
   "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 personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
-  "upload_form.description_missing": "Neniu priskribo aldonita",
   "upload_form.edit": "Redakti",
   "upload_form.thumbnail": "Ŝanĝi etigita bildo",
-  "upload_form.undo": "Forigi",
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
   "upload_modal.analyzing_picture": "Bilda analizado…",
   "upload_modal.apply": "Apliki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7c2e4f0d49894d..8816f18af64e1c 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -146,22 +145,21 @@
   "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",
   "compose_form.placeholder": "¿Qué onda?",
-  "compose_form.poll.add_option": "Agregá una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
+  "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nuevo mensaje",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Agregar encuesta",
   "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 cuentas mencionadas",
-  "privacy.private.long": "Visible sólo para los seguidores",
-  "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
@@ -715,10 +708,8 @@
   "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.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fab5f6ec96e2bf..fdc57ac6d61aa3 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,22 @@
   "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",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
+  "compose_form.poll.add_option": "Agregar opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.single": "Seleccione uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicación",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar multimedia como sensible",
-  "compose_form.sensitive.marked": "Material marcado como sensible",
-  "compose_form.sensitive.unmarked": "Material no marcado como sensible",
+  "compose_form.reply": "Respuesta",
+  "compose_form.save_changes": "Actualización",
   "compose_form.spoiler.marked": "Texto oculto tras la advertencia",
   "compose_form.spoiler.unmarked": "Texto no oculto",
-  "compose_form.spoiler_placeholder": "Advertencia de contenido",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo personas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.long": "Todos los mencionados en la publicación",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Sólo tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en los hashtags, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.long": "Menos fanfares algorítmicos",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "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": "Sin descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 0d6149f5f51a2c..2e4ea93177a6fc 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,21 @@
   "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",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Visible solo para usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -715,10 +708,8 @@
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para personas con discapacidad visual",
-  "upload_form.description_missing": "No se ha añadido ninguna descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 26657d402e6dc3..5034c25541005e 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
-  "autosuggest_hashtag.per_week": "{count} nädalas",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
+  "compose_form.poll.multiple": "Valikvastustega",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.remove_option": "Eemalda see valik",
+  "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+  "compose_form.poll.type": "Stiil",
   "compose_form.publish": "Postita",
   "compose_form.publish_form": "Postita",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvesta muudatused",
-  "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+  "compose_form.reply": "Vasta",
+  "compose_form.save_changes": "Uuenda",
   "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
-  "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
+  "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
   "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privaatsed mainimised",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.edit_profile": "Muuda profiili",
   "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Lisa küsitlus",
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda postituse nähtavust",
-  "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Mainitud inimesed ainult",
-  "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Jälgijad ainult",
-  "privacy.public.long": "Kõigile nähtav",
+  "privacy.direct.long": "Kõik postituses mainitud",
+  "privacy.direct.short": "Määratud kasutajad",
+  "privacy.private.long": "Ainult jälgijad",
+  "privacy.private.short": "Jälgijad",
+  "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Kõigile nähtav, aga ei ilmu avastamise vaadetes",
-  "privacy.unlisted.short": "Määramata",
+  "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+  "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
+  "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
   "reply_indicator.cancel": "Tühista",
+  "reply_indicator.poll": "Küsitlus",
   "report.block": "Blokeeri",
   "report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
   "report.categories.legal": "Juriidiline",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
-  "upload_form.description_missing": "Kirjeldus puudub",
   "upload_form.edit": "Muuda",
   "upload_form.thumbnail": "Muuda pisipilti",
-  "upload_form.undo": "Kustuta",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
   "upload_modal.analyzing_picture": "Analüüsime pilti…",
   "upload_modal.apply": "Rakenda",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c75f697e4c2ac7..cee18e7a513cc5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -25,7 +25,7 @@
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
   "account.domain_blocked": "Ezkutatutako domeinua",
-  "account.edit_profile": "Aldatu profila",
+  "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
@@ -89,7 +89,6 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
-  "autosuggest_hashtag.per_week": "{count} asteko",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
   "compose_form.placeholder": "Zer duzu buruan?",
-  "compose_form.poll.add_option": "Gehitu aukera bat",
+  "compose_form.poll.add_option": "Gehitu aukera",
   "compose_form.poll.duration": "Inkestaren iraupena",
+  "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
   "compose_form.poll.remove_option": "Kendu aukera hau",
+  "compose_form.poll.single": "Hautatu bat",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
+  "compose_form.poll.type": "Estiloa",
   "compose_form.publish": "Argitaratu",
   "compose_form.publish_form": "Argitaratu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gorde aldaketak",
-  "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
-  "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
-  "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
+  "compose_form.reply": "Erantzun",
+  "compose_form.save_changes": "Eguneratu",
   "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du",
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
-  "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen",
+  "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
   "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Aipamen pribatuak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Gehitu inkesta bat",
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
-  "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Aipatutako jendea soilik",
-  "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Jarraitzaileak soilik",
-  "privacy.public.long": "Guztientzat ikusgai",
+  "privacy.direct.long": "Argitalpen honetan aipatutako denak",
+  "privacy.direct.short": "Jende jakina",
+  "privacy.private.long": "Soilik jarraitzaileak",
+  "privacy.private.short": "Jarraitzaileak",
+  "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
-  "privacy.unlisted.short": "Zerrendatu gabea",
+  "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
+  "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
+  "privacy.unlisted.short": "Deiadar urrikoa",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
   "recommended": "Gomendatua",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "gaur",
+  "reply_indicator.attachments": "{count, plural, one {# eranskin} other {# eranskin}}",
   "reply_indicator.cancel": "Utzi",
+  "reply_indicator.poll": "Inkesta",
   "report.block": "Blokeatu",
   "report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
   "report.categories.legal": "Juridikoa",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
   "upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
-  "upload_form.description_missing": "Ez da deskribapenik gehitu",
   "upload_form.edit": "Editatu",
   "upload_form.thumbnail": "Aldatu koadro txikia",
-  "upload_form.undo": "Ezabatu",
   "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
   "upload_modal.analyzing_picture": "Irudia aztertzen…",
   "upload_modal.apply": "Aplikatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9f3201ca786709..0b078d1ab3c676 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "اعلامیه",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
-  "autosuggest_hashtag.per_week": "{count} در هفته",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "تازه چه خبر؟",
   "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
+  "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
   "compose_form.poll.remove_option": "برداشتن این گزینه",
+  "compose_form.poll.single": "گزینش یکی",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
-  "compose_form.publish": "انتشار",
+  "compose_form.poll.type": "سبک",
+  "compose_form.publish": "فرستادن",
   "compose_form.publish_form": "انتشار",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ذخیرهٔ تغییرات",
-  "compose_form.sensitive.hide": "{count, plural, one {علامت‌گذاری رسانه به عنوان حساس} other {علامت‌گذاری رسانه‌ها به عنوان حساس}}",
-  "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری شد} other {رسانه‌ها به عنوان حساس علامت‌گذاری شدند}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری نشد} other {رسانه‌ها به عنوان حساس علامت‌گذاری نشدند}}",
+  "compose_form.reply": "پاسخ",
+  "compose_form.save_changes": "به‌روز رسانی",
   "compose_form.spoiler.marked": "برداشتن هشدار محتوا",
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
-  "compose_form.spoiler_placeholder": "هشدارتان را این‌جا بنویسید",
+  "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
   "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "اشاره‌های خصوصی",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.edit_profile": "ویرایش نمایه",
   "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "برگزیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
@@ -524,14 +522,14 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
-  "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
-  "privacy.direct.short": "فقط افراد اشاره شده",
-  "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "فقط پی‌گیرندگان",
-  "privacy.public.long": "نمایان برای همه",
+  "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+  "privacy.direct.short": "افراد مشخّص",
+  "privacy.private.long": "تنها پی‌گیرندگانتان",
+  "privacy.private.short": "پی‌گیرندگان",
+  "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیت‌های کشف",
-  "privacy.unlisted.short": "فهرست نشده",
+  "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
+  "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
   "recommended": "پیشنهادشده",
@@ -550,6 +548,7 @@
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
   "reply_indicator.cancel": "لغو",
+  "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
   "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
   "report.categories.legal": "حقوقی",
@@ -713,10 +712,8 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
-  "upload_form.description_missing": "شرحی افزوده نشده",
   "upload_form.edit": "ویرایش",
   "upload_form.thumbnail": "تغییر بندانگشتی",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
   "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
   "upload_modal.apply": "اعمال",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 00df0e537a3fcf..7b98f998363880 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ilmoitus",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
-  "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -146,22 +145,22 @@
   "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",
   "compose_form.placeholder": "Mitä mietit?",
-  "compose_form.poll.add_option": "Lisää valinta",
+  "compose_form.poll.add_option": "Lisää vaihtoehto",
   "compose_form.poll.duration": "Äänestyksen kesto",
-  "compose_form.poll.option_placeholder": "Valinta {number}",
-  "compose_form.poll.remove_option": "Poista tämä valinta",
+  "compose_form.poll.multiple": "Monivalinta",
+  "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
+  "compose_form.poll.remove_option": "Poista tämä vaihtoehto",
+  "compose_form.poll.single": "Valitse yksi",
   "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
   "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+  "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Tallenna muutokset",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluonteiseksi} other {Merkitse mediat arkaluonteisiksi}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluonteiseksi} other {Mediat on merkitty arkaluonteisiksi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluonteiseksi} other {Medioita ei ole merkitty arkaluonteisiksi}}",
+  "compose_form.reply": "Vastaa",
+  "compose_form.save_changes": "Päivitä",
   "compose_form.spoiler.marked": "Poista sisältövaroitus",
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
-  "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
+  "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
   "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Yksityiset maininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
@@ -526,14 +524,13 @@
   "poll_button.add_poll": "Lisää äänestys",
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
-  "privacy.direct.long": "Näkyy vain mainituille käyttäjille",
-  "privacy.direct.short": "Vain mainitut käyttäjät",
-  "privacy.private.long": "Näkyy vain seuraajille",
-  "privacy.private.short": "Vain seuraajat",
-  "privacy.public.long": "Näkyy kaikille",
+  "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
+  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.private.long": "Vain seuraajasi",
+  "privacy.private.short": "Seuraajat",
+  "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Näkyy kaikille mutta jää pois löytämisominaisuuksista",
-  "privacy.unlisted.short": "Listaamaton",
+  "privacy.unlisted.additional": "Tämä toimii kuten julkinen, paitsi että julkaisu ei näy livesyötteissä, aihetunnisteissa, selaa-näkymässä tai Mastodon-haussa, vaikka olisit sallinut ne käyttäjätilin laajuisesti.",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
@@ -551,7 +548,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
+  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
+  "reply_indicator.poll": "Kysely",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
   "report.categories.legal": "Lakiasiat",
@@ -715,10 +714,8 @@
   "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
-  "upload_form.description_missing": "Kuvausta ei ole lisätty",
   "upload_form.edit": "Muokkaa",
   "upload_form.thumbnail": "Vaihda pikkukuva",
-  "upload_form.undo": "Poista",
   "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 94d13e8d910a1e..a4c5296086f76a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
-  "autosuggest_hashtag.per_week": "{count} um vikuna",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvat hevur tú í huga?",
   "compose_form.poll.add_option": "Legg valmøguleika afturat",
   "compose_form.poll.duration": "Atkvøðugreiðslutíð",
+  "compose_form.poll.multiple": "Fleiri valmøguleikar",
   "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
-  "compose_form.poll.remove_option": "Strika valmøguleikan",
+  "compose_form.poll.remove_option": "Strika hendan valmøguleikan",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
   "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
-  "compose_form.publish": "Legg út",
+  "compose_form.poll.type": "Stílur",
+  "compose_form.publish": "Posta",
   "compose_form.publish_form": "Legg út",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Goym broytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Dagfør",
   "compose_form.spoiler.marked": "Ávaring um at strika innihald",
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
-  "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+  "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
   "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privatar umrøður",
   "navigation_bar.discover": "Uppdaga",
   "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.edit_profile": "Broyt vanga",
   "navigation_bar.explore": "Rannsaka",
   "navigation_bar.favourites": "Dámdir postar",
   "navigation_bar.filters": "Doyvd orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
   "poll_button.remove_poll": "Strika atkvøðugreiðslu",
   "privacy.change": "Broyt privatverju av posti",
-  "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
-  "privacy.direct.short": "Bert nevnd fólk",
-  "privacy.private.long": "Bert sjónligt hjá fylgjarum",
-  "privacy.private.short": "Einans fylgjarar",
-  "privacy.public.long": "Sjónligt hjá øllum",
+  "privacy.direct.long": "Øll, sum eru nevnd í postinum",
+  "privacy.direct.short": "Ávís fólk",
+  "privacy.private.long": "Einans tey, ið fylgja tær",
+  "privacy.private.short": "Fylgjarar",
+  "privacy.public.long": "Øll í og uttanfyri Mastodon",
   "privacy.public.short": "Alment",
-  "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
-  "privacy.unlisted.short": "Ikki listað",
+  "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
+  "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+  "privacy.unlisted.short": "Stillur almenningur",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
   "recommended": "Viðmælt",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
   "reply_indicator.cancel": "Ógilda",
+  "reply_indicator.poll": "Atkvøðugreiðsla",
   "report.block": "Blokera",
   "report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
   "report.categories.legal": "Løgfrøðisligt",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
   "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
   "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
-  "upload_form.description_missing": "Lýsing vantar",
   "upload_form.edit": "Rætta",
   "upload_form.thumbnail": "Broyt smámynd",
-  "upload_form.undo": "Strika",
   "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Ger virkið",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f2d99412d2cbee..66a7da6d151c11 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "À quoi pensez-vous?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Publier",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
-  "privacy.private.short": "Abonné·e·s seulement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "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 malvoyants",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 774702f98cbb86..2d0fa3b7ddf127 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Nouvelle publication",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "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": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement par vos abonnés",
-  "privacy.private.short": "Abonnés uniquement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "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.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index ea42ef91c0962b..d5f22d2ee101d1 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
-  "autosuggest_hashtag.per_week": "{count} yn ’e wike",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
   "compose_form.lock_disclaimer.lock": "beskoattele",
   "compose_form.placeholder": "Wat wolle jo kwyt?",
-  "compose_form.poll.add_option": "Kar tafoegje",
   "compose_form.poll.duration": "Doer fan de enkête",
-  "compose_form.poll.option_placeholder": "Kar {number}",
-  "compose_form.poll.remove_option": "Dizze kar fuortsmite",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
-  "compose_form.publish": "Publisearje",
   "compose_form.publish_form": "Publisearje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wizigingen bewarje",
-  "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
   "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
-  "compose_form.spoiler_placeholder": "Warskôgingstekst",
   "confirmation_modal.cancel": "Annulearje",
   "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Priveefermeldingen",
   "navigation_bar.discover": "Untdekke",
   "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.edit_profile": "Profyl bewurkje",
   "navigation_bar.explore": "Ferkenne",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Negearre wurden",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Poll tafoegje",
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
-  "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
-  "privacy.direct.short": "Allinnich fermelde minsken",
-  "privacy.private.long": "Allinnich sichtber foar folgers",
-  "privacy.private.short": "Allinnich folgers",
-  "privacy.public.long": "Sichtber foar elkenien",
   "privacy.public.short": "Iepenbier",
-  "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
-  "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
@@ -715,10 +696,8 @@
   "upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Gjin omskriuwing tafoege",
   "upload_form.edit": "Bewurkje",
   "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
-  "upload_form.undo": "Fuortsmite",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ofbylding analysearje…",
   "upload_modal.apply": "Tapasse",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index f0f9c55549664a..855a27d0579bf6 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Fógra",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
-  "autosuggest_hashtag.per_week": "{count} sa seachtain",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -127,19 +126,12 @@
   "compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
   "compose_form.lock_disclaimer.lock": "faoi ghlas",
   "compose_form.placeholder": "Cad atá ag tarlú?",
-  "compose_form.poll.add_option": "Cuir rogha isteach",
   "compose_form.poll.duration": "Achar suirbhéanna",
-  "compose_form.poll.option_placeholder": "Rogha {number}",
-  "compose_form.poll.remove_option": "Bain an rogha seo",
   "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
-  "compose_form.publish": "Foilsigh",
   "compose_form.publish_form": "Foilsigh\n",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sábháil",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
-  "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
   "confirmation_modal.cancel": "Cealaigh",
   "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
@@ -325,7 +317,6 @@
   "navigation_bar.compose": "Cum postáil nua",
   "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
-  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
   "navigation_bar.explore": "Féach thart",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -401,12 +392,7 @@
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
-  "privacy.private.short": "Leantóirí amháin",
-  "privacy.public.long": "Infheicthe do chách",
   "privacy.public.short": "Poiblí",
-  "privacy.unlisted.short": "Neamhliostaithe",
   "privacy_policy.title": "Polasaí príobháideachais",
   "refresh": "Athnuaigh",
   "regeneration_indicator.label": "Ag lódáil…",
@@ -529,7 +515,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
-  "upload_form.undo": "Scrios",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 11d83d6ceb14e8..0c7ef79cd8b861 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
-  "autosuggest_hashtag.per_week": "{count} san t-seachdain",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
-  "compose_form.poll.add_option": "Cuir roghainn ris",
   "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
-  "compose_form.poll.option_placeholder": "Roghainn {number}",
-  "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
-  "compose_form.publish": "Foillsich",
   "compose_form.publish_form": "Post ùr",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sàbhail na h-atharraichean",
-  "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
   "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
-  "compose_form.spoiler_placeholder": "Sgrìobh an rabhadh agad an-seo",
   "confirmation_modal.cancel": "Sguir dheth",
   "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "Iomraidhean prìobhaideach",
   "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.edit_profile": "Deasaich a’ phròifil",
   "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "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": "An fheadhainn le iomradh orra a-mhàin",
-  "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
-  "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine e",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
-  "privacy.unlisted.short": "Falaichte o liostaichean",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
   "refresh": "Ath-nuadhaich",
@@ -696,10 +677,8 @@
   "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.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
-  "upload_form.undo": "Sguab às",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
   "upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
   "upload_modal.apply": "Cuir an sàs",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e857b6955421b2..ffd01a547d7892 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -146,22 +145,12 @@
   "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",
   "compose_form.placeholder": "Que contas?",
-  "compose_form.poll.add_option": "Engadir unha opción",
   "compose_form.poll.duration": "Duración da enquisa",
-  "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
-  "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mencións privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Descubrir",
   "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
-  "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só persoas mencionadas",
-  "privacy.private.long": "Só para persoas que te seguen",
-  "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
-  "privacy.unlisted.short": "Sen listar",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
@@ -715,10 +696,8 @@
   "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 cegas ou con problemas visuais",
-  "upload_form.description_missing": "Sen descrición",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar a miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
   "upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 67584572733f22..d88a8c49c3687d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
-  "autosuggest_hashtag.per_week": "{count} לשבוע",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
   "compose_form.placeholder": "על מה את.ה חושב.ת?",
-  "compose_form.poll.add_option": "הוסיפו בחירה",
+  "compose_form.poll.add_option": "הוספת אפשרות",
   "compose_form.poll.duration": "משך הסקר",
-  "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
-  "compose_form.poll.remove_option": "הסר בחירה זו",
+  "compose_form.poll.multiple": "בחירה מרובה",
+  "compose_form.poll.option_placeholder": "אפשרות {number}",
+  "compose_form.poll.remove_option": "הסרת אפשרות זו",
+  "compose_form.poll.single": "נא לבחור",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
-  "compose_form.publish": "פרסום",
+  "compose_form.poll.type": "סוג משאל",
+  "compose_form.publish": "הודעה",
   "compose_form.publish_form": "לפרסם",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "שמירת שינויים",
-  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
-  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+  "compose_form.reply": "תגובה",
+  "compose_form.save_changes": "עדכון",
   "compose_form.spoiler.marked": "הסר אזהרת תוכן",
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
-  "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
+  "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
   "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "הודעות פרטיות",
   "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.edit_profile": "עריכת פרופיל",
   "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
   "navigation_bar.filters": "מילים מושתקות",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "הוספת סקר",
   "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
-  "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
-  "privacy.direct.short": "למאוזכרים בלבד",
-  "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "לעוקבים בלבד",
-  "privacy.public.long": "גלוי לכל",
+  "privacy.direct.long": "כל המוזכרים בהודעה",
+  "privacy.direct.short": "א.נשים מסוימים",
+  "privacy.private.long": "לעוקביך בלבד",
+  "privacy.private.short": "עוקבים",
+  "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
-  "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
@@ -551,7 +547,9 @@
   "relative_time.minutes": "{number} דקות",
   "relative_time.seconds": "{number} שניות",
   "relative_time.today": "היום",
+  "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
   "reply_indicator.cancel": "ביטול",
+  "reply_indicator.poll": "משאל",
   "report.block": "לחסום",
   "report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
   "report.categories.legal": "חוקי",
@@ -715,10 +713,8 @@
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
   "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.description_missing": "לא הוסף תיאור",
   "upload_form.edit": "עריכה",
   "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
-  "upload_form.undo": "ביטול",
   "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
   "upload_modal.analyzing_picture": "מנתח תמונה…",
   "upload_modal.apply": "החל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 412159bef9b7b7..42f4ca4efab233 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -83,7 +83,6 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
-  "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -138,22 +137,12 @@
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "विकल्प जोड़े",
   "compose_form.poll.duration": "चुनाव की अवधि",
-  "compose_form.poll.option_placeholder": "कुल विकल्प {number}",
-  "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
-  "compose_form.publish": "पब्लिश",
   "compose_form.publish_form": "पब्लिश",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनों को सहेजें",
-  "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
-  "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
-  "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
-  "compose_form.spoiler_placeholder": "अपनी चेतावनी यहाँ लिखें",
   "confirmation_modal.cancel": "रद्द करें",
   "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
@@ -370,7 +359,6 @@
   "navigation_bar.direct": "निजी संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
   "navigation_bar.explore": "अन्वेषण करें",
   "navigation_bar.favourites": "पसंदीदा",
   "navigation_bar.filters": "वारित शब्द",
@@ -440,13 +428,7 @@
   "poll.vote": "वोट",
   "poll.voted": "आपने इसी उत्तर का चुनाव किया है।",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.short": "अनलिस्टेड",
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
@@ -531,7 +513,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "संशोधन करें",
-  "upload_form.undo": "मिटाए",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.apply": "लागू करें",
   "upload_modal.edit_media": "मीडिया में संशोधन करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c535f1affc6bf4..cada365fc868c8 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -88,7 +88,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
   "bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
@@ -140,22 +139,12 @@
   "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",
   "compose_form.placeholder": "Što ti je na umu?",
-  "compose_form.poll.add_option": "Dodaj opciju",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Opcija {number}",
-  "compose_form.poll.remove_option": "Ukloni ovu opciju",
   "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
   "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spremi promjene",
-  "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
-  "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
-  "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
-  "compose_form.spoiler_placeholder": "Ovdje upišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -346,7 +335,6 @@
   "navigation_bar.direct": "Privatna spominjanja",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
@@ -415,13 +403,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
-  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vidljivo svima",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.short": "Neprikazano",
   "privacy_policy.last_updated": "Zadnje ažurirannje {date}",
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
   "recommended": "Preporučeno",
@@ -561,10 +543,8 @@
   "upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
   "upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
   "upload_form.description": "Opišite za ljude sa slabim vidom",
-  "upload_form.description_missing": "Bez opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promijeni pretpregled",
-  "upload_form.undo": "Obriši",
   "upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiza slike…",
   "upload_modal.apply": "Primijeni",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0d50e36feb5b0d..31bca5652bcb66 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
-  "autosuggest_hashtag.per_week": "{count} hetente",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -146,22 +145,22 @@
   "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": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
-  "compose_form.poll.add_option": "Lehetőség hozzáadása",
+  "compose_form.poll.add_option": "Opció hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
-  "compose_form.poll.option_placeholder": "{number}. lehetőség",
-  "compose_form.poll.remove_option": "Lehetőség eltávolítása",
+  "compose_form.poll.multiple": "Több választás",
+  "compose_form.poll.option_placeholder": "Opció {number}",
+  "compose_form.poll.remove_option": "Opció eltávolítása",
+  "compose_form.poll.single": "Egy választása",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
-  "compose_form.publish": "Közzététel",
+  "compose_form.poll.type": "Stílus",
+  "compose_form.publish": "Bejegyzés",
   "compose_form.publish_form": "Új bejegyzés",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Módosítások mentése",
-  "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
-  "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
+  "compose_form.reply": "Válasz",
+  "compose_form.save_changes": "Frissítés",
   "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
-  "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+  "compose_form.spoiler_placeholder": "Tartalom figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
   "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Letiltott tartományok",
-  "navigation_bar.edit_profile": "Profil szerkesztése",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "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 megemlítetteknek",
-  "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.direct.long": "Mindenki, akit a bejegyzésben említettek",
+  "privacy.direct.short": "Adott személyek",
+  "privacy.private.long": "Csak a követők",
+  "privacy.private.short": "Követők",
+  "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
-  "privacy.unlisted.short": "Listázatlan",
+  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírcsatornákban vagy hashtagokban, felfedezésben vagy a Mastodon keresésben, még akkor sem, ha az egész fiókra bejelentkezetünk.",
+  "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+  "privacy.unlisted.short": "Csendes nyilvánosság",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
+  "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
   "reply_indicator.cancel": "Mégsem",
+  "reply_indicator.poll": "Szavazás",
   "report.block": "Letiltás",
   "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
   "report.categories.legal": "Jogi információk",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
   "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
   "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
-  "upload_form.description_missing": "Nincs leírás megadva",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Bélyegkép megváltoztatása",
-  "upload_form.undo": "Törlés",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
   "upload_modal.apply": "Alkalmaz",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 835105218d5218..6ddcfcdb2175da 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,6 @@
   "alert.unexpected.title": "Վա՜յ",
   "announcement.announcement": "Յայտարարութիւններ",
   "audio.hide": "Թաքցնել աուդիոն",
-  "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.error.title": "Օ՜, ոչ։",
   "bundle_column_error.network.title": "Ցանցի սխալ",
@@ -117,22 +116,12 @@
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
   "compose_form.placeholder": "Ի՞նչ կայ մտքիդ",
-  "compose_form.poll.add_option": "Աւելացնել տարբերակ",
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
-  "compose_form.poll.option_placeholder": "Տարբերակ {number}",
-  "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
   "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
   "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
-  "compose_form.publish": "Հրապարակել",
   "compose_form.publish_form": "Հրապարակել",
-  "compose_form.publish_loud": "Հրապարակե՜լ",
-  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
-  "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
-  "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
-  "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
-  "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
   "confirmation_modal.cancel": "Չեղարկել",
   "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
@@ -325,7 +314,6 @@
   "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.edit_profile": "Խմբագրել հաշիւը",
   "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
@@ -414,13 +402,7 @@
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
-  "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողները",
-  "privacy.public.long": "Տեսանելի բոլորին",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.short": "Ծածուկ",
   "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
   "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
   "refresh": "Թարմացնել",
@@ -556,7 +538,6 @@
   "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.thumbnail": "Փոխել պատկերակը",
-  "upload_form.undo": "Յետարկել",
   "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a660eb77ff592b..14b75a17f4351c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -56,7 +56,6 @@
   "alert.unexpected.message": "Ocurreva un error inexpectate.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per septimana",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
@@ -90,15 +89,9 @@
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "blocate",
-  "compose_form.poll.add_option": "Adder un option",
-  "compose_form.poll.remove_option": "Remover iste option",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar le cambiamentos",
   "compose_form.spoiler.marked": "Remover advertimento de contento",
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
-  "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Deler",
@@ -217,7 +210,6 @@
   "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
-  "navigation_bar.edit_profile": "Modificar profilo",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.lists": "Listas",
@@ -252,8 +244,6 @@
   "poll.closed": "Claudite",
   "poll.reveal": "Vider le resultatos",
   "privacy.change": "Cambiar privacitate del message",
-  "privacy.private.long": "Visibile solmente pro sequitores",
-  "privacy.public.long": "Visibile pro totos",
   "privacy.public.short": "Public",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
@@ -307,7 +297,6 @@
   "tabs_bar.notifications": "Notificationes",
   "timeline_hint.resources.statuses": "Messages ancian",
   "trends.trending_now": "Ora in tendentias",
-  "upload_form.undo": "Deler",
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.detect_text": "Deteger texto ab un pictura",
   "video.close": "Clauder le video",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5af20a97f7bc8c..1670d616fb2ac1 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -82,7 +82,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} per minggu",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -134,22 +133,12 @@
   "compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
   "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
-  "compose_form.poll.add_option": "Tambahkan pilihan",
   "compose_form.poll.duration": "Durasi japat",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Hapus opsi ini",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
-  "compose_form.publish": "Terbitkan",
   "compose_form.publish_form": "Terbitkan",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
-  "compose_form.spoiler_placeholder": "Peringatan konten",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
@@ -364,7 +353,6 @@
   "navigation_bar.compose": "Tulis toot baru",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.edit_profile": "Ubah profil",
   "navigation_bar.explore": "Jelajahi",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
@@ -454,14 +442,7 @@
   "poll_button.add_poll": "Tambah japat",
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Ubah privasi kiriman",
-  "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Orang yang disebutkan saja",
-  "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
-  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
-  "privacy.unlisted.short": "Tak Terdaftar",
   "privacy_policy.last_updated": "Terakhir diperbarui {date}",
   "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
@@ -615,10 +596,8 @@
   "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.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambar…",
   "upload_modal.apply": "Terapkan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8579fc89c65604..5188d137e3bf59 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per semane",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
   "compose_form.placeholder": "Quo es in tui spiritu?",
-  "compose_form.poll.add_option": "Adjunter un option",
+  "compose_form.poll.add_option": "Adjunter option",
   "compose_form.poll.duration": "Duration del balotation",
+  "compose_form.poll.multiple": "Selection multiplic",
   "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.remove_option": "Remover ti-ci option",
+  "compose_form.poll.single": "Selecter un",
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postar",
   "compose_form.publish_form": "Nov posta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Conservar changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
-  "compose_form.spoiler_placeholder": "Scri tui avise ci",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Privat mentiones",
   "navigation_bar.discover": "Decovrir",
   "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.edit_profile": "Redacter profil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Adjunter un balotation",
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
-  "privacy.direct.long": "Visibil solmen a mentionat usatores",
-  "privacy.direct.short": "Solmen persones mentionat",
-  "privacy.private.long": "Visibil solmen por sequitores",
-  "privacy.private.short": "Solmen sequitores",
-  "privacy.public.long": "Visibil a omnes",
+  "privacy.direct.short": "Specific persones",
+  "privacy.private.long": "Solmen tui sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
-  "privacy.unlisted.short": "Delistat",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
@@ -715,10 +709,8 @@
   "upload_error.poll": "On ne es permisset cargar medie con balotationes.",
   "upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
   "upload_form.description": "Descrir por persones qui es ciec o have mal vision",
-  "upload_form.description_missing": "Null descrition adjuntet",
   "upload_form.edit": "Redacter",
   "upload_form.thumbnail": "Changear previsual image",
-  "upload_form.undo": "Deleter",
   "upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
   "upload_modal.analyzing_picture": "Analisant image…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index f163567f176035..a4f72684222375 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -107,8 +107,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "relative_time.full.just_now": "kịta",
   "relative_time.just_now": "kịta",
   "relative_time.today": "taa",
@@ -142,7 +140,6 @@
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "Hichapụ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Họrọ onyonyo",
   "upload_progress.label": "Uploading…"
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 233b7684573582..a9dd32c06caf16 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Anunco",
   "attachments_list.unprocessed": "(neprocedita)",
   "audio.hide": "Celez audio",
-  "autosuggest_hashtag.per_week": "{count} dum singla semano",
   "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "bundle_column_error.copy_stacktrace": "Kopierorraporto",
   "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
   "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Insertez selekto",
   "compose_form.poll.duration": "Votpostoduro",
-  "compose_form.poll.option_placeholder": "Selektato {number}",
-  "compose_form.poll.remove_option": "Efacez ca selektajo",
   "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
   "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
-  "compose_form.publish": "Publikigez",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sparez chanji",
-  "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Averto di kontenajo",
   "confirmation_modal.cancel": "Anulez",
   "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "Privata mencioni",
   "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Modifikar profilo",
   "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favoriziti",
   "navigation_bar.filters": "Silencigita vorti",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Insertez votposto",
   "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
-  "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Mencionita personi nur",
-  "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Sequanti nur",
-  "privacy.public.long": "Videbla da omnu",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
-  "privacy.unlisted.short": "Ne enlistigota",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
   "recommended": "Rekomendata",
@@ -708,10 +689,8 @@
   "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
   "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
   "upload_form.description": "Deskriptez por personi kun vidnekapableso",
-  "upload_form.description_missing": "Deskriptajo ne insertesis",
   "upload_form.edit": "Modifikez",
   "upload_form.thumbnail": "Chanjez imajeto",
-  "upload_form.undo": "Desfacar",
   "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
   "upload_modal.analyzing_picture": "Analizas imajo…",
   "upload_modal.apply": "Aplikez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index fb839503e97e5c..dfece102bb2654 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
-  "autosuggest_hashtag.per_week": "{count} á viku",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvað liggur þér á hjarta?",
   "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
+  "compose_form.poll.multiple": "Margir valkostir",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
   "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
+  "compose_form.poll.single": "Veldu eitt",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
+  "compose_form.poll.type": "Stíll",
   "compose_form.publish": "Birta",
   "compose_form.publish_form": "Birta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Vista breytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppfæra",
   "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
-  "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
+  "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
   "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Einkaspjall",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.edit_profile": "Breyta notandasniði",
   "navigation_bar.explore": "Kanna",
   "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Bæta við könnun",
   "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 minnst er á",
-  "privacy.private.long": "Senda einungis á fylgjendur",
-  "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Sýnilegt fyrir alla",
+  "privacy.direct.long": "Allir sem minnst er á í færslunni",
+  "privacy.direct.short": "Tilteknir aðilar",
+  "privacy.private.long": "Einungis þeir sem fylgjast með þér",
+  "privacy.private.short": "Fylgjendur",
+  "privacy.public.long": "Hver sem er, á og utan Mastodon",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
-  "privacy.unlisted.short": "Óskráð",
+  "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
+  "privacy.unlisted.long": "Minni stælar í reikniritum",
+  "privacy.unlisted.short": "Hljóðlátt opinbert",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
   "recommended": "Mælt með",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
   "reply_indicator.cancel": "Hætta við",
+  "reply_indicator.poll": "Könnun",
   "report.block": "Útiloka",
   "report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
   "report.categories.legal": "Lagalegt",
@@ -715,10 +716,8 @@
   "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.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
-  "upload_form.undo": "Eyða",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Virkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4fb4d88cbc8964..920b80d5a61200 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
-  "autosuggest_hashtag.per_week": "{count} a settimana",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
-  "compose_form.poll.add_option": "Aggiungi una scelta",
+  "compose_form.poll.add_option": "Aggiungi opzione",
   "compose_form.poll.duration": "Durata del sondaggio",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Rimuovi questa scelta",
+  "compose_form.poll.multiple": "Scelta multipla",
+  "compose_form.poll.option_placeholder": "Opzione {number}",
+  "compose_form.poll.remove_option": "Rimuovi questa opzione",
+  "compose_form.poll.single": "Scegli uno",
   "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
   "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+  "compose_form.poll.type": "Stile",
   "compose_form.publish": "Pubblica",
   "compose_form.publish_form": "Nuovo post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salva le modifiche",
-  "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+  "compose_form.reply": "Rispondi",
+  "compose_form.save_changes": "Aggiorna",
   "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
-  "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
+  "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menzioni private",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.edit_profile": "Modifica il profilo",
   "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Aggiungi un sondaggio",
   "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
-  "privacy.direct.long": "Visibile solo per gli utenti menzionati",
-  "privacy.direct.short": "Solo persone menzionate",
-  "privacy.private.long": "Visibile solo ai seguaci",
-  "privacy.private.short": "Solo seguaci",
-  "privacy.public.long": "Visibile a tutti",
+  "privacy.direct.long": "Tutti quelli menzioniati nel post",
+  "privacy.direct.short": "Persone specifiche",
+  "privacy.private.long": "Solo i tuoi follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
-  "privacy.unlisted.short": "Non elencato",
+  "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
+  "privacy.unlisted.long": "Meno fanfare algoritmiche",
+  "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
   "recommended": "Consigliato",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
+  "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
   "reply_indicator.cancel": "Annulla",
+  "reply_indicator.poll": "Sondaggio",
   "report.block": "Blocca",
   "report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
   "report.categories.legal": "Informazioni legali",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
   "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
   "upload_form.description": "Descrizione per ipovedenti",
-  "upload_form.description_missing": "Nessuna descrizione aggiunta",
   "upload_form.edit": "Modifica",
   "upload_form.thumbnail": "Cambia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
   "upload_modal.analyzing_picture": "Analizzando l'immagine…",
   "upload_modal.apply": "Applica",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7aafe852ab3d5..e0cc96d571cd9d 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "お知らせ",
   "attachments_list.unprocessed": "(未処理)",
   "audio.hide": "音声を閉じる",
-  "autosuggest_hashtag.per_week": "{count} 回 / 週",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
   "compose_form.placeholder": "今なにしてる？",
-  "compose_form.poll.add_option": "追加",
   "compose_form.poll.duration": "アンケート期間",
-  "compose_form.poll.option_placeholder": "項目 {number}",
-  "compose_form.poll.remove_option": "この項目を削除",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
-  "compose_form.publish": "投稿",
   "compose_form.publish_form": "投稿",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "変更を保存",
-  "compose_form.sensitive.hide": "メディアを閲覧注意にする",
-  "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
-  "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
   "compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
   "compose_form.spoiler.unmarked": "本文は隠されていません",
-  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "非公開の返信",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.explore": "探索する",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "指定された相手のみ閲覧可",
-  "privacy.direct.short": "指定された相手のみ",
-  "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
-  "privacy.unlisted.short": "非収載",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
   "recommended": "おすすめ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "説明を追加していません",
   "upload_form.edit": "編集",
   "upload_form.thumbnail": "サムネイルを変更",
-  "upload_form.undo": "削除",
   "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
   "upload_modal.analyzing_picture": "画像を解析中…",
   "upload_modal.apply": "適用",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9d977e93312076..8628cb38a227cd 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -36,7 +36,6 @@
   "admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
   "alert.unexpected.title": "უპს!",
-  "autosuggest_hashtag.per_week": "კვირაში {count}",
   "boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
   "bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
   "bundle_modal_error.close": "დახურვა",
@@ -68,11 +67,8 @@
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
   "compose_form.placeholder": "რაზე ფიქრობ?",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
-  "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
   "compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
-  "compose_form.spoiler_placeholder": "თქვენი გაფრთხილება დაწერეთ აქ",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
   "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
@@ -171,7 +167,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
-  "navigation_bar.edit_profile": "შეცვალე პროფილი",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.lists": "სიები",
@@ -211,12 +206,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
-  "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.short": "ჩამოუთვლელი",
   "regeneration_indicator.label": "იტვირთება…",
   "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
@@ -279,7 +269,6 @@
   "upload_button.label": "მედიის დამატება",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
-  "upload_form.undo": "გაუქმება",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "იტვირთება...",
   "video.close": "ვიდეოს დახურვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 08c70a9405a658..d9388c7048043f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "autosuggest_hashtag.per_week": "{count} i yimalas",
   "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -99,20 +98,10 @@
   "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
-  "compose_form.poll.add_option": "Rnu afran",
   "compose_form.poll.duration": "Tanzagt n tefrant",
-  "compose_form.poll.option_placeholder": "Afran {number}",
-  "compose_form.poll.remove_option": "Sfeḍ afran-agi",
-  "compose_form.publish": "Suffeɣ",
   "compose_form.publish_form": "Suffeɣ",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sekles ibeddilen",
-  "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
-  "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
-  "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
@@ -284,7 +273,6 @@
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
-  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
@@ -359,12 +347,7 @@
   "poll_button.add_poll": "Rnu asenqed",
   "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.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Imeḍfaṛen kan",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.short": "War tabdert",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
@@ -472,7 +455,6 @@
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
   "upload_form.thumbnail": "Beddel tugna",
-  "upload_form.undo": "Kkes",
   "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 97b1991803272c..1f6cc78a57efd2 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -64,7 +64,6 @@
   "alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
   "alert.unexpected.title": "Өй!",
   "announcement.announcement": "Хабарландыру",
-  "autosuggest_hashtag.per_week": "{count} аптасына",
   "boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
   "bundle_column_error.retry": "Қайтадан көріңіз",
   "bundle_modal_error.close": "Жабу",
@@ -99,19 +98,12 @@
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
   "compose_form.placeholder": "Не бөліскіңіз келеді?",
-  "compose_form.poll.add_option": "Жауап қос",
   "compose_form.poll.duration": "Сауалнама мерзімі",
-  "compose_form.poll.option_placeholder": "Жауап {number}",
-  "compose_form.poll.remove_option": "Бұл жауапты өшір",
   "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
   "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
-  "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
-  "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
-  "compose_form.spoiler_placeholder": "Ескертуіңізді осында жазыңыз",
   "confirmation_modal.cancel": "Қайтып алу",
   "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
@@ -250,7 +242,6 @@
   "navigation_bar.compose": "Жаңа жазба бастау",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
-  "navigation_bar.edit_profile": "Профиль түзету",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
   "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
@@ -311,12 +302,7 @@
   "poll_button.add_poll": "Сауалнама қосу",
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
-  "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.short": "Тізімсіз",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",
   "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
@@ -399,7 +385,6 @@
   "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
   "upload_form.edit": "Түзету",
   "upload_form.thumbnail": "Суретті өзгерту",
-  "upload_form.undo": "Өшіру",
   "upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
   "upload_modal.analyzing_picture": "Суретті анализ жасау…",
   "upload_modal.apply": "Қолдану",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 473690070fcbe2..396aebbdf223ee 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -91,10 +91,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 70ce6611d62b83..eae7f8faea09eb 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -68,7 +68,7 @@
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
-  "account.unfollow": "팔로우 해제",
+  "account.unfollow": "언팔로우",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications_short": "알림 뮤트 해제",
   "account.unmute_short": "뮤트 해제",
@@ -89,7 +89,6 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
-  "autosuggest_hashtag.per_week": "주간 {count}회",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
   "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
-  "compose_form.poll.option_placeholder": "{number}번 항목",
+  "compose_form.poll.multiple": "다중 선택",
+  "compose_form.poll.option_placeholder": "{option}번째 항목",
   "compose_form.poll.remove_option": "이 항목 삭제",
+  "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
+  "compose_form.poll.type": "형식",
   "compose_form.publish": "게시",
   "compose_form.publish_form": "새 게시물",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "변경사항 저장",
-  "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
-  "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
-  "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
+  "compose_form.reply": "답장",
+  "compose_form.save_changes": "수정",
   "compose_form.spoiler.marked": "열람주의 제거",
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
-  "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
+  "compose_form.spoiler_placeholder": "열람 주의 (옵션)",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "개인적인 멘션",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.edit_profile": "프로필 수정",
   "navigation_bar.explore": "둘러보기",
   "navigation_bar.favourites": "좋아요",
   "navigation_bar.filters": "뮤트한 단어",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "설문 추가",
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
-  "privacy.direct.long": "언급된 사용자만 볼 수 있음",
-  "privacy.direct.short": "멘션한 사람들만",
-  "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "모두가 볼 수 있음",
+  "privacy.direct.long": "이 게시물에서 언급된 모두",
+  "privacy.direct.short": "특정 인물",
+  "privacy.private.long": "내 팔로워들에게만",
+  "privacy.private.short": "팔로워",
+  "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
-  "privacy.unlisted.short": "미등재",
+  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 라이브 피드나 해시태그, 발견하기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
+  "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
   "recommended": "추천함",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
+  "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
   "reply_indicator.cancel": "취소",
+  "reply_indicator.poll": "투표",
   "report.block": "차단",
   "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
   "report.categories.legal": "법적인 문제",
@@ -715,10 +716,8 @@
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
-  "upload_form.description_missing": "설명이 추가되지 않음",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
   "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 7d8603cae178fc..4a0fd671db993c 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "Daxuyanî",
   "attachments_list.unprocessed": "(bêpêvajo)",
   "audio.hide": "Dengê veşêre",
-  "autosuggest_hashtag.per_week": "Her hefte {count}",
   "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
   "bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
   "bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
   "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
-  "compose_form.poll.remove_option": "Vê hilbijarê rake",
   "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
   "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
-  "compose_form.publish": "Biweşîne",
   "compose_form.publish_form": "Biweşîne",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guhertinan tomar bike",
-  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
-  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
   "confirmation_modal.cancel": "Dev jê berde",
   "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
@@ -351,7 +340,6 @@
   "navigation_bar.direct": "Qalkirinên taybet",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.edit_profile": "Profîlê serrast bike",
   "navigation_bar.explore": "Vekole",
   "navigation_bar.filters": "Peyvên bêdengkirî",
   "navigation_bar.follow_requests": "Daxwazên şopandinê",
@@ -437,14 +425,7 @@
   "poll_button.add_poll": "Rapirsîyek zêde bike",
   "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ê kesên qalkirî",
-  "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.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
-  "privacy.unlisted.short": "Nelîstekirî",
   "privacy_policy.last_updated": "Rojanekirina dawî {date}",
   "privacy_policy.title": "Politîka taybetiyê",
   "refresh": "Nû bike",
@@ -608,10 +589,8 @@
   "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.edit": "Serrast bike",
   "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "upload_form.undo": "Jê bibe",
   "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
   "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
   "upload_modal.apply": "Bisepîne",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f384fe1257ea2..e42f50aeffcb62 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -45,7 +45,6 @@
   "alert.unexpected.message": "Gwall anwaytyadow re dharva.",
   "alert.unexpected.title": "Oups!",
   "announcement.announcement": "Deklaryans",
-  "autosuggest_hashtag.per_week": "{count} an seythen",
   "boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
   "bundle_column_error.retry": "Assayewgh arta",
   "bundle_modal_error.close": "Degea",
@@ -80,20 +79,12 @@
   "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",
   "compose_form.placeholder": "Pyth eus yn agas brys?",
-  "compose_form.poll.add_option": "Keworra dewis",
   "compose_form.poll.duration": "Duryans sondyans",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Dilea'n dewis ma",
   "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
   "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
-  "compose_form.spoiler_placeholder": "Skrifewgh agas gwarnyans omma",
   "confirmation_modal.cancel": "Hedhi",
   "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
@@ -244,7 +235,6 @@
   "navigation_bar.compose": "Komposya post nowydh",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
-  "navigation_bar.edit_profile": "Golegi profil",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
   "navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
@@ -316,12 +306,7 @@
   "poll_button.add_poll": "Keworra sondyans",
   "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.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.short": "Anrelys",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",
   "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
@@ -407,7 +392,6 @@
   "upload_form.description": "Deskrifewgh rag tus dhallek",
   "upload_form.edit": "Golegi",
   "upload_form.thumbnail": "Chanjya avenik",
-  "upload_form.undo": "Dilea",
   "upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
   "upload_modal.analyzing_picture": "Ow tytratya skeusen…",
   "upload_modal.apply": "Gweytha",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 3e5747ba8ba5a1..698b3da4c33cbf 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -34,9 +34,7 @@
   "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.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "Barrire",
   "compose_form.publish_form": "Barrire",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.block.confirm": "Impedire",
@@ -116,9 +114,6 @@
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Coram publico",
   "privacy.public.short": "Coram publico",
   "relative_time.full.just_now": "nunc",
   "relative_time.just_now": "nunc",
@@ -153,7 +148,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
-  "upload_form.undo": "Oblitterare",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 8fde68742774a2..ba99f5cd30881d 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonder audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
   "compose_form.lock_disclaimer.lock": "serrado",
   "compose_form.placeholder": "Ke haber?",
-  "compose_form.poll.add_option": "Adjusta opsyon",
   "compose_form.poll.duration": "Durasion de anketa",
-  "compose_form.poll.option_placeholder": "Opsyon {number}",
-  "compose_form.poll.remove_option": "Kita esta opsyon",
   "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
   "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
-  "compose_form.publish": "Publika",
   "compose_form.publish_form": "Mueva publikasyon",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guadra trokamientos",
-  "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
   "compose_form.spoiler.marked": "Kita avertensya de kontenido",
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
-  "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
   "confirmation_modal.cancel": "Anula",
   "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Enmentaduras privadas",
   "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.edit_profile": "Edita profil",
   "navigation_bar.explore": "Eksplorar",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Adjusta anketa",
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
-  "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
-  "privacy.direct.short": "Solo personas enmentadas",
-  "privacy.private.long": "Vizivle solo para suivantes",
-  "privacy.private.short": "Solo suivantes",
-  "privacy.public.long": "Vizivle para todos",
   "privacy.public.short": "Publiko",
-  "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
@@ -708,10 +689,8 @@
   "upload_error.poll": "No se permite kargar dosyas kon anketas.",
   "upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
   "upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
-  "upload_form.description_missing": "No adjustates deskripsion",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Troka minyatura",
-  "upload_form.undo": "Efasa",
   "upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
   "upload_modal.analyzing_picture": "Analizando imaje…",
   "upload_modal.apply": "Aplika",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 623ff2248f9ae5..14fa09e973bd8e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
-  "autosuggest_hashtag.per_week": "{count} per savaitę",
   "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Kas tavo mintyse?",
   "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
+  "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} pasirinkimas",
   "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+  "compose_form.poll.single": "Pasirinkti vieną",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Išsaugoti pakeitimus",
-  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+  "compose_form.reply": "Atsakyti",
+  "compose_form.save_changes": "Atnaujinti",
   "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
-  "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+  "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
   "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
@@ -342,6 +341,7 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Uždaryti",
+  "lists.new.create": "Pridėti sąrašą",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
@@ -356,7 +356,6 @@
   "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Redaguoti profilį",
   "navigation_bar.explore": "Naršyti",
   "navigation_bar.favourites": "Mėgstamiausi",
   "navigation_bar.filters": "Nutylėti žodžiai",
@@ -466,14 +465,15 @@
   "poll_button.add_poll": "Pridėti apklausą",
   "poll_button.remove_poll": "Šalinti apklausą",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visiems matomas",
+  "privacy.direct.long": "Visus, paminėtus įraše",
+  "privacy.direct.short": "Konkretūs žmonės",
+  "privacy.private.long": "Tik sekėjams",
+  "privacy.private.short": "Sekėjai",
+  "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
   "privacy.public.short": "Viešas",
-  "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
-  "privacy.unlisted.short": "Neįtrauktas į sąrašą",
+  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
+  "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
@@ -485,7 +485,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
   "reply_indicator.cancel": "Atšaukti",
+  "reply_indicator.poll": "Apklausa",
   "report.block": "Blokuoti",
   "report.categories.legal": "Legalus",
   "report.categories.other": "Kita",
@@ -579,9 +581,7 @@
   "units.short.thousand": "{count} tūkst.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Nėra pridėto aprašymo",
   "upload_form.edit": "Redaguoti",
-  "upload_form.undo": "Ištrinti",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Pasirinkti vaizdą",
   "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c06a1d936826fd..b4426b4c45b29f 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Paziņojums",
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
-  "autosuggest_hashtag.per_week": "{count} nedēļā",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas tev padomā?",
-  "compose_form.poll.add_option": "Pievienot izvēli",
   "compose_form.poll.duration": "Aptaujas ilgums",
-  "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
-  "compose_form.poll.remove_option": "Noņemt šo izvēli",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
-  "compose_form.publish": "Publicēt",
   "compose_form.publish_form": "Jauns ieraksts",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Saglabāt izmaiņas",
-  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
-  "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
   "confirmation_modal.cancel": "Atcelt",
   "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
@@ -403,7 +392,6 @@
   "navigation_bar.direct": "Privāti pieminēti",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.edit_profile": "Rediģēt profilu",
   "navigation_bar.explore": "Pārlūkot",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
@@ -510,14 +498,7 @@
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
-  "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai minētie cilvēki",
-  "privacy.private.long": "Redzama tikai sekotājiem",
-  "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem",
   "privacy.public.short": "Publiska",
-  "privacy.unlisted.long": "Redzams visiem, bet izslēgts no satura atklāšanas funkcijām",
-  "privacy.unlisted.short": "Neiekļautie",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "refresh": "Atsvaidzināt",
@@ -697,10 +678,8 @@
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
   "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
   "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
-  "upload_form.description_missing": "Apraksts nav pievienots",
   "upload_form.edit": "Rediģēt",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
-  "upload_form.undo": "Dzēst",
   "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
   "upload_modal.apply": "Pielietot",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index bdef3f4a5feeb6..f7080842b710df 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -48,7 +48,6 @@
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.unexpected.message": "Неочекувана грешка.",
   "alert.unexpected.title": "Упс!",
-  "autosuggest_hashtag.per_week": "{count} неделно",
   "boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
   "bundle_column_error.retry": "Обидете се повторно",
   "bundle_modal_error.close": "Затвори",
@@ -76,14 +75,8 @@
   "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.lock": "заклучен",
   "compose_form.placeholder": "Што имате на ум?",
-  "compose_form.poll.add_option": "Додај избор",
   "compose_form.poll.duration": "Времетрање на анкета",
-  "compose_form.poll.option_placeholder": "Избери {number}",
-  "compose_form.poll.remove_option": "Избриши избор",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
-  "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
-  "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
@@ -182,7 +175,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
   "navigation_bar.follows_and_followers": "Следења и следбеници",
@@ -229,12 +221,7 @@
   "poll_button.add_poll": "Додадете нова анкета",
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
-  "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.short": "Необјавено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",
   "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 11636646b26c0a..0059dd333bbdb8 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -60,7 +60,6 @@
   "announcement.announcement": "അറിയിപ്പ്",
   "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
   "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
-  "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
   "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
@@ -102,17 +101,12 @@
   "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.lock": "ലോക്കുചെയ്തു",
   "compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
-  "compose_form.poll.add_option": "ഒരു ചോയ്‌സ് ചേർക്കുക",
   "compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
-  "compose_form.poll.option_placeholder": "ചോയ്‌സ് {number}",
-  "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
-  "compose_form.spoiler_placeholder": "നിങ്ങളുടെ മുന്നറിയിപ്പ് ഇവിടെ എഴുതുക",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
   "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
@@ -244,7 +238,6 @@
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
@@ -302,10 +295,6 @@
   "poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
-  "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.short": "എല്ലാവര്‍ക്കും",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
@@ -372,7 +361,6 @@
   "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.edit": "തിരുത്തുക",
   "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
-  "upload_form.undo": "ഇല്ലാതാക്കുക",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
   "upload_modal.apply": "പ്രയോഗിക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 7f5b7d65248ed5..20231f0bbfd6d4 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -73,7 +73,6 @@
   "alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
   "alert.unexpected.title": "अरेरे!",
   "announcement.announcement": "घोषणा",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
   "bundle_column_error.retry": "पुन्हा प्रयत्न करा",
   "bundle_modal_error.close": "बंद करा",
   "bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
@@ -99,9 +98,6 @@
   "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.placeholder": "आपल्या मनात काय आहे?",
-  "compose_form.poll.add_option": "नवीन पर्याय",
-  "compose_form.poll.option_placeholder": "निवड {number}",
-  "compose_form.poll.remove_option": "हा पर्याय काढा",
   "compose_form.publish_form": "Publish",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
@@ -228,10 +224,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50a48db1ea03d0..8c1ff633768b53 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(belum diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} seminggu",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
   "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
   "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
@@ -143,22 +142,12 @@
   "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",
   "compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
-  "compose_form.poll.add_option": "Tambah pilihan",
   "compose_form.poll.duration": "Tempoh undian",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Buang pilihan ini",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
-  "compose_form.publish": "Terbit",
   "compose_form.publish_form": "Terbit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
   "compose_form.spoiler.marked": "Buang amaran kandungan",
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
-  "compose_form.spoiler_placeholder": "Tulis amaran anda di sini",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
@@ -399,7 +388,6 @@
   "navigation_bar.direct": "Sebutan peribadi",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
-  "navigation_bar.edit_profile": "Sunting profil",
   "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
@@ -506,14 +494,7 @@
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
-  "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Orang yang disebut sahaja",
-  "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Pengikut sahaja",
-  "privacy.public.long": "Kelihatan untuk semua",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
-  "privacy.unlisted.short": "Tidak tersenarai",
   "privacy_policy.last_updated": "Dikemaskini {date}",
   "privacy_policy.title": "Dasar Privasi",
   "refresh": "Muat semula",
@@ -693,10 +674,8 @@
   "upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
   "upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
   "upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
-  "upload_form.description_missing": "Tiada keterangan ditambah",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Padam",
   "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Menganalisis gambar…",
   "upload_modal.apply": "Guna",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 3ca03b616a9620..396a72ac450295 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "ကြေငြာချက်",
   "attachments_list.unprocessed": "(မလုပ်ဆောင်ရသေး)",
   "audio.hide": "အသံပိတ်မည်",
-  "autosuggest_hashtag.per_week": "တစ်ပတ်လျှင် {count}\n",
   "boost_modal.combo": "ဤအရာကို နောက်တစ်ကြိမ်ကျော်ရန် {combo} ကိုနှိပ်နိုင်သည်။",
   "bundle_column_error.copy_stacktrace": "စာကူးရာတွင်ပြဿနာရှိသည်",
   "bundle_column_error.error.body": "ဤစာမျက်နှာကို ဖော်ပြရာတွင် ပြဿနာရှိနေသည်",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "သင့်အကောင့်ကို {သော့ခတ်မထားပါ}။ သင့်နောက်လိုက်-သီးသန့်ပို့စ်များကို ကြည့်ရှုရန် မည်သူမဆို သင့်အား လိုက်ကြည့်နိုင်ပါသည်။",
   "compose_form.lock_disclaimer.lock": "သော့ခတ်ထားမယ်",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "ရွေးချယ်မှုထပ်မံပေါင်းထည့်ပါ",
   "compose_form.poll.duration": "စစ်တမ်းကြာချိန်",
-  "compose_form.poll.option_placeholder": "ရွေးချယ်မှု {number}\n",
-  "compose_form.poll.remove_option": "ဤရွေးချယ်မှုကို ဖယ်ထုတ်ပါ",
   "compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်",
   "compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်",
-  "compose_form.publish": "ပို့စ်တင်မည်",
   "compose_form.publish_form": "ပို့စ်တင်မည်",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ပြောင်းလဲမှုများကို သိမ်းဆည်းပါ",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "သတိပေးစာကိုဤနေရာတွင်ရေးပါ",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
   "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
   "navigation_bar.discover": "ရှာဖွေပါ",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
   "navigation_bar.explore": "စူးစမ်းရန်",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "စစ်တမ်းကောက်မည်",
   "poll_button.remove_poll": "စစ်တမ်းပယ်ဖျက်မည်",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "မန်းရှင်းခေါ်သူသီးသန့်",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "ဖော်လိုးလုပ်သူသီးသန့်",
-  "privacy.private.short": "စောင့်ကြည့်သူများသာ",
-  "privacy.public.long": "အားလုံး မြင်နိုင်သည်",
   "privacy.public.short": "အများကိုပြမည်",
-  "privacy.unlisted.long": "အားလုံးမြင်နိုင်သော်လည်း ရှာဖွေမှုများမှ ဖယ်ထုတ်ထားသည်",
-  "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
   "privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "recommended": "အကြံပြုသည်",
@@ -708,10 +689,8 @@
   "upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
   "upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_form.description_missing": "ဖော်ပြချက် မထည့်ပါ",
   "upload_form.edit": "ပြင်ရန်",
   "upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
-  "upload_form.undo": "ဖျက်ရန်",
   "upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
   "upload_modal.apply": "သုံးပါ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 229d4f4718d40b..86e24a15fb1188 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -69,12 +69,5 @@
   "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
   "compose.language.search": "भाषाहरू खोज्नुहोस्...",
   "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
-  "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
-  "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
-  "compose_form.publish_form": "नयाँ पोस्ट",
-  "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
-  "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
-  "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
-  "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
+  "compose_form.publish_form": "नयाँ पोस्ट"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 86617d4a54b90c..e38f8fd0ba18db 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -146,22 +145,22 @@
   "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": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
-  "compose_form.poll.add_option": "Keuze toevoegen",
+  "compose_form.poll.add_option": "Optie toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
-  "compose_form.poll.option_placeholder": "Keuze {number}",
-  "compose_form.poll.remove_option": "Deze keuze verwijderen",
+  "compose_form.poll.multiple": "Meerkeuze",
+  "compose_form.poll.option_placeholder": "Optie {number}",
+  "compose_form.poll.remove_option": "Deze optie verwijderen",
+  "compose_form.poll.single": "Kies een",
   "compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.type": "Stijl",
+  "compose_form.publish": "Plaatsen",
   "compose_form.publish_form": "Nieuw bericht",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wijzigingen opslaan",
-  "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
+  "compose_form.reply": "Reageren",
+  "compose_form.save_changes": "Bijwerken",
   "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
-  "compose_form.spoiler_placeholder": "Waarschuwingstekst",
+  "compose_form.spoiler_placeholder": "Waarschuwing inhoud (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privéberichten",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
-  "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Privébericht",
-  "privacy.private.long": "Alleen aan volgers tonen",
-  "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar",
+  "privacy.direct.long": "Iedereen genoemd in de post",
+  "privacy.direct.short": "Specifieke mensen",
+  "privacy.private.long": "Alleen jouw volgers",
+  "privacy.private.short": "Volgers",
+  "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
-  "privacy.unlisted.short": "Minder openbaar",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met publiek, behalve dat de post niet zal verschijnen in live feeds of hashtags, verkennen of Mastodon zoeken, zelfs als je gekozen hebt voor account-breed.",
+  "privacy.unlisted.long": "Minder algoritmische fanfare",
+  "privacy.unlisted.short": "Stil publiek",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
   "recommended": "Aanbevolen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
+  "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
   "reply_indicator.cancel": "Annuleren",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkeren",
   "report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
   "report.categories.legal": "Juridisch",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
   "upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
-  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
-  "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
   "upload_modal.analyzing_picture": "Afbeelding analyseren…",
   "upload_modal.apply": "Toepassen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ec2ff8214457b7..9bb4f591971567 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
-  "compose_form.poll.add_option": "Legg til eit val",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Varigheit for rundspørjing",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Fjern dette valet",
+  "compose_form.poll.multiple": "Flervalg",
+  "compose_form.poll.option_placeholder": "Valg {number}",
+  "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
   "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
-  "compose_form.publish": "Legg ut",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Legg ut",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringar",
-  "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
-  "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Lag ei rundspørjing",
   "poll_button.remove_poll": "Fjern rundspørjing",
   "privacy.change": "Endre personvernet på innlegg",
-  "privacy.direct.long": "Synleg kun for omtala brukarar",
-  "privacy.direct.short": "Kun nemnde personar",
-  "privacy.private.long": "Kun synleg for fylgjarar",
-  "privacy.private.short": "Kun fylgjarar",
-  "privacy.public.long": "Synleg for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
   "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
   "upload_form.description": "Skildre for blinde og svaksynte",
-  "upload_form.description_missing": "Inga skildring er lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
-  "upload_form.undo": "Slett",
   "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 50da3bb2be109b..8da9853bee8776 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} per uke",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
@@ -146,22 +145,22 @@
   "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",
   "compose_form.placeholder": "Hva har du på hjertet?",
-  "compose_form.poll.add_option": "Legg til et valg",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Avstemningens varighet",
+  "compose_form.poll.multiple": "Flervalg",
   "compose_form.poll.option_placeholder": "Valg {number}",
   "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Publiser",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringer",
-  "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innholdsvarsel",
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
-  "compose_form.spoiler_placeholder": "Skriv advarselen din her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Legg til en avstemning",
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Juster synlighet",
-  "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Kun nevnte personer",
-  "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
   "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.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
-  "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet …",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1ecfbcaf065173..8660a3bc05a540 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -80,7 +80,6 @@
   "announcement.announcement": "Anóncia",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
   "bundle_column_error.error.title": "Oh non !",
@@ -131,22 +130,12 @@
   "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",
   "compose_form.placeholder": "A de qué pensatz ?",
-  "compose_form.poll.add_option": "Ajustar una causida",
   "compose_form.poll.duration": "Durada del sondatge",
-  "compose_form.poll.option_placeholder": "Opcion {number}",
-  "compose_form.poll.remove_option": "Levar aquesta opcion",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Salvar los cambiaments",
-  "compose_form.sensitive.hide": "Marcar coma sensible",
-  "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
-  "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
-  "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
@@ -359,7 +348,6 @@
   "navigation_bar.direct": "Mencions privadas",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
-  "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
@@ -457,14 +445,7 @@
   "poll_button.add_poll": "Ajustar un sondatge",
   "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": "Sonque per las personas mencionadas",
-  "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Sonque pels seguidors",
-  "privacy.public.long": "Visiblas per totes",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
-  "privacy.unlisted.short": "Pas-listat",
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
@@ -621,10 +602,8 @@
   "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
   "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
-  "upload_form.description_missing": "Cap de descripcion pas aponduda",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar la vinheta",
-  "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de l’imatge…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 132b695cda8478..de085cf9856b35 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -67,9 +67,7 @@
   "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.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
   "compose_form.publish_form": "Publish",
-  "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
@@ -188,7 +186,6 @@
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.discover": "ਖੋਜ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
-  "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
@@ -238,8 +235,6 @@
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
-  "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
-  "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
@@ -327,7 +322,6 @@
   "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.undo": "ਹਟਾਓ",
   "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
   "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
   "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35dbc6661d857d..2eaeeaab55d529 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ogłoszenie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
-  "autosuggest_hashtag.per_week": "{count} co tydzień",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -148,20 +147,19 @@
   "compose_form.placeholder": "Co chodzi ci po głowie?",
   "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
+  "compose_form.poll.multiple": "Wielokrotny wybór",
   "compose_form.poll.option_placeholder": "Opcja {number}",
   "compose_form.poll.remove_option": "Usuń tę opcję",
+  "compose_form.poll.single": "Wybierz jedną",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
+  "compose_form.poll.type": "Styl",
   "compose_form.publish": "Opublikuj",
   "compose_form.publish_form": "Opublikuj",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Zapisz zmiany",
-  "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
+  "compose_form.reply": "Odpowiedz",
+  "compose_form.save_changes": "Aktualizuj",
   "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
-  "compose_form.spoiler_placeholder": "Wpisz ostrzeżenie tutaj",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Prywatne wzmianki",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
-  "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Ulubione",
   "navigation_bar.filters": "Wyciszone słowa",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
-  "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspomniane osoby",
-  "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
-  "privacy.private.short": "Tylko obserwujący",
-  "privacy.public.long": "Widoczne dla każdego",
+  "privacy.direct.short": "Konkretni ludzie",
+  "privacy.private.long": "Tylko ci, którzy cię obserwują",
+  "privacy.private.short": "Obserwujący",
+  "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
   "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
-  "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
@@ -715,10 +709,8 @@
   "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.edit": "Edytuj",
   "upload_form.thumbnail": "Zmień miniaturę",
-  "upload_form.undo": "Usuń",
   "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
   "upload_modal.analyzing_picture": "Analizowanie obrazu…",
   "upload_modal.apply": "Zastosuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b8e18e1229a4b9..bb009239d42b97 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "No que você está pensando?",
   "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração da enquete",
+  "compose_form.poll.multiple": "Múltipla escolha",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Remover opção",
+  "compose_form.poll.remove_option": "Remover esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicação",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar alterações",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
+  "compose_form.reply": "Resposta",
+  "compose_form.save_changes": "Atualização",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
-  "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Adicionar enquete",
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
-  "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
-  "privacy.unlisted.short": "Não-listado",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -552,6 +548,7 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Enquete",
   "report.block": "Bloquear",
   "report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
   "report.categories.legal": "Jurídico",
@@ -715,10 +712,8 @@
   "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": "Sem descrição",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
   "upload_modal.analyzing_picture": "Analisando imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a6d0ffee9a5334..22bb1bbfd263a1 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -146,22 +145,22 @@
   "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": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.add_option": "Adicionar uma opção",
+  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração do inquérito",
+  "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.remove_option": "Eliminar esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guardar alterações",
-  "compose_form.sensitive.hide": "Marcar media como sensível",
-  "compose_form.sensitive.marked": "Media marcada como sensível",
-  "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
   "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
-  "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover sondagem",
   "privacy.change": "Ajustar a privacidade da publicação",
-  "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos os mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas os seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
-  "privacy.unlisted.short": "Não listar",
+  "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+  "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Sondagem",
   "report.block": "Bloquear",
   "report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
   "upload_modal.analyzing_picture": "A analizar imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 88dbfa4b8ec6ed..e6d881a986f318 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Anunț",
   "attachments_list.unprocessed": "(neprocesate)",
   "audio.hide": "Ascunde audio",
-  "autosuggest_hashtag.per_week": "{count} pe săptămână",
   "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
   "bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
   "bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
@@ -131,22 +130,12 @@
   "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",
   "compose_form.placeholder": "La ce te gândești?",
-  "compose_form.poll.add_option": "Adaugă o opțiune",
   "compose_form.poll.duration": "Durata sondajului",
-  "compose_form.poll.option_placeholder": "Opțiunea {number}",
-  "compose_form.poll.remove_option": "Elimină acestă opțiune",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
-  "compose_form.publish": "Publică",
   "compose_form.publish_form": "Publică",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvează modificările",
-  "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
   "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
-  "compose_form.spoiler_placeholder": "Scrie avertismentul aici",
   "confirmation_modal.cancel": "Anulează",
   "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
@@ -365,7 +354,6 @@
   "navigation_bar.compose": "Compune o nouă postare",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
-  "navigation_bar.edit_profile": "Modifică profilul",
   "navigation_bar.explore": "Explorează",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
@@ -461,14 +449,7 @@
   "poll_button.add_poll": "Adaugă un sondaj",
   "poll_button.remove_poll": "Elimină sondajul",
   "privacy.change": "Modifică confidențialitatea postării",
-  "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
-  "privacy.direct.short": "Doar persoane menționate",
-  "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Doar abonați",
-  "privacy.public.long": "Vizibil pentru toți",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
-  "privacy.unlisted.short": "Nelistat",
   "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
   "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
@@ -641,10 +622,8 @@
   "upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
   "upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
   "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
-  "upload_form.description_missing": "Nicio descriere adăugată",
   "upload_form.edit": "Modifică",
   "upload_form.thumbnail": "Schimbă miniatura",
-  "upload_form.undo": "Șterge",
   "upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
   "upload_modal.analyzing_picture": "Se analizează imaginea…",
   "upload_modal.apply": "Aplică",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a8ff90cc003b1b..eefa9c72987d7c 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
-  "autosuggest_hashtag.per_week": "{count} / неделю",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
   "compose_form.placeholder": "О чём думаете?",
-  "compose_form.poll.add_option": "Добавить вариант",
   "compose_form.poll.duration": "Продолжительность опроса",
-  "compose_form.poll.option_placeholder": "Вариант {number}",
-  "compose_form.poll.remove_option": "Убрать этот вариант",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сохранить",
-  "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
-  "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
-  "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Текст предупреждения",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Личные упоминания",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
-  "navigation_bar.edit_profile": "Изменить профиль",
   "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранные",
   "navigation_bar.filters": "Игнорируемые слова",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
-  "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Только упомянутые",
-  "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Виден всем",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
-  "privacy.unlisted.short": "Скрытый",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
@@ -715,10 +696,8 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
-  "upload_form.description_missing": "Описание не добавлено",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
-  "upload_form.undo": "Отменить",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
   "upload_modal.analyzing_picture": "Обработка изображения…",
   "upload_modal.apply": "Применить",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 051ec5d6f80f16..469930c3ed121d 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "उद्घोषणा",
   "attachments_list.unprocessed": "(अप्रकृतम्)",
   "audio.hide": "ध्वनिं प्रच्छादय",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
   "boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
   "bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
   "bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि पत्राणि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
   "compose_form.placeholder": "मनसि ते किमस्ति?",
-  "compose_form.poll.add_option": "मतमपरं युज्यताम्",
   "compose_form.poll.duration": "मतदान-समयावधिः",
-  "compose_form.poll.option_placeholder": "मतम् {number}",
-  "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
   "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
   "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
-  "compose_form.publish": "प्रकाशीकुरु",
   "compose_form.publish_form": "प्रकाशीकुरु",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनानि रक्ष",
-  "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
-  "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
-  "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
   "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
-  "compose_form.spoiler_placeholder": "प्रत्यादेशस्ते लिख्यताम्",
   "confirmation_modal.cancel": "नश्यताम्",
   "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
@@ -357,7 +346,6 @@
   "navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
   "navigation_bar.discover": "आविष्कुरु",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्",
   "navigation_bar.explore": "अन्विच्छ",
   "navigation_bar.filters": "मूकीकृतानि पदानि",
   "navigation_bar.follow_requests": "अनुसरणानुरोधाः",
@@ -453,14 +441,7 @@
   "poll_button.add_poll": "निर्वाचनं योजय",
   "poll_button.remove_poll": "निर्वाचनं मार्जय",
   "privacy.change": "पत्रस्य गोपनीयतां परिवर्तय",
-  "privacy.direct.long": "केवलमुल्लिखितोभोक्तृभ्यो दृश्यते",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "केवलं येऽनुसरन्ति त्वां तेभ्यो दृश्यते",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सर्वेभ्यो दृश्यते",
   "privacy.public.short": "सार्वजनिकम्",
-  "privacy.unlisted.long": "सर्वेभ्यो दृश्यते किन्तु आविष्कारविशेषताभ्योऽन्तरभूतं नास्ति",
-  "privacy.unlisted.short": "असूचीकृतम्",
   "privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
   "privacy_policy.title": "गोपनीयतानीतिः",
   "refresh": "नवीकुरु",
@@ -572,7 +553,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "मार्जय",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 89e951f77d37b0..90b663aea79fc6 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -60,7 +60,6 @@
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
   "audio.hide": "Cua s'àudio",
-  "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
   "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Faddina de connessione",
@@ -100,22 +99,12 @@
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
   "compose_form.placeholder": "A ite ses pensende?",
-  "compose_form.poll.add_option": "Agiunghe unu sèberu",
   "compose_form.poll.duration": "Longària de su sondàgiu",
-  "compose_form.poll.option_placeholder": "Optzione {number}",
-  "compose_form.poll.remove_option": "Boga custa optzione",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish": "Pùblica",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sarva is modìficas",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
-  "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
@@ -287,7 +276,6 @@
   "navigation_bar.compose": "Cumpone una publicatzione noa",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
-  "navigation_bar.edit_profile": "Modìfica profilu",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -364,12 +352,7 @@
   "poll_button.add_poll": "Agiunghe unu sondàgiu",
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
-  "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.short": "Esclùidu de sa lista",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
@@ -473,7 +456,6 @@
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.undo": "Cantzella",
   "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
   "upload_modal.analyzing_picture": "Analizende immàgine…",
   "upload_modal.apply": "Àplica",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 0378cd2926e938..b7563022a93594 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -74,7 +74,6 @@
   "announcement.announcement": "Annooncement",
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
-  "autosuggest_hashtag.per_week": "{count} a week",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -125,22 +124,12 @@
   "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
   "compose_form.lock_disclaimer.lock": "lockit",
   "compose_form.placeholder": "Whit's on yer mind?",
-  "compose_form.poll.add_option": "Pit in a chyce",
   "compose_form.poll.duration": "Poll lenth",
-  "compose_form.poll.option_placeholder": "Chyce {number}",
-  "compose_form.poll.remove_option": "Tak oot this chyce",
   "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
   "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save chynges",
-  "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
   "compose_form.spoiler.marked": "Tak aff the content warnin",
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
-  "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
   "confirmation_modal.cancel": "Stap",
   "confirmations.block.block_and_report": "Dingie & Clype",
   "confirmations.block.confirm": "Dingie",
@@ -341,7 +330,6 @@
   "navigation_bar.compose": "Scrieve new post",
   "navigation_bar.discover": "Fin",
   "navigation_bar.domain_blocks": "Dingied domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Splore",
   "navigation_bar.filters": "Wheesht wirds",
   "navigation_bar.follow_requests": "Follae requests",
@@ -425,14 +413,7 @@
   "poll_button.add_poll": "Dae a poll",
   "poll_button.remove_poll": "Tak doon poll",
   "privacy.change": "Chynge post privacy",
-  "privacy.direct.long": "Ainly menshied uisers kin see this",
-  "privacy.direct.short": "Menshied fowk ainly",
-  "privacy.private.long": "Ainly follaers kin see this",
-  "privacy.private.short": "Ainly follaers",
-  "privacy.public.long": "Awbody kin see this",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
-  "privacy.unlisted.short": "No listit",
   "privacy_policy.last_updated": "Last updatit {date}",
   "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
@@ -583,10 +564,8 @@
   "upload_error.poll": "File upload isnae allooed wi polls.",
   "upload_form.audio_description": "Describe fir fowk wi hearin loss",
   "upload_form.description": "Describe fir thaim wi visual impairments",
-  "upload_form.description_missing": "Nae description addit",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Chynge thoomnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
   "upload_modal.analyzing_picture": "Analyzin picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c2d2a41cc50808..1b2eb17633e601 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
-  "autosuggest_hashtag.per_week": "සතියකට {count}",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -102,19 +101,12 @@
   "compose_form.encryption_warning": "මාස්ටඩන් වෙත පළ කරන දෑ අන්ත සංකේතනයෙන් ආරක්‍ෂා නොවේ. මාස්ටඩන් හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
-  "compose_form.poll.add_option": "තේරීමක් යොදන්න",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
-  "compose_form.poll.option_placeholder": "තේරීම {number}",
-  "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
-  "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
-  "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
   "confirmation_modal.cancel": "අවලංගු",
   "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
@@ -269,7 +261,6 @@
   "navigation_bar.compose": "නව ලිපියක් ලියන්න",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
-  "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
   "navigation_bar.explore": "ගවේශනය",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
@@ -335,11 +326,6 @@
   "poll_button.add_poll": "මත විමසුමක් අරඹන්න",
   "poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
   "privacy.change": "ලිපියේ රහස්‍යතාව සංශෝධනය",
-  "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
-  "privacy.direct.short": "සඳහන් කළ අයට පමණි",
-  "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
-  "privacy.private.short": "අනුගාමිකයින් පමණි",
-  "privacy.public.long": "සැමට දිස්වෙයි",
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
   "refresh": "නැවුම් කරන්න",
@@ -481,10 +467,8 @@
   "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
   "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
   "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
-  "upload_form.description_missing": "සවිස්තරයක් නැත",
   "upload_form.edit": "සංස්කරණය",
   "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
-  "upload_form.undo": "මකන්න",
   "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
   "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
   "upload_modal.apply": "යොදන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3e41a2035a0046..5b1203aeeaa98b 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skry zvuk",
-  "autosuggest_hashtag.per_week": "{count} týždenne",
   "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
   "compose_form.placeholder": "Čo máš na mysli?",
-  "compose_form.poll.add_option": "Pridaj voľbu",
   "compose_form.poll.duration": "Trvanie ankety",
-  "compose_form.poll.option_placeholder": "Voľba {number}",
-  "compose_form.poll.remove_option": "Odstráň túto voľbu",
   "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
-  "compose_form.publish": "Zverejni",
   "compose_form.publish_form": "Zverejniť",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ulož zmeny",
-  "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
-  "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
-  "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
   "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
   "compose_form.spoiler.unmarked": "Text nieje ukrytý",
-  "compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
   "confirmation_modal.cancel": "Zruš",
   "confirmations.block.block_and_report": "Zablokuj a nahlás",
   "confirmations.block.confirm": "Blokuj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Súkromné spomenutia",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
-  "navigation_bar.edit_profile": "Uprav profil",
   "navigation_bar.explore": "Objavuj",
   "navigation_bar.favourites": "Obľúbené",
   "navigation_bar.filters": "Filtrované slová",
@@ -525,14 +513,7 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
-  "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Iba spomenutým ľudom",
-  "privacy.private.long": "Pošli iba následovateľom",
-  "privacy.private.short": "Iba pre sledujúcich",
-  "privacy.public.long": "Viditeľné pre všetkých",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
-  "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
   "recommended": "Odporúčané",
@@ -714,10 +695,8 @@
   "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
   "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
   "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.description_missing": "Nepridaný žiadny popis",
   "upload_form.edit": "Uprav",
   "upload_form.thumbnail": "Zmeniť miniatúru",
-  "upload_form.undo": "Vymaž",
   "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
   "upload_modal.analyzing_picture": "Analyzujem obrázok…",
   "upload_modal.apply": "Použi",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b3998b91104263..559b05db72ec2d 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
-  "autosuggest_hashtag.per_week": "{count} na teden",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljate?",
-  "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbira {number}",
-  "compose_form.poll.remove_option": "Odstrani to izbiro",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Shrani spremembe",
-  "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
   "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
-  "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
   "confirmation_modal.cancel": "Prekliči",
   "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Zasebne omembe",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Spremeni zasebnost objave",
-  "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Samo omenjeni",
-  "privacy.private.long": "Vidno samo sledilcem",
-  "privacy.private.short": "Samo sledilci",
-  "privacy.public.long": "Vidno vsem",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
-  "privacy.unlisted.short": "Ni prikazano",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.description_missing": "Noben opis ni dodan",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Spremeni sličico",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
   "upload_modal.analyzing_picture": "Analiziranje slike …",
   "upload_modal.apply": "Uveljavi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index f45266c845819b..bfc674248bde96 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Lajmërim",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
-  "autosuggest_hashtag.per_week": "{count} për javë",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
-  "compose_form.poll.add_option": "Shtoni një zgjedhje",
+  "compose_form.poll.add_option": "Shtoni mundësi",
   "compose_form.poll.duration": "Kohëzgjatje pyetësori",
-  "compose_form.poll.option_placeholder": "Zgjedhja {number}",
-  "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
+  "compose_form.poll.multiple": "Shumë zgjedhje",
+  "compose_form.poll.option_placeholder": "Mundësia {number}",
+  "compose_form.poll.remove_option": "Hiqe këtë mundësi",
+  "compose_form.poll.single": "Zgjidhni një",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
-  "compose_form.publish": "Botoje",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postim",
   "compose_form.publish_form": "Publikoje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ruaji ndryshimet",
-  "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
+  "compose_form.reply": "Përgjigjuni",
+  "compose_form.save_changes": "Përditësoje",
   "compose_form.spoiler.marked": "Hiq sinjalizim lënde",
   "compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
-  "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
+  "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
   "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Përmendje private",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
-  "navigation_bar.edit_profile": "Përpunoni profilin",
   "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Shtoni një pyetësor",
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
-  "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "Vetëm për personat e përmendur",
-  "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekës",
-  "privacy.public.long": "I dukshëm për të tërë",
+  "privacy.direct.long": "Gjithkënd i përmendur te postimi",
+  "privacy.direct.short": "Persona të veçantë",
+  "privacy.private.long": "Vetëm ndjekësit tuaj",
+  "privacy.private.short": "Ndjekës",
+  "privacy.public.long": "Cilido që hyn e del në Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
-  "privacy.unlisted.short": "Jo në lista",
+  "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
+  "privacy.unlisted.long": "Më pak fanfara algoritmike",
+  "privacy.unlisted.short": "Publik i qetë",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
   "recommended": "E rekomanduar",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
+  "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
   "reply_indicator.cancel": "Anuloje",
+  "reply_indicator.poll": "Pyetësor",
   "report.block": "Bllokoje",
   "report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
   "report.categories.legal": "Ligjore",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
   "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
-  "upload_form.description_missing": "S’u shtua përshkrim",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
-  "upload_form.undo": "Fshije",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
   "upload_modal.analyzing_picture": "Po analizohet fotoja…",
   "upload_modal.apply": "Aplikoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 77c262e9571293..b0348748a6762f 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} nedeljno",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "O čemu razmišljate?",
-  "compose_form.poll.add_option": "Dodajte izbor",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbor {number}",
-  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sačuvaj promene",
-  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
-  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privatna pominjanja",
   "navigation_bar.discover": "Otkrij",
   "navigation_bar.domain_blocks": "Blokirani domeni",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Omiljeno",
   "navigation_bar.filters": "Ignorisane reči",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Promeni privatnost objave",
-  "privacy.direct.long": "Vidljivo samo pomenutim korisnicima",
-  "privacy.direct.short": "Samo pomenute osobe",
-  "privacy.private.long": "Vidljivo samo pratiocima",
-  "privacy.private.short": "Samo pratioci",
-  "privacy.public.long": "Vidljivo za sve",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz funkcija otkrivanja",
-  "privacy.unlisted.short": "Neizlistano",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Otpremanje datoteka nije dozvoljeno kod anketa.",
   "upload_form.audio_description": "Dodajte opis za osobe sa oštećenim sluhom",
   "upload_form.description": "Dodajte opis za osobe sa oštećenim vidom",
-  "upload_form.description_missing": "Nema dodatog opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promeni sličicu",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiziranje slike…",
   "upload_modal.apply": "Primeni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 85e7567bf42166..4e4956e1a2a055 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Најава",
   "attachments_list.unprocessed": "(необрађено)",
   "audio.hide": "Сакриј аудио",
-  "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "О чему размишљате?",
-  "compose_form.poll.add_option": "Додајте избор",
+  "compose_form.poll.add_option": "Додај опцију",
   "compose_form.poll.duration": "Трајање анкете",
-  "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Уклони овај избор",
+  "compose_form.poll.multiple": "Вишеструки избор",
+  "compose_form.poll.option_placeholder": "Опција {number}",
+  "compose_form.poll.remove_option": "Уклони ову опцију",
+  "compose_form.poll.single": "Одаберите једно",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
+  "compose_form.poll.type": "Стил",
   "compose_form.publish": "Објави",
   "compose_form.publish_form": "Нова објава",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сачувај промене",
-  "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+  "compose_form.reply": "Одговори",
+  "compose_form.save_changes": "Ажурирај",
   "compose_form.spoiler.marked": "Уклони упозорење о садржају",
   "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
-  "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+  "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
   "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Приватна помињања",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Блокирани домени",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.explore": "Истражи",
   "navigation_bar.favourites": "Омиљено",
   "navigation_bar.filters": "Игнорисане речи",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Додај анкету",
   "poll_button.remove_poll": "Уклони анкету",
   "privacy.change": "Промени приватност објаве",
-  "privacy.direct.long": "Видљиво само поменутим корисницима",
-  "privacy.direct.short": "Само поменуте особе",
-  "privacy.private.long": "Видљиво само пратиоцима",
-  "privacy.private.short": "Само пратиоци",
-  "privacy.public.long": "Видљиво за све",
+  "privacy.direct.long": "Сви поменути у објави",
+  "privacy.direct.short": "Одређени људи",
+  "privacy.private.long": "Само ваши пратиоци",
+  "privacy.private.short": "Пратиоци",
+  "privacy.public.long": "Било ко на Mastodon-у и ван њега",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Видљиво свима, али искључено из функција откривања",
-  "privacy.unlisted.short": "Неизлистано",
+  "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
+  "privacy.unlisted.long": "Мање алгоритамских фанфара",
+  "privacy.unlisted.short": "Тиха јавност",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
   "recommended": "Препоручено",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} мин.",
   "relative_time.seconds": "{number} сек.",
   "relative_time.today": "данас",
+  "reply_indicator.attachments": "{count, plural, one {# прилог} few {# прилога} other {# прилога}}",
   "reply_indicator.cancel": "Откажи",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокирај",
   "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети Ваше објаве нити ће моћи да Вас прати. Такође ће моћи да сазна да је блокиран.",
   "report.categories.legal": "Правни",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
   "upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
   "upload_form.description": "Додајте опис за особе са оштећеним видом",
-  "upload_form.description_missing": "Нема додатог описа",
   "upload_form.edit": "Уреди",
   "upload_form.thumbnail": "Промени сличицу",
-  "upload_form.undo": "Избриши",
   "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
   "upload_modal.analyzing_picture": "Анализирање слике…",
   "upload_modal.apply": "Примени",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d3ca776bd9e5cb..d6e6555b530091 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
-  "autosuggest_hashtag.per_week": "{count} per vecka",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -146,22 +145,18 @@
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
-  "compose_form.poll.add_option": "Lägg till ett val",
+  "compose_form.poll.add_option": "Lägg till alternativ",
   "compose_form.poll.duration": "Varaktighet för omröstning",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Ta bort detta val",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
-  "compose_form.publish": "Publicera",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish_form": "Publicera",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spara ändringar",
-  "compose_form.sensitive.hide": "Markera media som känsligt",
-  "compose_form.sensitive.marked": "Media har markerats som känsligt",
-  "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppdatera",
   "compose_form.spoiler.marked": "Texten är dold bakom en varning",
   "compose_form.spoiler.unmarked": "Texten är inte dold",
-  "compose_form.spoiler_placeholder": "Skriv din varning här",
+  "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
@@ -408,7 +403,6 @@
   "navigation_bar.direct": "Privata nämningar",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
-  "navigation_bar.edit_profile": "Redigera profil",
   "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
@@ -524,14 +518,10 @@
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
-  "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Endast omnämnda personer",
-  "privacy.private.long": "Endast synligt för följare",
-  "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Synlig för alla",
+  "privacy.private.long": "Endast dina följare",
+  "privacy.private.short": "Följare",
+  "privacy.public.long": "Alla på och utanför Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
-  "privacy.unlisted.short": "Olistad",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
@@ -550,6 +540,7 @@
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
+  "reply_indicator.poll": "Omröstning",
   "report.block": "Blockera",
   "report.block_explanation": "Du kommer inte se hens inlägg. Hen kommer inte kunna se dina inlägg eller följa dig. Hen kommer kunna se att hen är blockerad.",
   "report.categories.legal": "Juridisk",
@@ -713,10 +704,8 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
-  "upload_form.description_missing": "Beskrivning saknas",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
-  "upload_form.undo": "Radera",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
   "upload_modal.analyzing_picture": "Analyserar bild…",
   "upload_modal.apply": "Verkställ",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index abbdf9b7daaf89..42164f656b10b7 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -93,8 +93,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 5290e13ff4cdfa..6210c3d0b11e06 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -66,7 +66,6 @@
   "announcement.announcement": "அறிவிப்பு",
   "attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
   "audio.hide": "ஆடியோவை மறை",
-  "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
   "bundle_column_error.error.title": "அடடே!",
   "bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
@@ -120,22 +119,12 @@
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
   "compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
   "compose_form.placeholder": "உங்கள் மனதில் என்ன இருக்கிறது?",
-  "compose_form.poll.add_option": "தேர்வை சேர்",
   "compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு",
-  "compose_form.poll.option_placeholder": "தேர்வு எண் {number}",
-  "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
   "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
   "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
-  "compose_form.publish": "வெளியிடு",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "மாற்றங்களை சேமி",
-  "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
-  "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
-  "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
   "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
   "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
-  "compose_form.spoiler_placeholder": "உங்கள் எச்சரிக்கையை இங்கு எழுதவும்",
   "confirmation_modal.cancel": "ரத்து",
   "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
@@ -283,7 +272,6 @@
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
-  "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
   "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
@@ -344,12 +332,7 @@
   "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
   "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
   "privacy.change": "நிலை தனியுரிமை",
-  "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "பொது",
-  "privacy.unlisted.short": "பட்டியலிடப்படாத",
   "refresh": "புதுப்பி",
   "regeneration_indicator.label": "சுமையேற்றம்…",
   "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
@@ -432,7 +415,6 @@
   "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
   "upload_form.edit": "தொகு",
   "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
-  "upload_form.undo": "நீக்கு",
   "upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
   "upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
   "upload_modal.apply": "உபயோகி",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 7c1956d95b93c1..b1a242c751d00d 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -79,8 +79,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3c231871fa71aa..24a67247c03fce 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -64,16 +64,10 @@
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
   "compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
-  "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
   "compose_form.poll.duration": "ఎన్నిక వ్యవధి",
-  "compose_form.poll.option_placeholder": "ఎంపిక {number}",
-  "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
-  "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
   "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
   "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
-  "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
   "confirmation_modal.cancel": "రద్దు చెయ్యి",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
   "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
@@ -186,7 +180,6 @@
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
-  "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.lists": "జాబితాలు",
@@ -240,12 +233,7 @@
   "poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
-  "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ప్రజా",
-  "privacy.unlisted.short": "జాబితా చేయబడనిది",
   "regeneration_indicator.label": "లోడ్ అవుతోంది…",
   "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.just_now": "ఇప్పుడు",
@@ -308,7 +296,6 @@
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
-  "upload_form.undo": "తొలగించు",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
   "video.close": "వీడియోని మూసివేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 65f27ef0618650..4437afa78c5c56 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "ประกาศ",
   "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
   "audio.hide": "ซ่อนเสียง",
-  "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
-  "compose_form.poll.add_option": "เพิ่มตัวเลือก",
   "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
-  "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
-  "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
-  "compose_form.publish": "เผยแพร่",
   "compose_form.publish_form": "โพสต์ใหม่",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
-  "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
   "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
-  "compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
   "confirmation_modal.cancel": "ยกเลิก",
   "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
-  "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
-  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
-  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
-  "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "ปรากฏแก่ทั้งหมด",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
-  "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
   "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
-  "upload_form.description_missing": "ไม่ได้เพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
-  "upload_form.undo": "ลบ",
   "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e85db817b9fb95..6811c158d45a18 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Duyuru",
   "attachments_list.unprocessed": "(işlenmemiş)",
   "audio.hide": "Sesi gizle",
-  "autosuggest_hashtag.per_week": "Haftada {count}",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
   "compose_form.placeholder": "Aklında ne var?",
-  "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
-  "compose_form.poll.option_placeholder": "{number}.seçenek",
-  "compose_form.poll.remove_option": "Bu seçeneği kaldır",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
-  "compose_form.publish": "Gönder",
   "compose_form.publish_form": "Gönder",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Değişiklikleri kaydet",
-  "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "Uyarınızı buraya yazın",
   "confirmation_modal.cancel": "İptal",
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Özel değinmeler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
-  "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
-  "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Sadece bahsedilen kişiler",
-  "privacy.private.long": "Sadece takipçiler için görünür",
-  "privacy.private.short": "Sadece takipçiler",
-  "privacy.public.long": "Herkese açık",
   "privacy.public.short": "Herkese açık",
-  "privacy.unlisted.long": "Keşfet harici herkese açık",
-  "privacy.unlisted.short": "Listelenmemiş",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
   "upload_form.description": "Görme engelliler için açıklama",
-  "upload_form.description_missing": "Açıklama eklenmedi",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
-  "upload_form.undo": "Sil",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
   "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
   "upload_modal.apply": "Uygula",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 47fe60bd252781..17de9884e79675 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Игълан",
   "attachments_list.unprocessed": "(чимал)",
   "audio.hide": "Аудионы яшерү",
-  "autosuggest_hashtag.per_week": "{count} атнага",
   "boost_modal.combo": "Сез баса аласыз {combo} киләсе тапкыр моны сагыну өчен",
   "bundle_column_error.copy_stacktrace": "Күчереп алу хата турында Отчет",
   "bundle_column_error.error.body": "Соралган бит күрсәтелә алмый. Бу безнең кодтагы хата яки браузерга туры килү проблемасы аркасында булырга мөмкин.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "Сезнең хисап түгел {locked}. Апуәрбер теләгән кеше сезнең язма өчен иярә ала.",
   "compose_form.lock_disclaimer.lock": "бикле",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Сайлау өстәгез",
   "compose_form.poll.duration": "Сораштыру озынлыгы",
-  "compose_form.poll.option_placeholder": "Сайлау {number}",
-  "compose_form.poll.remove_option": "бетерү",
   "compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез",
   "compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез",
-  "compose_form.publish": "Бастыру",
   "compose_form.publish_form": "Бастыру",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Үзгәрешләрне саклау",
-  "compose_form.sensitive.hide": "{count, plural, one {Медианы сизгер итеп билгеләгез} other {Медианы сизгер итеп билгеләгез}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Ташучы сизгер дип язылган} other {Ташучы сизгер дип язылган}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медиа сизгер буларак билгеле түгел} other {Медиа сизгер буларак билгеле түгел}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Кисәтүегезне монда языгыз",
   "confirmation_modal.cancel": "Баш тарту",
   "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
   "confirmations.block.confirm": "Блоклау",
@@ -322,7 +311,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Хосусый искә алулар",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Профильны үзгәртү",
   "navigation_bar.explore": "Күзәтү",
   "navigation_bar.lists": "Исемлекләр",
   "navigation_bar.logout": "Чыгу",
@@ -376,9 +364,6 @@
   "poll_button.add_poll": "Сораштыруны өстәү",
   "poll_button.remove_poll": "Сораштыруны бетерү",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Һәркемгә ачык",
   "privacy.public.short": "Һәркемгә ачык",
   "privacy_policy.last_updated": "Соңгы яңарту {date}",
   "privacy_policy.title": "Хосусыйлык Сәясәте",
@@ -478,9 +463,7 @@
   "units.short.thousand": "{count}М",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Тасвирлама өстәлмәде",
   "upload_form.edit": "Үзгәртү",
-  "upload_form.undo": "Бетерү",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
   "upload_modal.apply": "Куллан",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 6bb5ba0ebf95da..9dc3b5c1f985cf 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -76,8 +76,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5ec0da599b28a9..38e5f9cfbdfa59 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "audio.hide": "Сховати аудіо",
-  "autosuggest_hashtag.per_week": "{count} на тиждень",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -146,22 +145,13 @@
   "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
-  "compose_form.poll.add_option": "Додати варіант",
+  "compose_form.poll.add_option": "Додати опцію",
   "compose_form.poll.duration": "Тривалість опитування",
-  "compose_form.poll.option_placeholder": "Варіант {number}",
-  "compose_form.poll.remove_option": "Видалити цей варіант",
   "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
-  "compose_form.publish": "Опублікувати",
   "compose_form.publish_form": "Новий допис",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Зберегти зміни",
-  "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
   "compose_form.spoiler.marked": "Прибрати попередження про вміст",
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
-  "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
   "confirmation_modal.cancel": "Скасувати",
   "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
@@ -408,7 +398,6 @@
   "navigation_bar.direct": "Особисті згадки",
   "navigation_bar.discover": "Дослідити",
   "navigation_bar.domain_blocks": "Заблоковані домени",
-  "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Уподобане",
   "navigation_bar.filters": "Приховані слова",
@@ -526,14 +515,7 @@
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
-  "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Лише згадані люди",
-  "privacy.private.long": "Показати тільки підписникам",
-  "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Видимий для всіх",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
-  "privacy.unlisted.short": "Прихований",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
   "recommended": "Рекомендовано",
@@ -715,10 +697,8 @@
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
-  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
-  "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
   "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 563b2dedf8e32b..fee2cc3a9817e2 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -72,7 +72,6 @@
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
   "alert.unexpected.title": "ا رے!",
   "announcement.announcement": "اعلان",
-  "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
   "bundle_column_error.error.title": "اوف، نہیں!",
   "bundle_column_error.network.title": "نیٹ ورک کی خرابی",
@@ -115,22 +114,12 @@
   "compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
   "compose_form.lock_disclaimer.lock": "مقفل",
   "compose_form.placeholder": "آپ کیا سوچ رہے ہیں؟",
-  "compose_form.poll.add_option": "انتخاب شامل کریں",
   "compose_form.poll.duration": "مدتِ رائے",
-  "compose_form.poll.option_placeholder": "انتخاب {number}",
-  "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
   "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
   "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
-  "compose_form.publish": "اشاعت کردہ",
   "compose_form.publish_form": "اشاعت کریں",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
-  "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
-  "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
-  "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "اپنی وارننگ یہاں لکھیں",
   "confirmation_modal.cancel": "منسوخ",
   "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
@@ -242,7 +231,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
   "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
@@ -281,10 +269,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8eeee42a5e68c2..8f231c8c77ab9e 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "E'lonlar",
   "attachments_list.unprocessed": "(qayta ishlanmagan)",
   "audio.hide": "Audioni yashirish",
-  "autosuggest_hashtag.per_week": "{count} haftasiga",
   "boost_modal.combo": "Keyingi safar buni oʻtkazib yuborish uchun {combo} tugmasini bosishingiz mumkin",
   "bundle_column_error.copy_stacktrace": "Xato hisobotini nusxalash",
   "bundle_column_error.error.body": "Soʻralgan sahifani koʻrsatib boʻlmadi. Buning sababi bizning kodimizdagi xato yoki brauzer mosligi muammosi bo'lishi mumkin.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "Hisobingiz {locked}. Faqat obunachilarga moʻljallangan postlaringizni koʻrish uchun har kim sizni kuzatishi mumkin.",
   "compose_form.lock_disclaimer.lock": "yopilgan",
   "compose_form.placeholder": "Xalolizda nima?",
-  "compose_form.poll.add_option": "Tanlov qo'shing",
   "compose_form.poll.duration": "So‘rov muddati",
-  "compose_form.poll.option_placeholder": "Tanlov {number}",
-  "compose_form.poll.remove_option": "Olib tashlash",
   "compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish",
   "compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish",
-  "compose_form.publish": "Nashr qilish",
   "compose_form.publish_form": "Nashr qilish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "O‘zgarishlarni saqlash",
-  "compose_form.sensitive.hide": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
   "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
-  "compose_form.spoiler_placeholder": "Sharhingizni bu erga yozing",
   "confirmation_modal.cancel": "Bekor qilish",
   "confirmations.block.block_and_report": "Bloklash va hisobot berish",
   "confirmations.block.confirm": "Bloklash",
@@ -336,7 +325,6 @@
   "navigation_bar.compose": "Yangi post yozing",
   "navigation_bar.discover": "Kashf qilish",
   "navigation_bar.domain_blocks": "Bloklangan domenlar",
-  "navigation_bar.edit_profile": "Profilni tahrirlash",
   "navigation_bar.explore": "O‘rganish",
   "navigation_bar.filters": "E'tiborga olinmagan so'zlar",
   "navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
@@ -368,8 +356,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c623caa3fb6424..73a11b9573673d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Có gì mới?",
   "attachments_list.unprocessed": "(chưa xử lí)",
   "audio.hide": "Ẩn âm thanh",
-  "autosuggest_hashtag.per_week": "{count} mỗi tuần",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
-  "compose_form.poll.add_option": "Thêm lựa chọn",
   "compose_form.poll.duration": "Hết hạn vào",
-  "compose_form.poll.option_placeholder": "Lựa chọn {number}",
-  "compose_form.poll.remove_option": "Xóa lựa chọn này",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
-  "compose_form.publish": "Đăng",
   "compose_form.publish_form": "Đăng",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lưu thay đổi",
-  "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
-  "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.edit_profile": "Sửa hồ sơ",
   "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Lượt thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Chọn kiểu tút",
-  "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
-  "privacy.direct.short": "Nhắn riêng",
-  "privacy.private.long": "Dành riêng cho người theo dõi",
-  "privacy.private.short": "Chỉ người theo dõi",
-  "privacy.public.long": "Hiển thị với mọi người",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
-  "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
   "recommended": "Đề xuất",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
   "upload_form.audio_description": "Mô tả cho người mất thính giác",
   "upload_form.description": "Mô tả cho người khiếm thị",
-  "upload_form.description_missing": "Chưa thêm mô tả",
   "upload_form.edit": "Biên tập",
   "upload_form.thumbnail": "Đổi ảnh thumbnail",
-  "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
   "upload_modal.apply": "Áp dụng",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 008a9636db42b4..a585838cd22af9 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -22,7 +22,6 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
-  "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
@@ -44,9 +43,7 @@
   "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.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
   "compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?",
-  "compose_form.poll.option_placeholder": "ⴰⵙⵜⵜⴰⵢ {number}",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ⵙⵔ",
@@ -129,7 +126,6 @@
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
@@ -161,8 +157,6 @@
   "poll_button.add_poll": "ⵔⵏⵓ ⵢⴰⵏ ⵢⵉⴷⵣ",
   "poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
   "regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
   "relative_time.days": "{number}ⴰⵙ",
@@ -211,7 +205,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "ⵙⵏⴼⵍ",
-  "upload_form.undo": "ⴽⴽⵙ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
   "upload_progress.label": "Uploading…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 720e4331b3afa2..9b55e51b1f9b6f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "autosuggest_hashtag.per_week": "每星期 {count} 条",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "想写什么？",
   "compose_form.poll.add_option": "添加选项",
   "compose_form.poll.duration": "投票期限",
+  "compose_form.poll.multiple": "多选",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "移除此选项",
+  "compose_form.poll.remove_option": "删除此选项",
+  "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
+  "compose_form.poll.type": "样式",
   "compose_form.publish": "发布",
   "compose_form.publish_form": "发布",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "保存更改",
-  "compose_form.sensitive.hide": "标记媒体为敏感内容",
-  "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
-  "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
+  "compose_form.reply": "回复",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
-  "compose_form.spoiler_placeholder": "写下你的警告",
+  "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私下提及",
   "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
-  "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "忽略的关键词",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
-  "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "仅提到的人",
-  "privacy.private.long": "仅对关注者可见",
-  "privacy.private.short": "仅关注者可见",
-  "privacy.public.long": "所有人可见",
+  "privacy.direct.long": "帖子中提到的每个人",
+  "privacy.direct.short": "具体的人",
+  "privacy.private.long": "仅限您的关注者",
+  "privacy.private.short": "关注者",
+  "privacy.public.long": "所有Mastodon内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.long": "所有人可见，但不在探索功能出现",
-  "privacy.unlisted.short": "不公开",
+  "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
+  "privacy.unlisted.long": "减少算法影响",
+  "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
   "recommended": "推荐",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分钟前",
   "relative_time.seconds": "{number} 秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "屏蔽",
   "report.block_explanation": "你将无法看到他们的嘟文。他们也将无法看到你的嘟文或关注你。他们将能够判断出他们被屏蔽了。",
   "report.categories.legal": "法律义务",
@@ -715,10 +716,8 @@
   "upload_error.poll": "投票中不允许上传文件。",
   "upload_form.audio_description": "为听障人士添加文字描述",
   "upload_form.description": "为视觉障碍人士添加文字说明",
-  "upload_form.description_missing": "未添加描述",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
-  "upload_form.undo": "删除",
   "upload_form.video_description": "为听障人士和视障人士添加文字描述",
   "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index cd0845b6e2e309..5890c4df4b5120 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "每週 {count} 次",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
   "compose_form.placeholder": "你在想甚麼？",
-  "compose_form.poll.add_option": "新增選擇",
+  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選擇",
-  "compose_form.poll.remove_option": "移除此選擇",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
+  "compose_form.poll.type": "風格",
   "compose_form.publish": "發佈",
   "compose_form.publish_form": "發佈",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "標記媒體為敏感內容",
-  "compose_form.sensitive.marked": "媒體被標示為敏感",
-  "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "文字被警告隱藏",
   "compose_form.spoiler.unmarked": "文字沒有被隱藏",
-  "compose_form.spoiler_placeholder": "敏感警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私人提及",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
-  "navigation_bar.edit_profile": "修改個人資料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整私隱設定",
-  "privacy.direct.long": "只有提及的使用者能看到",
-  "privacy.direct.short": "僅限提及的人",
-  "privacy.private.long": "只有你的關注者能看到",
-  "privacy.private.short": "僅限追隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "帖文提及的人",
+  "privacy.direct.short": "特定的人",
+  "privacy.private.long": "只有你的追蹤者",
+  "privacy.private.short": "追蹤者",
+  "privacy.public.long": "Mastodon 內外的任何人",
   "privacy.public.short": "公共",
-  "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
-  "privacy.unlisted.short": "公開",
+  "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
+  "privacy.unlisted.long": "較少用演算法宣傳",
+  "privacy.unlisted.short": "半公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
   "recommended": "推薦",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}分鐘前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, one {# 附件} other {# 附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
   "report.categories.legal": "法律",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許在投票上傳檔案。",
   "upload_form.audio_description": "簡單描述內容給聽障人士",
   "upload_form.description": "為視覺障礙人士添加文字說明",
-  "upload_form.description_missing": "沒有加入描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "簡單描述給聽障或視障人士",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cc8b5831202927..c365e67e070d6d 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "正在想些什麼嗎？",
   "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選項",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
   "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
-  "compose_form.publish": "嘟出去",
+  "compose_form.poll.type": "投票方式",
+  "compose_form.publish": "發嘟",
   "compose_form.publish_form": "嘟出去",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
-  "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
-  "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除內容警告",
   "compose_form.spoiler.unmarked": "新增內容警告",
-  "compose_form.spoiler_placeholder": "請於此處填寫內容警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "已封鎖網域",
-  "navigation_bar.edit_profile": "編輯個人檔案",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
@@ -526,13 +524,14 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
-  "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "僅限提及者",
-  "privacy.private.long": "只有跟隨您的使用者能看到",
-  "privacy.private.short": "僅限跟隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "此嘟文提及之所有人",
+  "privacy.direct.short": "指定使用者",
+  "privacy.private.long": "只有跟隨您的人能看到",
+  "privacy.private.short": "跟隨者",
+  "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
+  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+  "privacy.unlisted.long": "悄然無聲",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
   "report.categories.legal": "合法性",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
-  "upload_form.description_missing": "沒有任何描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b9a313544872b6..9c8456a05fb305 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1546,6 +1546,9 @@ bg:
     errors:
       limit_reached: Ограничението на различни реакции е достигнат
       unrecognized_emoji: не е разпознато емоджи
+  redirects:
+    prompt: Ако вярвате на тази връзка, то щракнете на нея, за да продължите.
+    title: Напускате %{instance}.
   relationships:
     activity: Дейност на акаунта
     confirm_follow_selected_followers: Наистина ли искате да последвате избраните последователи?
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 44688577a9e94a..444d0e2c5fb8b4 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1646,7 +1646,7 @@ eu:
     back: Itzuli Mastodon-era
     delete: Kontuaren ezabaketa
     development: Garapena
-    edit_profile: Aldatu profila
+    edit_profile: Editatu profila
     export: Datuen esportazioa
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
@@ -1860,9 +1860,9 @@ eu:
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
-    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code>-etiketa bat ere erabil dezakezu orrialdearen goiburuan, baina HTMLak eskuragarri egon behar du JavaScript exekutatu gabe.
+    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
     here_is_how: Hemen duzu nola
-    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
+    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak Mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
     verified_links: Zure lotura egiaztatuak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0514772c1dcc3d..bb3368dd9e54e1 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -406,6 +406,7 @@ fa:
           silence: محدود
           suspend: تعلیق
         title: مسدودسازی دامین تازه
+      no_domain_block_selected: هیچ انسداد دامنه‌ای تغییر نکرد زیرا هیچ‌کدامشان انتخاب نشده بودند
       not_permitted: شما مجاز به انجام این عملیات نیستید
       obfuscate: مبهم‌سازی نام دامنهٔ
       obfuscate_hint: در صورت به کار افتاده بودن اعلام فهرست محدودیت‌های دامنه، نام دامنه در فهرست را به صورت جزیی مبهم می‌کند
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9b505e5f92fbc0..b67de192f2563e 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -38,6 +38,9 @@ hi:
       upload_check_privacy_error_object_storage:
         action: अधिक जानकारी हेतु यहां क्लिक करें।
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
+  redirects:
+    prompt: अगर आपको इस लिंक पर भरोसा है तो आगे बढ़ने के लिए इसे क्लिक करें
+    title: आप इस %{instance} को छोड़ने वाले हैं
   relationships:
     follow_failure: चुने हुए अकाउंट्स में से कुछ को फ़ॉलो नहीं किया जा सकता
   sessions:
@@ -50,3 +53,9 @@ hi:
   time:
     formats:
       with_time_zone: "%b %d, %Y, %H:%M %Z"
+  user_mailer:
+    failed_2fa:
+      details: 'आपके साइन इन प्रयासों के डिटेल ये रहे:'
+      explanation: किसी ने आपके अकाउंट पर साइन इन करने का प्रयास किया लेकिन दूसरा प्रमाणीकरण विकल्प गलत दिया।
+      further_actions_html: अगर ये आप नहीं थे, तो हम अनुरोध करते हैं कि आप तुरंत %{action} लें क्योंकि ये शायद खतरे में है।
+      subject: दूसरा फैक्टर सत्यापन नाकाम रहा
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8cbbb64c97f59e..545da69d9cb201 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1547,7 +1547,8 @@ hu:
       limit_reached: A különböző reakciók száma elérte a határértéket
       unrecognized_emoji: nem ismert emodzsi
   redirects:
-    prompt: Ha megbízunk ebben a hivatkozásban, kattintsunk rá a folytatáshoz.
+    prompt: Ha megbízol ebben a hivatkozásban, kattints rá a folytatáshoz.
+    title: Épp elhagyni készülöd a %{instance} kiszolgálót.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c77a8f802d68c7..a8287da5338735 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1546,6 +1546,9 @@ ie:
     errors:
       limit_reached: Límite de diferent reactiones atinget
       unrecognized_emoji: ne es un reconosset emoji
+  redirects:
+    prompt: Si tu fide ti ligament, clicca it por continuar.
+    title: Tu exea de %{instance}.
   relationships:
     activity: Activitá de conto
     confirm_follow_selected_followers: Esque tu vermen vole sequer selectet sequitores?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2051e30aeeaeff..6880f64c5e691d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1520,6 +1520,9 @@ ja:
     errors:
       limit_reached: リアクションの種類が上限に達しました
       unrecognized_emoji: は絵文字として認識されていません
+  redirects:
+    prompt: リンク先を確かめ、信用できる場合のみリンクをクリックしてください。
+    title: "%{instance} から別のサーバーに移動します。"
   relationships:
     activity: 活動
     confirm_follow_selected_followers: 選択したフォロワーをフォローしてもよろしいですか？
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 72e63e47d3aa9c..7fe60541e6bd48 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1449,7 +1449,7 @@ zh-TW:
       title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 於嘟文中提及您:"
+      body: "%{name} 於嘟文中提及您："
       subject: "%{name} 於嘟文中提及您"
       title: 新的提及
     poll:

From 805dba7f8d2a2d5f910ec1396247b36417170345 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Jan 2024 15:09:45 +0100
Subject: [PATCH 03/43] Change compose form to use server-provided post
 character limit (#28928)

---
 .../features/compose/components/compose_form.jsx         | 9 +++++----
 .../compose/containers/compose_form_container.js         | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index c5ee894683366d..b93bac9d19bce9 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -70,6 +70,7 @@ class ComposeForm extends ImmutablePureComponent {
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
+    maxChars: PropTypes.number,
     ...WithOptionalRouterPropTypes
   };
 
@@ -101,11 +102,11 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   canSubmit = () => {
-    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+    const { isSubmitting, isChangingUpload, isUploading, anyMedia, maxChars } = this.props;
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia));
   };
 
   handleSubmit = (e) => {
@@ -224,7 +225,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
@@ -297,7 +298,7 @@ class ComposeForm extends ImmutablePureComponent {
                 <PollButtonContainer />
                 <SpoilerButtonContainer />
                 <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
-                <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+                <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
               </div>
 
               <div className='compose-form__submit'>
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index ba20698bac8c5c..b5e5300334dcbc 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -28,6 +28,7 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
 });
 
 const mapDispatchToProps = (dispatch) => ({

From 9cc1817bb493799b89d1171a1d632abb9791340c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 09:10:26 -0500
Subject: [PATCH 04/43] Fix intmermittent failure in `api/v1/accounts/statuses`
 controller spec (#28931)

---
 .../api/v1/accounts/statuses_controller_spec.rb     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index df71e94ace71e2..9bf385c03dc1eb 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -39,11 +39,14 @@
       end
 
       it 'returns posts along with self replies', :aggregate_failures do
-        json = body_as_json
-        post_ids = json.map { |item| item[:id].to_i }.sort
-
-        expect(response).to have_http_status(200)
-        expect(post_ids).to eq [status.id, status_self_reply.id]
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to have_attributes(size: 2)
+          .and contain_exactly(
+            include(id: status.id.to_s),
+            include(id: status_self_reply.id.to_s)
+          )
       end
     end
 

From 2f8656334d341839bc471d1850850d80f920f01c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:21:31 -0500
Subject: [PATCH 05/43] Combine double subjects in `admin/accounts` controller
 spec (#28936)

---
 .../admin/accounts_controller_spec.rb           | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 1882ea83883898..ef3053b6b35776 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -153,13 +153,9 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in approving account' do
+      it 'succeeds in approving account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
         expect(user.reload).to be_approved
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -195,12 +191,8 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in rejecting account' do
+      it 'succeeds in rejecting account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -286,12 +278,9 @@
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in removing email blocks' do
+      it 'succeeds in removing email blocks and redirects to admin account path' do
         expect { subject }.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
-      end
 
-      it 'redirects to admin account path' do
-        subject
         expect(response).to redirect_to admin_account_path(account.id)
       end
     end

From 6d35a77c9226881c1d554566aca120e330004df1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:22:44 -0500
Subject: [PATCH 06/43] Combine repeated subjects in `models/user` spec
 (#28937)

---
 spec/models/user_spec.rb | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 213022e8301b95..5ac41c0ff1dd94 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -187,12 +187,9 @@
     context 'when the user is already confirmed' do
       let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
 
-      it 'sets email to unconfirmed_email' do
+      it 'sets email to unconfirmed_email and does not trigger web hook' do
         expect { subject }.to change { user.reload.email }.to(new_email)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end
@@ -206,12 +203,9 @@
           user.approve!
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -221,12 +215,9 @@
           Setting.registrations_mode = 'open'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -236,12 +227,9 @@
           Setting.registrations_mode = 'approved'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and does not trigger web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'does not trigger the account.approved Web Hook' do
-          subject
           expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
         end
       end
@@ -259,12 +247,9 @@
     context 'when the user is already confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and triggers `account.approved` web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'triggers the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
       end
     end
@@ -272,12 +257,9 @@
     context 'when the user is not confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: nil, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and does not trigger web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end

From beaef4b6723cc0ddd34a3139749e02e870178c2b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:23:12 -0500
Subject: [PATCH 07/43] Combine double subjects in application controller
 shared example (#28938)

---
 spec/controllers/application_controller_spec.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index e9d47960353fdb..a309e933ee4c82 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -22,13 +22,10 @@ def invalid_authenticity_token
   end
 
   shared_examples 'respond_with_error' do |code|
-    it "returns http #{code} for http" do
-      subject
-      expect(response).to have_http_status(code)
-    end
-
-    it 'renders template for http' do
+    it "returns http #{code} for http and renders template" do
       expect(subject).to render_template("errors/#{code}", layout: 'error')
+
+      expect(response).to have_http_status(code)
     end
   end
 

From beb74fd71cba1c460c8ef3df016905aa063bdc7f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:28:50 -0500
Subject: [PATCH 08/43] Combine double subjects in instance actors controller
 shared example (#28939)

---
 .../instance_actors_controller_spec.rb           | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 8406094311eaab..36b9049fbcf3c4 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -12,30 +12,20 @@
           get :show, params: { format: format }
         end
 
-        it 'returns http success' do
+        it 'returns http success with correct media type, headers, and session values' do
           expect(response).to have_http_status(200)
-        end
 
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
-        end
 
-        it 'does not set cookies' do
           expect(response.cookies).to be_empty
           expect(response.headers['Set-Cookies']).to be_nil
-        end
 
-        it 'does not set sessions' do
           expect(session).to be_empty
-        end
 
-        it 'returns public Cache-Control header' do
           expect(response.headers['Cache-Control']).to include 'public'
-        end
 
-        it 'renders account' do
-          json = body_as_json
-          expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
+          expect(body_as_json)
+            .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end
       end
 

From 685eaa04d4037886e4d7f4e346183a04c292bf0a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:30:30 -0500
Subject: [PATCH 09/43] Combine double subject in admin/statuses controller
 shared example (#28940)

---
 spec/controllers/admin/statuses_controller_spec.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index dc5e28e9727147..4e8bf9ead68d51 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -60,16 +60,14 @@
     shared_examples 'when action is report' do
       let(:action) { 'report' }
 
-      it 'creates a report' do
+      it 'creates a report and redirects to report page' do
         subject
 
-        report = Report.last
-        expect(report.target_account_id).to eq account.id
-        expect(report.status_ids).to eq status_ids
-      end
-
-      it 'redirects to report page' do
-        subject
+        expect(Report.last)
+          .to have_attributes(
+            target_account_id: eq(account.id),
+            status_ids: eq(status_ids)
+          )
 
         expect(response).to redirect_to(admin_report_path(Report.last.id))
       end

From 1a30a517d60148c518cb74d6c8fbbef21f6fae56 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:31:07 -0500
Subject: [PATCH 10/43] Combine repeated subjects in link details extractor
 spec (#28941)

---
 spec/lib/link_details_extractor_spec.rb | 132 ++++++------------------
 1 file changed, 30 insertions(+), 102 deletions(-)

diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 8c485cef2afb5b..26d9d4e2659821 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -46,22 +46,13 @@
       </html>
     HTML
 
-    describe '#title' do
-      it 'returns the title from title tag' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from meta tag' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from lang attribute' do
-        expect(subject.language).to eq 'en'
-      end
+    it 'extracts the expected values from html metadata' do
+      expect(subject)
+        .to have_attributes(
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          language: eq('en')
+        )
     end
   end
 
@@ -90,40 +81,16 @@
     end
 
     shared_examples 'structured data' do
-      describe '#title' do
-        it 'returns the title from structured data' do
-          expect(subject.title).to eq 'Man bites dog'
-        end
-      end
-
-      describe '#description' do
-        it 'returns the description from structured data' do
-          expect(subject.description).to eq "A dog's tale"
-        end
-      end
-
-      describe '#published_at' do
-        it 'returns the publicaton time from structured data' do
-          expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-        end
-      end
-
-      describe '#author_name' do
-        it 'returns the author name from structured data' do
-          expect(subject.author_name).to eq 'Charlie Brown'
-        end
-      end
-
-      describe '#provider_name' do
-        it 'returns the provider name from structured data' do
-          expect(subject.provider_name).to eq 'Pet News'
-        end
-      end
-
-      describe '#language' do
-        it 'returns the language from structured data' do
-          expect(subject.language).to eq 'en'
-        end
+      it 'extracts the expected values from structured data' do
+        expect(subject)
+          .to have_attributes(
+            title: eq('Man bites dog'),
+            description: eq("A dog's tale"),
+            published_at: eq('2022-01-31T19:53:00+00:00'),
+            author_name: eq('Charlie Brown'),
+            provider_name: eq('Pet News'),
+            language: eq('en')
+          )
       end
     end
 
@@ -245,58 +212,19 @@
       </html>
     HTML
 
-    describe '#canonical_url' do
-      it 'returns the URL from Open Graph protocol data' do
-        expect(subject.canonical_url).to eq 'https://example.com/dog.html'
-      end
-    end
-
-    describe '#title' do
-      it 'returns the title from Open Graph protocol data' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from Open Graph protocol data' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#published_at' do
-      it 'returns the publicaton time from Open Graph protocol data' do
-        expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-      end
-    end
-
-    describe '#author_name' do
-      it 'returns the author name from Open Graph protocol data' do
-        expect(subject.author_name).to eq 'Charlie Brown'
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from Open Graph protocol data' do
-        expect(subject.language).to eq 'en'
-      end
-    end
-
-    describe '#image' do
-      it 'returns the image from Open Graph protocol data' do
-        expect(subject.image).to eq 'https://example.com/snoopy.jpg'
-      end
-    end
-
-    describe '#image:alt' do
-      it 'returns the image description from Open Graph protocol data' do
-        expect(subject.image_alt).to eq 'A good boy'
-      end
-    end
-
-    describe '#provider_name' do
-      it 'returns the provider name from Open Graph protocol data' do
-        expect(subject.provider_name).to eq 'Pet News'
-      end
+    it 'extracts the expected values from open graph data' do
+      expect(subject)
+        .to have_attributes(
+          canonical_url: eq('https://example.com/dog.html'),
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          published_at: eq('2022-01-31T19:53:00+00:00'),
+          author_name: eq('Charlie Brown'),
+          language: eq('en'),
+          image: eq('https://example.com/snoopy.jpg'),
+          image_alt: eq('A good boy'),
+          provider_name: eq('Pet News')
+        )
     end
   end
 end

From 5fbdb2055becdb4177ad8aa0b3891cb2617d223b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:35:19 -0500
Subject: [PATCH 11/43] Combine repeated `subject` in `cli/accounts` spec
 shared example (#28942)

---
 spec/lib/mastodon/cli/accounts_spec.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 98be2b2027d43e..137f85c6ca20f7 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -1326,18 +1326,16 @@ def expect_no_account_prunes
     end
 
     shared_examples 'a successful migration' do
-      it 'calls the MoveService for the last migration' do
+      it 'displays a success message and calls the MoveService for the last migration' do
         expect { subject }
-          .to output_results('OK')
-
-        last_migration = source_account.migrations.last
+          .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
 
-        expect(move_service).to have_received(:call).with(last_migration).once
+        expect(move_service)
+          .to have_received(:call).with(last_migration).once
       end
 
-      it 'displays a successful message' do
-        expect { subject }
-          .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
+      def last_migration
+        source_account.migrations.last
       end
     end
 

From 09a3493fcacf7ae4f190fceb3c22a0510eac022f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:35:49 -0500
Subject: [PATCH 12/43] Combine double subject in `api/v1/media` shared example
 (#28943)

---
 spec/requests/api/v1/media_spec.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index 2c29328087cf3c..26c76b9c5b98f6 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -76,20 +76,14 @@
     let(:params) { {} }
 
     shared_examples 'a successful media upload' do |media_type|
-      it 'uploads the file successfully', :aggregate_failures do
+      it 'uploads the file successfully and returns correct media content', :aggregate_failures do
         subject
 
         expect(response).to have_http_status(200)
         expect(MediaAttachment.first).to be_present
         expect(MediaAttachment.first).to have_attached_file(:file)
-      end
-
-      it 'returns the correct media content' do
-        subject
-
-        body = body_as_json
 
-        expect(body).to match(
+        expect(body_as_json).to match(
           a_hash_including(id: MediaAttachment.first.id.to_s, description: params[:description], type: media_type)
         )
       end

From d791bca11b69f0599a000c8568885dc2ee14ef06 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:36:21 -0500
Subject: [PATCH 13/43] Combine double subject in `well_known/webfinger` shared
 example (#28944)

---
 spec/requests/well_known/webfinger_spec.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 779f1bba598d02..0aafdf56244ec5 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -17,22 +17,18 @@
   end
 
   shared_examples 'a successful response' do
-    it 'returns http success' do
+    it 'returns http success with correct media type and headers and body json' do
       expect(response).to have_http_status(200)
-    end
 
-    it 'sets only a Vary Origin header' do
       expect(response.headers['Vary']).to eq('Origin')
-    end
 
-    it 'returns application/jrd+json' do
       expect(response.media_type).to eq 'application/jrd+json'
-    end
 
-    it 'returns links for the account' do
-      json = body_as_json
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      expect(body_as_json)
+        .to include(
+          subject: eq('acct:alice@cb6e6126.ngrok.io'),
+          aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+        )
     end
   end
 

From e519f113e8154dacd7fd1b67b35bd3f40d9768a2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 11:37:05 -0500
Subject: [PATCH 14/43] Combine repeated subject in `cacheable response` shared
 example (#28945)

---
 spec/support/examples/cache.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/spec/support/examples/cache.rb b/spec/support/examples/cache.rb
index 43cfbade8242f9..afbee66b2d357a 100644
--- a/spec/support/examples/cache.rb
+++ b/spec/support/examples/cache.rb
@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
 shared_examples 'cacheable response' do |expects_vary: false|
-  it 'does not set cookies' do
+  it 'sets correct cache and vary headers and does not set cookies or session' do
     expect(response.cookies).to be_empty
     expect(response.headers['Set-Cookies']).to be_nil
-  end
 
-  it 'does not set sessions' do
     expect(session).to be_empty
-  end
 
-  if expects_vary
-    it 'returns Vary header' do
-      expect(response.headers['Vary']).to include(expects_vary)
-    end
-  end
+    expect(response.headers['Vary']).to include(expects_vary) if expects_vary
 
-  it 'returns public Cache-Control header' do
     expect(response.headers['Cache-Control']).to include('public')
   end
 end

From 160c8f492362abca1c97e0e63cef1cafdd3ba6ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:03 +0100
Subject: [PATCH 15/43] Update babel monorepo to v7.23.9 (#28916)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 172 +++++++++++++++++++++++++++---------------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 78261b3b8427e1..759c43138b666e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,7 +42,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
   dependencies:
@@ -60,25 +60,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.7
-  resolution: "@babel/core@npm:7.23.7"
+  version: 7.23.9
+  resolution: "@babel/core@npm:7.23.9"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.7"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/helpers": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/template": "npm:^7.23.9"
+    "@babel/traverse": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 38c9934973d384ed83369712978453eac91dc3f22167404dbdb272b64f602e74728a6f37012c53ee57e521b8ae2da60097f050497d9b6a212d28b59cdfb2cd1d
+  checksum: 03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
   languageName: node
   linkType: hard
 
@@ -167,9 +167,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
+"@babel/helper-define-polyfill-provider@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -178,7 +178,7 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 60126f5f719b9e2114df62e3bf3ac0797b71d8dc733db60192eb169b004fde72ee309fa5848c5fdfe98b8e8863c46f55e16da5aa8a4e420b4d2670cd0c5dd708
+  checksum: 2b053b96a0c604a7e0f5c7d13a8a55f4451d938f7af42bd40f62a87df15e6c87a0b1dbd893a0f0bb51077b54dc3ba00a58b166531a5940ad286ab685dd8979ec
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/helpers@npm:7.23.7"
+"@babel/helpers@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/helpers@npm:7.23.9"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
-  checksum: f74a61ad28a1bc1fdd9133ad571c07787b66d6db017c707b87c203b0cd06879cea8b33e9c6a8585765a4949efa5df3cc9e19b710fe867f11be38ee29fd4a0488
+    "@babel/template": "npm:^7.23.9"
+    "@babel/traverse": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
+  checksum: f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
   languageName: node
   linkType: hard
 
@@ -364,12 +364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/parser@npm:7.23.6"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/parser@npm:7.23.9"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
+  checksum: 7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
   languageName: node
   linkType: hard
 
@@ -661,9 +661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.9"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -671,7 +671,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 63d314edc9fbeaf2700745ca0e19bf9840e87f2d7d1f6c5638e06d2aec3e7418d0d7493ed09087e2fe369cc15e9d96c113fb2cd367cb5e3ff922e3712c27b7d4
+  checksum: 4ff75f9ce500e1de8c0236fa5122e6475a477d19cb9a4c2ae8651e78e717ebb2e2cecfeca69d420def779deaec78b945843b9ffd15f02ecd7de5072030b4469b
   languageName: node
   linkType: hard
 
@@ -931,9 +931,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.9"
   dependencies:
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-module-transforms": "npm:^7.23.3"
@@ -941,7 +941,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d55280a276510222c8896bf4e581acb84824aa5b14c824f7102242ad6bc5104aaffe5ab22fe4d27518f4ae2811bd59c36d0c0bfa695157f9cfce33f0517a069
+  checksum: 1926631fe9d87c0c53427a3420ad49da62d53320d0016b6afab64e5417a672aa5bdff3ea1d24746ffa1e43319c28a80f5d8cef0ad214760d399c293b5850500f
   languageName: node
   linkType: hard
 
@@ -1200,18 +1200,18 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.7"
+  version: 7.23.9
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.9"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
+    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d5038462a5762c3a88d820785f685ce1b659075527a3ad538647fd9ce486052777d5aea3d62e626639d60441a04dd0ded2ed32c86b92cf8afbdbd3d54460c13
+  checksum: 3b959c2b88ea0009c288fa190d9f69b0d26cb336b8a7cab54a5e54b844f33cce1996725c15305a40049c8f23ca30082ee27e1f6853ff35fad723543e3d2dba47
   languageName: node
   linkType: hard
 
@@ -1333,8 +1333,8 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.8
-  resolution: "@babel/preset-env@npm:7.23.8"
+  version: 7.23.9
+  resolution: "@babel/preset-env@npm:7.23.9"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
@@ -1363,7 +1363,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.9"
     "@babel/plugin-transform-async-to-generator": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
@@ -1385,7 +1385,7 @@ __metadata:
     "@babel/plugin-transform-member-expression-literals": "npm:^7.23.3"
     "@babel/plugin-transform-modules-amd": "npm:^7.23.3"
     "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.3"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.9"
     "@babel/plugin-transform-modules-umd": "npm:^7.23.3"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
     "@babel/plugin-transform-new-target": "npm:^7.23.3"
@@ -1411,14 +1411,14 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": "npm:^7.23.3"
     "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.8"
+    babel-plugin-polyfill-corejs3: "npm:^0.9.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.5"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e602ad954645f1a509644e3d2c72b3c63bdc2273c377e7a83b78f076eca215887ea3624ffc36aaad03deb9ac8acd89e247fd4562b96e0f2b679485e20d8ff25f
+  checksum: 2837a42089180e51bfd6864b6d197e01fc0abec1920422e71c0513c2fc8fb5f3bfe694ed778cc4e45856c546964945bc53bf8105e4b26f3580ce3685fa50cc0f
   languageName: node
   linkType: hard
 
@@ -1483,28 +1483,28 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.8
-  resolution: "@babel/runtime@npm:7.23.8"
+  version: 7.23.9
+  resolution: "@babel/runtime@npm:7.23.9"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8
+  checksum: e71205fdd7082b2656512cc98e647d9ea7e222e4fe5c36e9e5adc026446fcc3ba7b3cdff8b0b694a0b78bb85db83e7b1e3d4c56ef90726682b74f13249cf952d
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
+  version: 7.23.9
+  resolution: "@babel/template@npm:7.23.9"
   dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/parser": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.15"
-  checksum: 9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454
+    "@babel/code-frame": "npm:^7.23.5"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
+  checksum: 0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/traverse@npm:7.23.7"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/traverse@npm:7.23.9"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -1512,22 +1512,22 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.23.9"
+    "@babel/types": "npm:^7.23.9"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: e32fceb4249beec2bde83968ddffe17444221c1ee5cd18c543a2feaf94e3ca83f2a4dfbc2dcca87cf226e0105973e0fe3717063a21e982a9de9945615ab3f3f5
+  checksum: d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.6
-  resolution: "@babel/types@npm:7.23.6"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.9
+  resolution: "@babel/types@npm:7.23.9"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
+  checksum: edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
   languageName: node
   linkType: hard
 
@@ -4805,39 +4805,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.7":
-  version: 0.4.7
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
+"babel-plugin-polyfill-corejs2@npm:^0.4.8":
+  version: 0.4.8
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: f80f7284ec72c63e7dd751e0bdf25e9978df195a79e0887470603bfdea13ee518d62573cf360bb1bc01b80819e54915dd5edce9cff14c52d0af5f984aa3d36a3
+  checksum: 843e7528de0e03a31a6f3837896a95f75b0b24b0294a077246282372279e974400b0bdd82399e8f9cbfe42c87ed56540fd71c33eafb7c8e8b9adac546ecc5fe5
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.8.7":
-  version: 0.8.7
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
+"babel-plugin-polyfill-corejs3@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.9.0"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
-    core-js-compat: "npm:^3.33.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
+    core-js-compat: "npm:^3.34.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 094e40f4ab9f131408202063964d63740609fd4fdb70a5b6332b371761921b540ffbcee7a434c0199b8317dfb2ba4675eef674867215fd3b85e24054607c1501
+  checksum: b857010736c5e42e20b683973dae862448a42082fcc95b3ef188305a6864a4f94b5cbd568e49e4cd7172c6b2eace7bc403c3ba0984fbe5479474ade01126d559
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.4":
-  version: 0.5.4
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
+"babel-plugin-polyfill-regenerator@npm:^0.5.5":
+  version: 0.5.5
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.5.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 0b903f5fe2f8c487b4260935dfe60bd9a95bcaee7ae63958f063045093b16d4e8288c232199d411261300aa21f6b106a3cb83c42cc996de013b337f5825a79fe
+  checksum: 2aab692582082d54e0df9f9373dca1b223e65b4e7e96440160f27ed8803d417a1fa08da550f08aa3820d2010329ca91b68e2b6e9bd7aed51c93d46dfe79629bb
   languageName: node
   linkType: hard
 
@@ -5922,12 +5922,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
-  version: 3.35.0
-  resolution: "core-js-compat@npm:3.35.0"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.34.0":
+  version: 3.35.1
+  resolution: "core-js-compat@npm:3.35.1"
   dependencies:
     browserslist: "npm:^4.22.2"
-  checksum: 8c4379240b8decb94b21e81d5ba6f768418721061923b28c9dfc97574680c35d778d39c010207402fc7c8308a68a4cf6d5e02bcbcb96e931c52e6e0dce29a68c
+  checksum: c3b872e1f9703aa9554cce816207d85730da4703f1776c540b4da11bbbef6d9a1e6041625b5c1f58d2ada3d05f4a2b92897b7de5315c5ecd5d33d50dec86cca7
   languageName: node
   linkType: hard
 

From f4a12adfb7f1706d82460c9e27a28101a87d35ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:09 +0100
Subject: [PATCH 16/43] Update dependency axios to v1.6.7 (#28917)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 759c43138b666e..a2ea797d38916f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4673,13 +4673,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.6
-  resolution: "axios@npm:1.6.6"
+  version: 1.6.7
+  resolution: "axios@npm:1.6.7"
   dependencies:
     follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 974f54cfade94fd4c0191309122a112c8d233089cecb0070cd8e0904e9bd9c364ac3a6fd0f981c978508077249788950427c565f54b7b2110e5c3426006ff343
+  checksum: 131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
   languageName: node
   linkType: hard
 

From 87ad398ddc78f2da5746774960690661e8e57335 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:49:16 +0100
Subject: [PATCH 17/43] Update formatjs monorepo (#28925)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 72 +++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a2ea797d38916f..3f70a02e74803f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1830,14 +1830,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.5":
-  version: 2.7.5
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.5"
+"@formatjs/icu-messageformat-parser@npm:2.7.6":
+  version: 2.7.6
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-skeleton-parser": "npm:1.7.2"
+    "@formatjs/icu-skeleton-parser": "npm:1.8.0"
     tslib: "npm:^2.4.0"
-  checksum: b1995ee0844c48d1b4bf184017a65600eb1d324107046c8b67d77e08d7da74bbbbf00dccbf2bc418480c8510443b3eb157646404fbacd71fa6e7d572d0ffc910
+  checksum: 9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
   languageName: node
   linkType: hard
 
@@ -1851,13 +1851,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.2"
+"@formatjs/icu-skeleton-parser@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     tslib: "npm:^2.4.0"
-  checksum: 7ca30ac360a5a971b5a06b4ae0263f0ddbde4751ff470486767f544f0399c5c85affab7170e5dd227c65afac4797e79a5e8abe65a70a335b96ab77b5d314abcb
+  checksum: 10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
   languageName: node
   linkType: hard
 
@@ -1912,31 +1912,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.9.11":
-  version: 2.9.11
-  resolution: "@formatjs/intl@npm:2.9.11"
+"@formatjs/intl@npm:2.10.0":
+  version: 2.10.0
+  resolution: "@formatjs/intl@npm:2.10.0"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
-    intl-messageformat: "npm:10.5.10"
+    intl-messageformat: "npm:10.5.11"
     tslib: "npm:^2.4.0"
   peerDependencies:
     typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 003a4356e698cf847aeb701565cad701f3afba2a31d8d3c2fe0d5790d90ef866bea30cf2cc20151b15085db10e436376d38c10b911b3fe5afdef5c32333d09f3
+  checksum: 7566038b011116cee7069165a25836b3fb687948e61b041809a9d978ac6c0882ae8d81a624a415cfb8e43852d097cd1cbc3c6707e717928e39b75c252491a712
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.11":
-  version: 3.13.11
-  resolution: "@formatjs/ts-transformer@npm:3.13.11"
+"@formatjs/ts-transformer@npm:3.13.12":
+  version: 3.13.12
+  resolution: "@formatjs/ts-transformer@npm:3.13.12"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@types/json-stable-stringify": "npm:^1.0.32"
     "@types/node": "npm:14 || 16 || 17"
     chalk: "npm:^4.0.0"
@@ -1948,7 +1948,7 @@ __metadata:
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 2f7c48e742a152d0499615d01113fab23089c3c56beaa3234f53bbe48393b6351c68eba1aa23d6dec57ebfd7b1d12b165215950eeb87dd90072519dcc0a2e022
+  checksum: 68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
   languageName: node
   linkType: hard
 
@@ -4725,21 +4725,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.12
-  resolution: "babel-plugin-formatjs@npm:10.5.12"
+  version: 10.5.13
+  resolution: "babel-plugin-formatjs@npm:10.5.13"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
     "@babel/plugin-syntax-jsx": "npm:7"
     "@babel/traverse": "npm:7"
     "@babel/types": "npm:^7.12.11"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
-    "@formatjs/ts-transformer": "npm:3.13.11"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/babel__core": "npm:^7.1.7"
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: 64fe3a38b283bb46e5528ad2f72287ca8a163227b0eea3bbe1bedff6d885b2be38c9fb8ed3843a72b723aeb2a7ad4d32b48e52030698631dc646aa15017f4208
+  checksum: 1ce0b69478dd3c92126a7e3440f1fad46feebebc9318e8bbb102dea91a60448da4a8511b3c8ffbf2c3675995fca6c8ce7f097c08907455b33a5f9185e39fb94e
   languageName: node
   linkType: hard
 
@@ -9271,15 +9271,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
-  version: 10.5.10
-  resolution: "intl-messageformat@npm:10.5.10"
+"intl-messageformat@npm:10.5.11, intl-messageformat@npm:^10.3.5":
+  version: 10.5.11
+  resolution: "intl-messageformat@npm:10.5.11"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     tslib: "npm:^2.4.0"
-  checksum: 2016c0561e5172b28f180669e28992d04944752d61ebcb539232cc289e7627fd92fe64c73985bc32bddd5cc683f7b77863c1b58507d214ce3a87982d50571658
+  checksum: 423f1c879ce2d0e7b9e0b4c1787a81ead7fe4d1734e0366a20fef56b06c09146e7ca3618e2e78b4f8b8f2b59cafe6237ceed21530fe0c16cfb47d915fc80222d
   languageName: node
   linkType: hard
 
@@ -13669,18 +13669,18 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.6.1
-  resolution: "react-intl@npm:6.6.1"
+  version: 6.6.2
+  resolution: "react-intl@npm:6.6.2"
   dependencies:
     "@formatjs/ecma402-abstract": "npm:1.18.2"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
-    "@formatjs/intl": "npm:2.9.11"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/intl": "npm:2.10.0"
     "@formatjs/intl-displaynames": "npm:6.6.6"
     "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.10"
+    intl-messageformat: "npm:10.5.11"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
@@ -13688,7 +13688,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9277269eadbe432a9651af66402240b8a91a567c769ac9c1a774575999f63689a31dccf22a09a1d78d1b8fed4ecad103bdcc609e476ee7e60dabf0cbce6556d3
+  checksum: 78288a0fded816735812dca6dcfee3eaa8bb3af7e963ba47639b51cc700a102a526859ff647ca79a5ebcdc69d6d78da90daeeed15cc0b819c7a20a74b2e1469c
   languageName: node
   linkType: hard
 

From 0b0ca6f3b85c9d08e4642e49d743f8d060632293 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:40:15 -0500
Subject: [PATCH 18/43] Move `api/v1/timelines/list` to request spec (#28948)

---
 .../api/v1/timelines/list_spec.rb}            | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)
 rename spec/{controllers/api/v1/timelines/list_controller_spec.rb => requests/api/v1/timelines/list_spec.rb} (73%)

diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/requests/api/v1/timelines/list_spec.rb
similarity index 73%
rename from spec/controllers/api/v1/timelines/list_controller_spec.rb
rename to spec/requests/api/v1/timelines/list_spec.rb
index 4ef5d41af83686..98d24567459c51 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/requests/api/v1/timelines/list_spec.rb
@@ -2,20 +2,17 @@
 
 require 'rails_helper'
 
-describe Api::V1::Timelines::ListController do
-  render_views
-
+describe 'API V1 Timelines List' do
   let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:list) { Fabricate(:list, account: user.account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
   context 'with a user context' do
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
 
-    describe 'GET #show' do
+    describe 'GET /api/v1/timelines/list/:id' do
       before do
         follow = Fabricate(:follow, account: user.account)
         list.accounts << follow.target_account
@@ -23,7 +20,8 @@
       end
 
       it 'returns http success' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
         expect(response).to have_http_status(200)
       end
     end
@@ -35,7 +33,8 @@
 
     describe 'GET #show' do
       it 'returns http not found' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
         expect(response).to have_http_status(404)
       end
     end
@@ -46,7 +45,7 @@
 
     describe 'GET #show' do
       it 'returns http unprocessable entity' do
-        get :show, params: { id: list.id }
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
 
         expect(response).to have_http_status(422)
         expect(response.headers['Link']).to be_nil

From 7adcc0aae3cadf946411192e680be9e1b7af9d7a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:40:39 -0500
Subject: [PATCH 19/43] Move `api/v1/trends/*` to request specs (#28949)

---
 .../api/v1/trends/links_spec.rb}                       | 10 ++++------
 .../api/v1/trends/statuses_spec.rb}                    | 10 ++++------
 .../api/v1/trends/tags_spec.rb}                        | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)
 rename spec/{controllers/api/v1/trends/links_controller_spec.rb => requests/api/v1/trends/links_spec.rb} (84%)
 rename spec/{controllers/api/v1/trends/statuses_controller_spec.rb => requests/api/v1/trends/statuses_spec.rb} (83%)
 rename spec/{controllers/api/v1/trends/tags_controller_spec.rb => requests/api/v1/trends/tags_spec.rb} (85%)

diff --git a/spec/controllers/api/v1/trends/links_controller_spec.rb b/spec/requests/api/v1/trends/links_spec.rb
similarity index 84%
rename from spec/controllers/api/v1/trends/links_controller_spec.rb
rename to spec/requests/api/v1/trends/links_spec.rb
index bcaf066f1602a0..012d0359072c74 100644
--- a/spec/controllers/api/v1/trends/links_controller_spec.rb
+++ b/spec/requests/api/v1/trends/links_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::LinksController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Links' do
+  describe 'GET /api/v1/trends/links' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::LinksController::DEFAULT_LINKS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/statuses_controller_spec.rb b/spec/requests/api/v1/trends/statuses_spec.rb
similarity index 83%
rename from spec/controllers/api/v1/trends/statuses_controller_spec.rb
rename to spec/requests/api/v1/trends/statuses_spec.rb
index 25ab5f228a094e..3b906e8f822b44 100644
--- a/spec/controllers/api/v1/trends/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/trends/statuses_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::StatusesController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Statuses' do
+  describe 'GET /api/v1/trends/statuses' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::BaseController::DEFAULT_STATUSES_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/requests/api/v1/trends/tags_spec.rb
similarity index 85%
rename from spec/controllers/api/v1/trends/tags_controller_spec.rb
rename to spec/requests/api/v1/trends/tags_spec.rb
index c889f1c5b9ef45..598f4e7752714d 100644
--- a/spec/controllers/api/v1/trends/tags_controller_spec.rb
+++ b/spec/requests/api/v1/trends/tags_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::TagsController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Tags' do
+  describe 'GET /api/v1/trends/tags' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to_not include('Link')
@@ -23,7 +21,7 @@
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::TagsController::DEFAULT_TAGS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')

From b6baab447de9c394d93d5d0b9800b4a4dab28cd7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:41:13 -0500
Subject: [PATCH 20/43] Move `api/v2/admin/accounts` to request spec (#28950)

---
 .../api/v2/admin/accounts_spec.rb}                   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
 rename spec/{controllers/api/v2/admin/accounts_controller_spec.rb => requests/api/v2/admin/accounts_spec.rb} (94%)

diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
similarity index 94%
rename from spec/controllers/api/v2/admin/accounts_controller_spec.rb
rename to spec/requests/api/v2/admin/accounts_spec.rb
index 349f4d2528bd09..fb04850bb7d2cb 100644
--- a/spec/controllers/api/v2/admin/accounts_controller_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Admin::AccountsController do
-  render_views
-
+RSpec.describe 'API V2 Admin Accounts' do
   let(:role)   { UserRole.find_by(name: 'Moderator') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
   describe 'GET #index' do
     let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }
     let!(:other_remote_account) { Fabricate(:account, domain: 'foo.bar') }
@@ -28,7 +23,8 @@
 
     before do
       pending_account.user.update(approved: false)
-      get :index, params: params
+
+      get '/api/v2/admin/accounts', params: params, headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'

From 5119fbc9b7e576b95404d1ffe126c212c09c9754 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:41:39 -0500
Subject: [PATCH 21/43] Move `api/v1/admin/trends/links/preview_card_providers`
 to request spec (#28951)

---
 .../links/preview_card_providers_spec.rb}     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)
 rename spec/{controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb => requests/api/v1/admin/trends/links/preview_card_providers_spec.rb} (60%)

diff --git a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
similarity index 60%
rename from spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
index 76e215440d44f8..384a305d4a0551 100644
--- a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::Links::PreviewCardProvidersController do
-  render_views
-
+describe 'API V1 Admin Trends Links Preview Card Providers' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:preview_card_provider) { Fabricate(:preview_card_provider) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/links/publishers' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/links/publishers', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/approve' do
     before do
-      post :approve, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/reject' do
     before do
-      post :reject, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'

From 239244e2ed577c12eda63f26735bf270dd0213b2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:43:08 -0500
Subject: [PATCH 22/43] Combine repeated subject in ap fetch remote account
 service spec (#28952)

---
 .../fetch_remote_account_service_spec.rb      | 87 +++++--------------
 1 file changed, 21 insertions(+), 66 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index ac7484d96d1a44..4015723f6df9cf 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -21,20 +21,14 @@
     let(:account) { subject.call('https://example.com/alice', id: true) }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account with expected details' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -48,19 +42,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and returns nil' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'returns nil' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when URI and WebFinger share the same host' do
@@ -71,17 +58,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets attributes' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -98,22 +80,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirection and sets attributes' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -129,19 +102,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
@@ -153,24 +119,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'with wrong id' do

From 44f6d285af45682b5ddb7225bfdc56b48cd27a91 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:44:12 -0500
Subject: [PATCH 23/43] Combine repeated subject in ap fetch remote actor
 service spec (#28953)

---
 .../fetch_remote_actor_service_spec.rb        | 87 +++++--------------
 1 file changed, 21 insertions(+), 66 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 93d31b69d5190f..485ca81a11aaa9 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -21,20 +21,14 @@
     let(:account) { subject.call('https://example.com/alice', id: true) }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account and sets attributes' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -48,19 +42,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and returns nil' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'returns nil' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when URI and WebFinger share the same host' do
@@ -71,17 +58,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets values' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -98,22 +80,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirect and sets values' do
         account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -129,19 +102,12 @@
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'when WebFinger returns a different URI after a redirection' do
@@ -153,24 +119,13 @@
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
+        expect(account).to be_nil
 
-      it 'looks up webfinger' do
-        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
-
-      it 'does not create account' do
-        expect(account).to be_nil
-      end
     end
 
     context 'with wrong id' do

From ff8937aa2c81c616cbe3b2d7ce7d0d11850f37b8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 Jan 2024 12:45:54 -0500
Subject: [PATCH 24/43] Move `api/v1/statuses/*` to request spec (#28954)

---
 .../api/v1/statuses/histories_spec.rb}        | 17 +++++--------
 .../api/v1/statuses/mutes_spec.rb}            | 21 ++++++----------
 .../api/v1/statuses/reblogs_spec.rb}          | 25 ++++++++-----------
 .../api/v1/statuses/translations_spec.rb}     | 17 +++++--------
 4 files changed, 30 insertions(+), 50 deletions(-)
 rename spec/{controllers/api/v1/statuses/histories_controller_spec.rb => requests/api/v1/statuses/histories_spec.rb} (53%)
 rename spec/{controllers/api/v1/statuses/mutes_controller_spec.rb => requests/api/v1/statuses/mutes_spec.rb} (66%)
 rename spec/{controllers/api/v1/statuses/reblogs_controller_spec.rb => requests/api/v1/statuses/reblogs_spec.rb} (81%)
 rename spec/{controllers/api/v1/statuses/translations_controller_spec.rb => requests/api/v1/statuses/translations_spec.rb} (65%)

diff --git a/spec/controllers/api/v1/statuses/histories_controller_spec.rb b/spec/requests/api/v1/statuses/histories_spec.rb
similarity index 53%
rename from spec/controllers/api/v1/statuses/histories_controller_spec.rb
rename to spec/requests/api/v1/statuses/histories_spec.rb
index 99384c8ed5e914..b3761ca6882a44 100644
--- a/spec/controllers/api/v1/statuses/histories_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/histories_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::HistoriesController do
-  render_views
-
+describe 'API V1 Statuses Histories' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #show' do
+    describe 'GET /api/v1/statuses/:status_id/history' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        get :show, params: { status_id: status.id }
+        get "/api/v1/statuses/#{status.id}/history", headers: headers
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb b/spec/requests/api/v1/statuses/mutes_spec.rb
similarity index 66%
rename from spec/controllers/api/v1/statuses/mutes_controller_spec.rb
rename to spec/requests/api/v1/statuses/mutes_spec.rb
index 03274fe1cd2b5c..72fd7d9d11503d 100644
--- a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/mutes_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::MutesController do
-  render_views
-
+describe 'API V1 Statuses Mutes' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:mutes', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:mutes' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/mute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/mute", headers: headers
       end
 
       it 'creates a conversation mute', :aggregate_failures do
@@ -27,12 +22,12 @@
       end
     end
 
-    describe 'POST #destroy' do
+    describe 'POST /api/v1/statuses/:status_id/unmute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
         user.account.mute_conversation!(status.conversation)
-        post :destroy, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/unmute", headers: headers
       end
 
       it 'destroys the conversation mute', :aggregate_failures do
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
similarity index 81%
rename from spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogs_spec.rb
index 014a03c1a20698..cf0a1f861d9bde 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::ReblogsController do
-  render_views
-
+describe 'API V1 Statuses Reblogs' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/reblog' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/reblog", headers: headers
       end
 
       context 'with public status' do
@@ -46,13 +41,13 @@
       end
     end
 
-    describe 'POST #destroy', :sidekiq_inline do
+    describe 'POST /api/v1/statuses/:status_id/unreblog', :sidekiq_inline do
       context 'with public status' do
         let(:status) { Fabricate(:status, account: user.account) }
 
         before do
           ReblogService.new.call(user.account, status)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -76,7 +71,7 @@
         before do
           ReblogService.new.call(user.account, status)
           status.account.block!(user.account)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -98,7 +93,7 @@
         let(:status) { Fabricate(:status, visibility: :private) }
 
         before do
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'returns http not found' do
diff --git a/spec/controllers/api/v1/statuses/translations_controller_spec.rb b/spec/requests/api/v1/statuses/translations_spec.rb
similarity index 65%
rename from spec/controllers/api/v1/statuses/translations_controller_spec.rb
rename to spec/requests/api/v1/statuses/translations_spec.rb
index 6257494ae18627..5b0a994561c184 100644
--- a/spec/controllers/api/v1/statuses/translations_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/translations_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::TranslationsController do
-  render_views
-
+describe 'API V1 Statuses Translations' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/translate' do
       let(:status) { Fabricate(:status, account: user.account, text: 'Hola', language: 'es') }
 
       before do
@@ -22,7 +17,7 @@
         service = instance_double(TranslationService::DeepL, translate: [translation])
         allow(TranslationService).to receive_messages(configured?: true, configured: service)
         Rails.cache.write('translation_service/languages', { 'es' => ['en'] })
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/translate", headers: headers
       end
 
       it 'returns http success' do

From 1467f1e1e1c18dc4b310862ff1f719165a24cfb6 Mon Sep 17 00:00:00 2001
From: J H <jh97uk@icloud.com>
Date: Tue, 30 Jan 2024 13:38:49 +0000
Subject: [PATCH 25/43] Fixed the toggle emoji dropdown bug  (#29012)

---
 .../features/compose/components/emoji_picker_dropdown.jsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 9949d2c001007b..37017f4cc32021 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -164,6 +164,7 @@ class EmojiPickerMenuImpl extends PureComponent {
     intl: PropTypes.object.isRequired,
     skinTone: PropTypes.number.isRequired,
     onSkinTone: PropTypes.func.isRequired,
+    pickerButtonRef: PropTypes.func.isRequired
   };
 
   static defaultProps = {
@@ -178,7 +179,7 @@ class EmojiPickerMenuImpl extends PureComponent {
   };
 
   handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
+    if (this.node && !this.node.contains(e.target) && !this.props.pickerButtonRef.contains(e.target)) {
       this.props.onClose();
     }
   };
@@ -233,6 +234,7 @@ class EmojiPickerMenuImpl extends PureComponent {
       emoji.native = emoji.colons;
     }
     if (!(event.ctrlKey || event.metaKey)) {
+
       this.props.onClose();
     }
     this.props.onPick(emoji);
@@ -407,6 +409,7 @@ class EmojiPickerDropdown extends PureComponent {
                   onSkinTone={onSkinTone}
                   skinTone={skinTone}
                   frequentlyUsedEmojis={frequentlyUsedEmojis}
+                  pickerButtonRef={this.target}
                 />
               </div>
             </div>

From adcd693b71805e703d04d1306c0ac2575cd8f383 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:29:42 -0500
Subject: [PATCH 26/43] Use existing `MediaAttachment.remote` scope in media
 CLI (#28912)

---
 lib/mastodon/cli/media.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 87946e0262f35b..ac8f219807284c 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -58,7 +58,7 @@ def remove
       end
 
       unless options[:prune_profiles] || options[:remove_headers]
-        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where(created_at: ..time_ago)) do |media_attachment|
+        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.remote.where(created_at: ..time_ago)) do |media_attachment|
           next if media_attachment.file.blank?
 
           size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)

From 9d3830344fc01bf72a3d624b30c881bf1c90888a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:30:39 +0100
Subject: [PATCH 27/43] Update dependency immutable to v4.3.5 (#28933)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3f70a02e74803f..c97667808a73c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9123,9 +9123,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.4
-  resolution: "immutable@npm:4.3.4"
-  checksum: c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f
+  version: 4.3.5
+  resolution: "immutable@npm:4.3.5"
+  checksum: 63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
   languageName: node
   linkType: hard
 

From f91acba70ac455b1240616e61968a36f99176ce7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:32:20 -0500
Subject: [PATCH 28/43] Combine repeated requests in account controller concern
 spec (#28957)

---
 .../account_controller_concern_spec.rb        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index e3295204aaf393..6eb970dedbba59 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -49,22 +49,21 @@ def success
   end
 
   context 'when account is not suspended' do
-    it 'assigns @account' do
-      account = Fabricate(:account)
+    let(:account) { Fabricate(:account, username: 'username') }
+
+    it 'assigns @account, returns success, and sets link headers' do
       get 'success', params: { account_username: account.username }
-      expect(assigns(:account)).to eq account
-    end
 
-    it 'sets link headers' do
-      Fabricate(:account, username: 'username')
-      get 'success', params: { account_username: 'username' }
-      expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"'
+      expect(assigns(:account)).to eq account
+      expect(response).to have_http_status(200)
+      expect(response.headers['Link'].to_s).to eq(expected_link_headers)
     end
 
-    it 'returns http success' do
-      account = Fabricate(:account)
-      get 'success', params: { account_username: account.username }
-      expect(response).to have_http_status(200)
+    def expected_link_headers
+      [
+        '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json"',
+        '<https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"',
+      ].join(', ')
     end
   end
 end

From b3075a9993bff1bfca18ada91fe5587e921781d5 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 31 Jan 2024 00:34:07 +0900
Subject: [PATCH 29/43] Remove unused l18n messages (#28964)

---
 .../mastodon/features/compose/components/poll_form.jsx          | 2 --
 app/javascript/mastodon/locales/en.json                         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 3c02810e7a29f5..b3566fd6f5ad7f 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -18,8 +18,6 @@ import AutosuggestInput from 'mastodon/components/autosuggest_input';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
   duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
   type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 4befe779490189..22a831b09329f8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -145,11 +145,9 @@
   "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": "What's on your mind?",
-  "compose_form.poll.add_option": "Add option",
   "compose_form.poll.duration": "Poll duration",
   "compose_form.poll.multiple": "Multiple choice",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.remove_option": "Remove this option",
   "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",

From 86fbde7b4615a1ac8209ca8886b4d7a3d8754063 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:38:33 -0500
Subject: [PATCH 30/43] Fix `Style/NumericLiterals` cop in ProfileStories
 support module (#28971)

---
 spec/support/stories/profile_stories.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 2b345ddef10b31..74342c337d6688 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -10,7 +10,7 @@ def as_a_registered_user
       account: Fabricate(:account, username: 'bob')
     )
 
-    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 201812160442020 }) if finished_onboarding # rubocop:disable Style/NumericLiterals
+    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 2018_12_16_044202 }) if finished_onboarding
   end
 
   def as_a_logged_in_user

From ce0d134147707cf7037784fe703837ca1627ea21 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 30 Jan 2024 10:39:01 -0500
Subject: [PATCH 31/43] Add `redirect_with_vary` to `AllowedMethods` for
 `Style/FormatStringToken` cop (#28973)

---
 .rubocop.yml     |  9 +++++++++
 config/routes.rb | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 69989411443558..330c40de1b67b0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -174,6 +174,15 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+# Reason: Route redirects are not token-formatted and must be skipped
+# https://docs.rubocop.org/rubocop/cops_style.html#styleformatstringtoken
+Style/FormatStringToken:
+  inherit_mode:
+    merge:
+      - AllowedMethods # The rubocop-rails config adds `redirect`
+  AllowedMethods:
+    - redirect_with_vary
+
 # Reason: Enforce modern Ruby style
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
diff --git a/config/routes.rb b/config/routes.rb
index c4f862acafa51f..bb088821fd7356 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,12 +104,12 @@ def redirect_with_vary(path)
     confirmations: 'auth/confirmations',
   }
 
-  # rubocop:disable Style/FormatStringToken - those do not go through the usual formatting functions and are not safe to correct
-  get '/users/:username', to: redirect_with_vary('/@%{username}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/following', to: redirect_with_vary('/@%{username}/following'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  # rubocop:enable Style/FormatStringToken
+  with_options constraints: ->(req) { req.format.nil? || req.format.html? } do
+    get '/users/:username', to: redirect_with_vary('/@%{username}')
+    get '/users/:username/following', to: redirect_with_vary('/@%{username}/following')
+    get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers')
+    get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}')
+  end
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 

From 8c08e5cdb282bb5bc7229335b24e947c179498f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:39:34 +0000
Subject: [PATCH 32/43] Update devDependencies (non-major) (#29000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c97667808a73c6..8ddbb0d0c0fb28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1777,8 +1777,8 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.6
-  resolution: "@formatjs/cli@npm:6.2.6"
+  version: 6.2.7
+  resolution: "@formatjs/cli@npm:6.2.7"
   peerDependencies:
     vue: ^3.3.4
   peerDependenciesMeta:
@@ -1786,7 +1786,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: f8b0bc45c72b83437f0dc91a2d3ea513852c11bfd8eedbc2f255b19552f153bccb4d38fcd281f897ca60d0dfddf2b99de22e5a87cb1e173ca11df88c61cde2e4
+  checksum: ee7b0873a734e02721ce1ee107ee60845bb30855f4ca686bfb6c5e9862353249d5d20748b18db93200aabc7a59875ff062f485c64d41cb8e61f1d43e2bb5eceb
   languageName: node
   linkType: hard
 
@@ -2945,8 +2945,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.2.0
-  resolution: "@testing-library/jest-dom@npm:6.2.0"
+  version: 6.4.0
+  resolution: "@testing-library/jest-dom@npm:6.4.0"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
@@ -2958,19 +2958,22 @@ __metadata:
     redent: "npm:^3.0.0"
   peerDependencies:
     "@jest/globals": ">= 28"
+    "@types/bun": "*"
     "@types/jest": ">= 28"
     jest: ">= 28"
     vitest: ">= 0.32"
   peerDependenciesMeta:
     "@jest/globals":
       optional: true
+    "@types/bun":
+      optional: true
     "@types/jest":
       optional: true
     jest:
       optional: true
     vitest:
       optional: true
-  checksum: 71421693e0ad6a46be7d16f00b58a45725c238693972b8b5b1fd9ab797902ccf1209cf259afe8da1bf59d7c958762c46ee85d1aa5b164a5ec330981ea2376b08
+  checksum: 6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
   languageName: node
   linkType: hard
 

From 0bc526a967f121cdee85bb529ec72bcd2244e2fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:39:59 +0000
Subject: [PATCH 33/43] Update eslint (non-major) (#29001)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 178 ++++++++++++++++++------------------------------------
 1 file changed, 59 insertions(+), 119 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8ddbb0d0c0fb28..4d1084c229bf91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1790,16 +1790,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.18.0":
-  version: 1.18.0
-  resolution: "@formatjs/ecma402-abstract@npm:1.18.0"
-  dependencies:
-    "@formatjs/intl-localematcher": "npm:0.5.2"
-    tslib: "npm:^2.4.0"
-  checksum: bbdad0aee8e48baad6bfe6b2c27caf3befe35e658b922ee2f84417a819f0bdc7e849a8c0c782db8b53f5666bf19669d2b10a1104257c08796d198c87766bfc92
-  languageName: node
-  linkType: hard
-
 "@formatjs/ecma402-abstract@npm:1.18.2":
   version: 1.18.2
   resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
@@ -1819,17 +1809,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.3":
-  version: 2.7.3
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.3"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/icu-skeleton-parser": "npm:1.7.0"
-    tslib: "npm:^2.4.0"
-  checksum: 2a51038813e5cff7e2df767e1227373d228e907adb7268fc3744b3d82c4fa69d4aa9f6020a62de2c468cf724600e9372ac07ae43a4480ed066fe34e224e80e4a
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-messageformat-parser@npm:2.7.6":
   version: 2.7.6
   resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
@@ -1841,16 +1820,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.7.0":
-  version: 1.7.0
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    tslib: "npm:^2.4.0"
-  checksum: 2e4db815247ddb10f7990bbb501c85b854ee951ee45143673eb91b4392b11d0a8312327adb8b624c6a2fdafab12083904630d6d22475503d025f1612da4dcaee
-  languageName: node
-  linkType: hard
-
 "@formatjs/icu-skeleton-parser@npm:1.8.0":
   version: 1.8.0
   resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
@@ -1883,15 +1852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.5.2":
-  version: 0.5.2
-  resolution: "@formatjs/intl-localematcher@npm:0.5.2"
-  dependencies:
-    tslib: "npm:^2.4.0"
-  checksum: 4b3ae75470e3e53ffa39b2d46e65a2a4c9c4becbc0aac989b0694370e10c6687643660a045512d676509bc29b257fe5726fbb028de12f889be02c2d20b6527e6
-  languageName: node
-  linkType: hard
-
 "@formatjs/intl-localematcher@npm:0.5.4":
   version: 0.5.4
   resolution: "@formatjs/intl-localematcher@npm:0.5.4"
@@ -1952,26 +1912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.9":
-  version: 3.13.9
-  resolution: "@formatjs/ts-transformer@npm:3.13.9"
-  dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@types/json-stable-stringify": "npm:^1.0.32"
-    "@types/node": "npm:14 || 16 || 17"
-    chalk: "npm:^4.0.0"
-    json-stable-stringify: "npm:^1.0.1"
-    tslib: "npm:^2.4.0"
-    typescript: "npm:5"
-  peerDependencies:
-    ts-jest: ">=27"
-  peerDependenciesMeta:
-    ts-jest:
-      optional: true
-  checksum: 4e313b967e45aae79246174c3181d31cc7cd297380d3a880a98fc0be16d76b783868712151e840ea16d22e2fbec0388b1005f688b6d4cb74ee4411b43f6d33f4
-  languageName: node
-  linkType: hard
-
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
@@ -3723,14 +3663,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0"
+  version: 6.20.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.20.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/type-utils": "npm:6.19.0"
-    "@typescript-eslint/utils": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/type-utils": "npm:6.20.0"
+    "@typescript-eslint/utils": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3743,44 +3683,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ab1a5ace6663b0c6d2418e321328fa28aa4bdc4b5fae257addec01346fb3a9c2d3a2960ade0f7114e6974c513a28632c9e8e602333cc0fab3135c445babdef59
+  checksum: 5020faac39be476de056342f58f2bf68bb788f230e2fa4a2e27ceab8a5187dc450beba7333b0aa741a43aeaff45a117558132953f9390b5eca4c2cc004fde716
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/parser@npm:6.19.0"
+  version: 6.20.0
+  resolution: "@typescript-eslint/parser@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d547bfb1aaed112cfc0f9f0be8506a280952ba3b61be42b749352139361bd94e4a47fa043d819e19c6a498cacbd8bb36a46e3628c436a7e2009e7ac27afc8861
+  checksum: d84ad5e2282b1096c80dedb903c83ecc31eaf7be1aafcb14c18d9ec2d4a319f2fd1e5a9038b944d9f42c36c1c57add5e4292d4026ca7d3d5441d41286700d402
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.19.0"
+"@typescript-eslint/scope-manager@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
-  checksum: 1ec7b9dedca7975f0aa4543c1c382f7d6131411bd443a5f9b96f137acb6adb450888ed13c95f6d26546b682b2e0579ce8a1c883fdbe2255dc0b61052193b8243
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
+  checksum: f6768ed2dcd2d1771d55ed567ff392a6569ffd683a26500067509dd41769f8838c43686460fe7337144f324fd063df33f5d5646d44e5df4998ceffb3ad1fb790
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/type-utils@npm:6.19.0"
+"@typescript-eslint/type-utils@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/type-utils@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
-    "@typescript-eslint/utils": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
+    "@typescript-eslint/utils": "npm:6.20.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3788,23 +3728,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5b146b985481e587122026c703ac9f537ad7e90eee1dca814971bca0d7e4a5d4ff9861fb4bf749014c28c6a4fbb4a01a4527355961315eb9501f3569f8e8dd38
+  checksum: 8f622fbb14268f1d00b2948f995b570f0ef82be02c12be41d90385290a56ea0dbd34d855d6a5aff100b57f3bdd300ff0c300f16c78f12d6064f7ae6e34fd71bf
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/types@npm:6.19.0"
-  checksum: 6f81860a3c14df55232c2e6dec21fb166867b9f30b3c3369b325aef5ee1c7e41e827c0504654daa49c8ff1a3a9ca9d9bfe76786882b6212a7c1b58991a9c80b9
+"@typescript-eslint/types@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/types@npm:6.20.0"
+  checksum: 37589003b0e06f83c1945e3748e91af85918cfd997766894642a08e6f355f611cfe11df4e7632dda96e3a9b3441406283fe834ab0906cf81ea97fd43ca2aebe3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
+"@typescript-eslint/typescript-estree@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/visitor-keys": "npm:6.20.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3814,34 +3754,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5b365f009e43c7beafdbb7d8ecad78ee1087b0a4338cd9ec695eed514b7b4c1089e56239761139ddae629ec0ce8d428840c6ebfeea3618d2efe00c84f8794da5
+  checksum: 551f13445a303882d9fc0fbe14ef8507eb8414253fd87a5f13d2e324b5280b626421a238b8ec038e628bc80128dc06c057757f668738e82e64d5b39a9083c27d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.19.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/utils@npm:6.19.0"
+"@typescript-eslint/utils@npm:6.20.0, @typescript-eslint/utils@npm:^6.18.1":
+  version: 6.20.0
+  resolution: "@typescript-eslint/utils@npm:6.20.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.19.0"
-    "@typescript-eslint/types": "npm:6.19.0"
-    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/scope-manager": "npm:6.20.0"
+    "@typescript-eslint/types": "npm:6.20.0"
+    "@typescript-eslint/typescript-estree": "npm:6.20.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 343ff4cd4f7e102df8c46b41254d017a33d95df76455531fda679fdb92aebb9c111df8ee9ab54972e73c1e8fad9dd7e421001233f0aee8115384462b0821852e
+  checksum: 0a8ede3d80a365b52ae96d88e4a9f6e6abf3569c6b60ff9f42ff900cd843ae7c5493cd95f8f2029d90bb0acbf31030980206af98e581d760d6d41e0f80e9fb86
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.19.0":
-  version: 6.19.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
+"@typescript-eslint/visitor-keys@npm:6.20.0":
+  version: 6.20.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.20.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.20.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: bb34e922e018aadf34866995ea5949d6623f184cc4f6470ab05767dd208ffabb003b7dc3872199714574b7f10afe89d49c6f89a4e8d086edea82be73e189f1bb
+  checksum: 852d938f2e5d57200cf62733b42e73a369f797b097d17e8fd3fffd0f7315c3b9e1863eed60bb8d57d6535a3b7f1980f645f96ec6d513950f182bfa8107b33fab
   languageName: node
   linkType: hard
 
@@ -7359,23 +7299,23 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.11.3
-  resolution: "eslint-plugin-formatjs@npm:4.11.3"
+  version: 4.12.2
+  resolution: "eslint-plugin-formatjs@npm:4.12.2"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/ts-transformer": "npm:3.13.9"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/eslint": "npm:7 || 8"
     "@types/picomatch": "npm:^2.3.0"
-    "@typescript-eslint/utils": "npm:^6.5.0"
+    "@typescript-eslint/utils": "npm:^6.18.1"
     emoji-regex: "npm:^10.2.1"
     magic-string: "npm:^0.30.0"
     picomatch: "npm:^2.3.1"
     tslib: "npm:2.6.2"
     typescript: "npm:5"
-    unicode-emoji-utils: "npm:^1.1.1"
+    unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 66481e0b5af5738bdb2b164ac1c74216c5c26f7c7400456a58387e71424bb30554aef39da43ce29bfd551f7dad678818d9af029022edadc4e1024349339f6984
+  checksum: 77cc1a2959903fcb6639d9fec89e7dfc55cf1e4ea58fca7d3bd6d12fa540aa173cbf5f90fc629b6aaf2ea3b8e61ed0a3cfce940fd2bec6f0796353315e2dbeef
   languageName: node
   linkType: hard
 
@@ -7407,8 +7347,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.2
-  resolution: "eslint-plugin-jsdoc@npm:48.0.2"
+  version: 48.0.4
+  resolution: "eslint-plugin-jsdoc@npm:48.0.4"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7421,7 +7361,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 6e6062c22fa4039e4be898a62f8ca0edef8bcbdc8257abb18302471e9819ccd63941971cf8de0ccf4eb59b3508902aa06de56214d80bdfc9bde7cadb94906190
+  checksum: c73063d26ca70d37ea00eea9750d1f889e5bfda64ca46dbfc6bf4842b892551c320368220cb46acc9d3d96a89fd5391486650284b82dc722f700e3b5df5c78db
   languageName: node
   linkType: hard
 
@@ -16510,7 +16450,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unicode-emoji-utils@npm:^1.1.1":
+"unicode-emoji-utils@npm:^1.2.0":
   version: 1.2.0
   resolution: "unicode-emoji-utils@npm:1.2.0"
   dependencies:

From 0c0d07727638ca795b7290e5918678450eec903c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:40:43 +0100
Subject: [PATCH 34/43] Update dependency chewy to v7.5.1 (#29018)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 57b25807222386..3891139dcedb05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.5.0)
+    chewy (7.5.1)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl

From c4af668e5ccf0ba26b3abc83b9bc36c3aa57a549 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Jan 2024 18:24:40 +0100
Subject: [PATCH 35/43] Fix follow recommendations for less used languages
 (#29017)

---
 app/models/account_summary.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 2a21d09a8bac6e..f052816361d405 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -15,7 +15,7 @@ class AccountSummary < ApplicationRecord
   has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
 
   scope :safe, -> { where(sensitive: false) }
-  scope :localized, ->(locale) { where(language: locale) }
+  scope :localized, ->(locale) { order(Arel::Nodes::Case.new.when(arel_table[:language].eq(locale)).then(1).else(0).desc) }
   scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 
   def self.refresh

From fa0ba677538588086d83c97c0ea56f9cd1556590 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Jan 2024 19:21:30 +0100
Subject: [PATCH 36/43] Change materialized views to be refreshed concurrently
 to avoid locks (#29015)

---
 app/models/account_summary.rb                               | 2 ++
 app/models/follow_recommendation.rb                         | 2 ++
 db/migrate/20210322164601_create_account_summaries.rb       | 2 +-
 ...0505174616_update_follow_recommendations_to_version_2.rb | 2 +-
 .../20211213040746_update_account_summaries_to_version_2.rb | 6 +++---
 .../20230818141056_create_global_follow_recommendations.rb  | 2 +-
 .../20230818142253_drop_follow_recommendations.rb           | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index f052816361d405..30ada50cc02932 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -19,6 +19,8 @@ class AccountSummary < ApplicationRecord
   scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 
   def self.refresh
+    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
+  rescue ActiveRecord::StatementInvalid
     Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
   end
 
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 9d2648394bc79f..6b49a3ca660170 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -19,6 +19,8 @@ class FollowRecommendation < ApplicationRecord
   scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
 
   def self.refresh
+    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
+  rescue ActiveRecord::StatementInvalid
     Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
   end
 
diff --git a/db/migrate/20210322164601_create_account_summaries.rb b/db/migrate/20210322164601_create_account_summaries.rb
index 8d18e9eeb4bd34..5c93291e0a54ee 100644
--- a/db/migrate/20210322164601_create_account_summaries.rb
+++ b/db/migrate/20210322164601_create_account_summaries.rb
@@ -2,7 +2,7 @@
 
 class CreateAccountSummaries < ActiveRecord::Migration[5.2]
   def change
-    create_view :account_summaries, materialized: { no_data: true }
+    create_view :account_summaries, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
index 22c27a0e7a8e84..3a9024ffcb1d12 100644
--- a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
+++ b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
@@ -6,7 +6,7 @@ class UpdateFollowRecommendationsToVersion2 < ActiveRecord::Migration[6.1]
 
   def up
     drop_view :follow_recommendations
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
index e347a874ff5181..a82cf4afa2eef3 100644
--- a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
+++ b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
@@ -4,7 +4,7 @@ class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
   def up
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 2, materialized: { no_data: true }
+      create_view :account_summaries, version: 2, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -12,7 +12,7 @@ def up
   def down
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 1, materialized: { no_data: true }
+      create_view :account_summaries, version: 1, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -20,7 +20,7 @@ def down
   def reapplication_follow_recommendations_v2
     drop_view :follow_recommendations, materialized: true
     yield
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/migrate/20230818141056_create_global_follow_recommendations.rb b/db/migrate/20230818141056_create_global_follow_recommendations.rb
index b88c71b9d7ab0d..1a3f23d228f76c 100644
--- a/db/migrate/20230818141056_create_global_follow_recommendations.rb
+++ b/db/migrate/20230818141056_create_global_follow_recommendations.rb
@@ -2,7 +2,7 @@
 
 class CreateGlobalFollowRecommendations < ActiveRecord::Migration[7.0]
   def change
-    create_view :global_follow_recommendations, materialized: { no_data: true }
+    create_view :global_follow_recommendations, materialized: true
     safety_assured { add_index :global_follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/post_migrate/20230818142253_drop_follow_recommendations.rb b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
index 95913d6caa792f..e0a24753cad563 100644
--- a/db/post_migrate/20230818142253_drop_follow_recommendations.rb
+++ b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
@@ -6,7 +6,7 @@ def up
   end
 
   def down
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end

From 022d2a3793bf45631be938e9e803f81b5ff2b4b5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 31 Jan 2024 07:52:51 -0500
Subject: [PATCH 37/43] Make factory gems available in test+development envs
 (#28969)

---
 Gemfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4951304e39e244..906441ec67cb42 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,12 +125,6 @@ group :test do
   # Used to mock environment variables
   gem 'climate_control'
 
-  # Generating fake data for specs
-  gem 'faker', '~> 3.2'
-
-  # Generate test objects for specs
-  gem 'fabrication', '~> 2.30'
-
   # Add back helpers functions removed in Rails 5.1
   gem 'rails-controller-testing', '~> 1.0'
 
@@ -182,6 +176,12 @@ group :development, :test do
   # Interactive Debugging tools
   gem 'debug', '~> 1.8'
 
+  # Generate fake data values
+  gem 'faker', '~> 3.2'
+
+  # Generate factory objects
+  gem 'fabrication', '~> 2.30'
+
   # Profiling tools
   gem 'memory_profiler', require: false
   gem 'ruby-prof', require: false

From 738dba0cf7380c0392d2588deeddbdaa197a6331 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:55:15 +0100
Subject: [PATCH 38/43] Update dependency capybara to v3.40.0 (#28966)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3891139dcedb05..01f5b4592947dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,11 +167,11 @@ GEM
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)

From dd934ebb07b1dc087fb782c025935de8e1107367 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 31 Jan 2024 11:55:50 -0500
Subject: [PATCH 39/43] Update `actions/cache` to v4 (updates node 16->20)
 (#29025)

---
 .github/actions/setup-javascript/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-javascript/action.yml b/.github/actions/setup-javascript/action.yml
index 07fd4d08d37455..808adc7de64f96 100644
--- a/.github/actions/setup-javascript/action.yml
+++ b/.github/actions/setup-javascript/action.yml
@@ -23,7 +23,7 @@ runs:
       shell: bash
       run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

From e3fa1728a93af606b9621f18cd5a9655fc5bceb9 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 1 Feb 2024 12:15:55 +0900
Subject: [PATCH 40/43] Fix test

---
 .github/workflows/test-ruby.yml               | 2 +-
 app/javascript/mastodon/features/ui/index.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index fcb637d4b00a7a..e17a4c1add1a73 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -226,7 +226,7 @@ jobs:
         if: failure()
         with:
           name: e2e-screenshots
-          path: tmp/screenshots/
+          path: tmp/capybara/
 
   test-search:
     name: Elastic Search integration testing
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index fb2d4fecd88d54..237b334dc88922 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -468,7 +468,7 @@ class UI extends PureComponent {
   handleHotkeyNew = e => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+    const element = this.node.querySelector('.compose-form__scrollable textarea');
 
     if (element) {
       element.focus();

From c6cd09770532fc0501c03d8078cd1463beef0ce0 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 1 Feb 2024 12:31:31 +0900
Subject: [PATCH 41/43] Fix test

---
 spec/support/capybara.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index d4f27e209e11a6..3b9fccd22ac59d 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -13,7 +13,7 @@
 Capybara.register_driver :headless_chrome do |app|
   options = Selenium::WebDriver::Chrome::Options.new
   options.add_argument '--headless=new'
-  options.add_argument '--window-size=1680,1050'
+  options.add_argument '--window-size=1920,1050'
 
   Capybara::Selenium::Driver.new(
     app,

From 449336a7f6d7fcce06d0a1dc2fc2c786e6a90004 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 1 Feb 2024 13:03:18 +0900
Subject: [PATCH 42/43] Fix test

---
 spec/support/capybara.rb                | 2 +-
 spec/support/stories/profile_stories.rb | 5 +++--
 spec/system/new_statuses_spec.rb        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 3b9fccd22ac59d..d4f27e209e11a6 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -13,7 +13,7 @@
 Capybara.register_driver :headless_chrome do |app|
   options = Selenium::WebDriver::Chrome::Options.new
   options.add_argument '--headless=new'
-  options.add_argument '--window-size=1920,1050'
+  options.add_argument '--window-size=1680,1050'
 
   Capybara::Selenium::Driver.new(
     app,
diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 74342c337d6688..8c5a3c91f0e05b 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -7,7 +7,8 @@ def as_a_registered_user
     @bob = Fabricate(
       :user,
       email: email, password: password, confirmed_at: confirmed_at,
-      account: Fabricate(:account, username: 'bob')
+      account: Fabricate(:account, username: 'bob'),
+      locale: 'en'
     )
 
     Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 2018_12_16_044202 }) if finished_onboarding
@@ -18,7 +19,7 @@ def as_a_logged_in_user
     visit new_user_session_path
     fill_in 'user_email', with: email
     fill_in 'user_password', with: password
-    click_on I18n.t('auth.login')
+    click_on 'ログイン' # I18n.t('auth.login')
   end
 
   def with_alice_as_local_user
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 5a3f1b406bef29..68b7993859615a 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -15,6 +15,7 @@
   before do
     as_a_logged_in_user
     visit root_path
+    page.driver.browser.manage.window.resize_to(1600, 1050)
   end
 
   it 'can be posted' do

From 6dd728bb1094b18d1b57ead8c85ef7299f70e646 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 1 Feb 2024 13:11:22 +0900
Subject: [PATCH 43/43] Fix test

---
 spec/support/stories/profile_stories.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 8c5a3c91f0e05b..f180236a2ed302 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -19,7 +19,7 @@ def as_a_logged_in_user
     visit new_user_session_path
     fill_in 'user_email', with: email
     fill_in 'user_password', with: password
-    click_on 'ログイン' # I18n.t('auth.login')
+    click_on I18n.t('auth.login')
   end
 
   def with_alice_as_local_user