about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-12 20:54:13 +0100
committerGitHub <noreply@github.com>2022-03-12 20:54:13 +0100
commit988f5bf0266483659b03f1b0926d0b9ff9e85a8f (patch)
tree1e0a0011a890729f45c0d364641c266864e78d02
parent2c8bb1745359a3bf200d37383dc56d5951e2b6bc (diff)
parent8d4b5ee3ef5e8df3a92e19f2c3f3a4560341eef3 (diff)
Merge pull request #1716 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
-rw-r--r--.rubocop.yml3
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--app/controllers/api/v1/emails/confirmations_controller.rb4
-rw-r--r--app/helpers/jsonld_helper.rb10
-rw-r--r--app/javascript/flavours/glitch/styles/mastodon-light/diff.scss14
-rw-r--r--app/javascript/mastodon/locales/af.json2
-rw-r--r--app/javascript/mastodon/locales/ar.json60
-rw-r--r--app/javascript/mastodon/locales/ast.json70
-rw-r--r--app/javascript/mastodon/locales/bg.json2
-rw-r--r--app/javascript/mastodon/locales/bn.json2
-rw-r--r--app/javascript/mastodon/locales/br.json2
-rw-r--r--app/javascript/mastodon/locales/ca.json6
-rw-r--r--app/javascript/mastodon/locales/co.json2
-rw-r--r--app/javascript/mastodon/locales/cs.json2
-rw-r--r--app/javascript/mastodon/locales/cy.json2
-rw-r--r--app/javascript/mastodon/locales/da.json300
-rw-r--r--app/javascript/mastodon/locales/de.json6
-rw-r--r--app/javascript/mastodon/locales/el.json6
-rw-r--r--app/javascript/mastodon/locales/eo.json70
-rw-r--r--app/javascript/mastodon/locales/es-AR.json86
-rw-r--r--app/javascript/mastodon/locales/es-MX.json116
-rw-r--r--app/javascript/mastodon/locales/es.json22
-rw-r--r--app/javascript/mastodon/locales/et.json2
-rw-r--r--app/javascript/mastodon/locales/eu.json2
-rw-r--r--app/javascript/mastodon/locales/fa.json2
-rw-r--r--app/javascript/mastodon/locales/fr.json6
-rw-r--r--app/javascript/mastodon/locales/gl.json80
-rw-r--r--app/javascript/mastodon/locales/he.json2
-rw-r--r--app/javascript/mastodon/locales/hi.json2
-rw-r--r--app/javascript/mastodon/locales/hr.json2
-rw-r--r--app/javascript/mastodon/locales/hu.json12
-rw-r--r--app/javascript/mastodon/locales/hy.json2
-rw-r--r--app/javascript/mastodon/locales/id.json86
-rw-r--r--app/javascript/mastodon/locales/io.json2
-rw-r--r--app/javascript/mastodon/locales/is.json6
-rw-r--r--app/javascript/mastodon/locales/it.json6
-rw-r--r--app/javascript/mastodon/locales/ja.json40
-rw-r--r--app/javascript/mastodon/locales/ka.json2
-rw-r--r--app/javascript/mastodon/locales/kab.json16
-rw-r--r--app/javascript/mastodon/locales/kk.json2
-rw-r--r--app/javascript/mastodon/locales/kmr.json6
-rw-r--r--app/javascript/mastodon/locales/kn.json2
-rw-r--r--app/javascript/mastodon/locales/ko.json90
-rw-r--r--app/javascript/mastodon/locales/ku.json2
-rw-r--r--app/javascript/mastodon/locales/kw.json2
-rw-r--r--app/javascript/mastodon/locales/lt.json2
-rw-r--r--app/javascript/mastodon/locales/lv.json6
-rw-r--r--app/javascript/mastodon/locales/mk.json2
-rw-r--r--app/javascript/mastodon/locales/ml.json2
-rw-r--r--app/javascript/mastodon/locales/mr.json2
-rw-r--r--app/javascript/mastodon/locales/ms.json2
-rw-r--r--app/javascript/mastodon/locales/nl.json2
-rw-r--r--app/javascript/mastodon/locales/nn.json2
-rw-r--r--app/javascript/mastodon/locales/no.json2
-rw-r--r--app/javascript/mastodon/locales/oc.json2
-rw-r--r--app/javascript/mastodon/locales/pa.json2
-rw-r--r--app/javascript/mastodon/locales/pl.json8
-rw-r--r--app/javascript/mastodon/locales/pt-BR.json48
-rw-r--r--app/javascript/mastodon/locales/pt-PT.json84
-rw-r--r--app/javascript/mastodon/locales/ro.json2
-rw-r--r--app/javascript/mastodon/locales/ru.json44
-rw-r--r--app/javascript/mastodon/locales/sa.json2
-rw-r--r--app/javascript/mastodon/locales/sc.json2
-rw-r--r--app/javascript/mastodon/locales/si.json6
-rw-r--r--app/javascript/mastodon/locales/sk.json66
-rw-r--r--app/javascript/mastodon/locales/sl.json82
-rw-r--r--app/javascript/mastodon/locales/sr-Latn.json2
-rw-r--r--app/javascript/mastodon/locales/sr.json2
-rw-r--r--app/javascript/mastodon/locales/sv.json30
-rw-r--r--app/javascript/mastodon/locales/szl.json2
-rw-r--r--app/javascript/mastodon/locales/ta.json2
-rw-r--r--app/javascript/mastodon/locales/tai.json2
-rw-r--r--app/javascript/mastodon/locales/te.json2
-rw-r--r--app/javascript/mastodon/locales/th.json4
-rw-r--r--app/javascript/mastodon/locales/tr.json8
-rw-r--r--app/javascript/mastodon/locales/tt.json2
-rw-r--r--app/javascript/mastodon/locales/ug.json2
-rw-r--r--app/javascript/mastodon/locales/uk.json2
-rw-r--r--app/javascript/mastodon/locales/ur.json2
-rw-r--r--app/javascript/mastodon/locales/vi.json86
-rw-r--r--app/javascript/mastodon/locales/zgh.json2
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json4
-rw-r--r--app/javascript/mastodon/locales/zh-HK.json2
-rw-r--r--app/javascript/mastodon/locales/zh-TW.json12
-rw-r--r--app/javascript/styles/mastodon-light/diff.scss14
-rw-r--r--app/lib/activitypub/activity.rb10
-rw-r--r--app/lib/activitypub/activity/update.rb2
-rw-r--r--app/models/admin/status_batch_action.rb4
-rw-r--r--app/models/concerns/account_merging.rb7
-rw-r--r--app/models/instance.rb2
-rw-r--r--app/services/activitypub/fetch_remote_status_service.rb30
-rw-r--r--app/services/activitypub/process_status_update_service.rb23
-rw-r--r--config/initializers/rack_attack.rb4
-rw-r--r--config/locales/activerecord.fr.yml2
-rw-r--r--config/locales/activerecord.nn.yml1
-rw-r--r--config/locales/ar.yml83
-rw-r--r--config/locales/ast.yml49
-rw-r--r--config/locales/bg.yml1
-rw-r--r--config/locales/bn.yml1
-rw-r--r--config/locales/br.yml6
-rw-r--r--config/locales/ca.yml84
-rw-r--r--config/locales/co.yml19
-rw-r--r--config/locales/cs.yml21
-rw-r--r--config/locales/cy.yml12
-rw-r--r--config/locales/da.yml298
-rw-r--r--config/locales/de.yml86
-rw-r--r--config/locales/devise.ast.yml3
-rw-r--r--config/locales/devise.eo.yml10
-rw-r--r--config/locales/doorkeeper.ar.yml21
-rw-r--r--config/locales/doorkeeper.ast.yml11
-rw-r--r--config/locales/doorkeeper.bg.yml6
-rw-r--r--config/locales/doorkeeper.br.yml5
-rw-r--r--config/locales/doorkeeper.ca.yml43
-rw-r--r--config/locales/doorkeeper.co.yml6
-rw-r--r--config/locales/doorkeeper.cs.yml6
-rw-r--r--config/locales/doorkeeper.cy.yml6
-rw-r--r--config/locales/doorkeeper.da.yml43
-rw-r--r--config/locales/doorkeeper.de.yml43
-rw-r--r--config/locales/doorkeeper.el.yml33
-rw-r--r--config/locales/doorkeeper.eo.yml6
-rw-r--r--config/locales/doorkeeper.es-AR.yml43
-rw-r--r--config/locales/doorkeeper.es-MX.yml43
-rw-r--r--config/locales/doorkeeper.es.yml43
-rw-r--r--config/locales/doorkeeper.et.yml5
-rw-r--r--config/locales/doorkeeper.eu.yml6
-rw-r--r--config/locales/doorkeeper.fa.yml6
-rw-r--r--config/locales/doorkeeper.fi.yml33
-rw-r--r--config/locales/doorkeeper.fr.yml45
-rw-r--r--config/locales/doorkeeper.gd.yml6
-rw-r--r--config/locales/doorkeeper.gl.yml43
-rw-r--r--config/locales/doorkeeper.he.yml5
-rw-r--r--config/locales/doorkeeper.hr.yml4
-rw-r--r--config/locales/doorkeeper.hu.yml43
-rw-r--r--config/locales/doorkeeper.hy.yml6
-rw-r--r--config/locales/doorkeeper.id.yml6
-rw-r--r--config/locales/doorkeeper.is.yml43
-rw-r--r--config/locales/doorkeeper.it.yml43
-rw-r--r--config/locales/doorkeeper.ja.yml30
-rw-r--r--config/locales/doorkeeper.ka.yml5
-rw-r--r--config/locales/doorkeeper.kab.yml5
-rw-r--r--config/locales/doorkeeper.kk.yml5
-rw-r--r--config/locales/doorkeeper.kmr.yml43
-rw-r--r--config/locales/doorkeeper.ko.yml51
-rw-r--r--config/locales/doorkeeper.ku.yml5
-rw-r--r--config/locales/doorkeeper.lv.yml43
-rw-r--r--config/locales/doorkeeper.ml.yml3
-rw-r--r--config/locales/doorkeeper.nl.yml6
-rw-r--r--config/locales/doorkeeper.nn.yml6
-rw-r--r--config/locales/doorkeeper.no.yml6
-rw-r--r--config/locales/doorkeeper.oc.yml6
-rw-r--r--config/locales/doorkeeper.pl.yml6
-rw-r--r--config/locales/doorkeeper.pt-BR.yml6
-rw-r--r--config/locales/doorkeeper.pt-PT.yml43
-rw-r--r--config/locales/doorkeeper.ro.yml6
-rw-r--r--config/locales/doorkeeper.ru.yml35
-rw-r--r--config/locales/doorkeeper.sc.yml6
-rw-r--r--config/locales/doorkeeper.si.yml5
-rw-r--r--config/locales/doorkeeper.sk.yml9
-rw-r--r--config/locales/doorkeeper.sl.yml37
-rw-r--r--config/locales/doorkeeper.sq.yml43
-rw-r--r--config/locales/doorkeeper.sr-Latn.yml6
-rw-r--r--config/locales/doorkeeper.sr.yml6
-rw-r--r--config/locales/doorkeeper.sv.yml32
-rw-r--r--config/locales/doorkeeper.ta.yml1
-rw-r--r--config/locales/doorkeeper.th.yml43
-rw-r--r--config/locales/doorkeeper.tr.yml43
-rw-r--r--config/locales/doorkeeper.tt.yml3
-rw-r--r--config/locales/doorkeeper.uk.yml6
-rw-r--r--config/locales/doorkeeper.vi.yml43
-rw-r--r--config/locales/doorkeeper.zgh.yml5
-rw-r--r--config/locales/doorkeeper.zh-CN.yml43
-rw-r--r--config/locales/doorkeeper.zh-HK.yml6
-rw-r--r--config/locales/doorkeeper.zh-TW.yml43
-rw-r--r--config/locales/el.yml25
-rw-r--r--config/locales/eo.yml23
-rw-r--r--config/locales/es-AR.yml54
-rw-r--r--config/locales/es-MX.yml140
-rw-r--r--config/locales/es.yml86
-rw-r--r--config/locales/et.yml12
-rw-r--r--config/locales/eu.yml23
-rw-r--r--config/locales/fa.yml20
-rw-r--r--config/locales/fi.yml54
-rw-r--r--config/locales/fr.yml106
-rw-r--r--config/locales/gd.yml117
-rw-r--r--config/locales/gl.yml90
-rw-r--r--config/locales/he.yml13
-rw-r--r--config/locales/hr.yml1
-rw-r--r--config/locales/hu.yml102
-rw-r--r--config/locales/hy.yml11
-rw-r--r--config/locales/id.yml57
-rw-r--r--config/locales/io.yml4
-rw-r--r--config/locales/is.yml86
-rw-r--r--config/locales/it.yml84
-rw-r--r--config/locales/ja.yml29
-rw-r--r--config/locales/ka.yml6
-rw-r--r--config/locales/kab.yml12
-rw-r--r--config/locales/kk.yml12
-rw-r--r--config/locales/kmr.yml56
-rw-r--r--config/locales/ko.yml133
-rw-r--r--config/locales/ku.yml12
-rw-r--r--config/locales/lt.yml11
-rw-r--r--config/locales/lv.yml87
-rw-r--r--config/locales/ms.yml17
-rw-r--r--config/locales/nl.yml18
-rw-r--r--config/locales/nn.yml14
-rw-r--r--config/locales/no.yml14
-rw-r--r--config/locales/oc.yml13
-rw-r--r--config/locales/pl.yml40
-rw-r--r--config/locales/pt-BR.yml36
-rw-r--r--config/locales/pt-PT.yml84
-rw-r--r--config/locales/ro.yml1
-rw-r--r--config/locales/ru.yml90
-rw-r--r--config/locales/sc.yml13
-rw-r--r--config/locales/si.yml9
-rw-r--r--config/locales/simple_form.ar.yml7
-rw-r--r--config/locales/simple_form.ast.yml2
-rw-r--r--config/locales/simple_form.ca.yml3
-rw-r--r--config/locales/simple_form.co.yml1
-rw-r--r--config/locales/simple_form.cs.yml2
-rw-r--r--config/locales/simple_form.cy.yml1
-rw-r--r--config/locales/simple_form.da.yml3
-rw-r--r--config/locales/simple_form.de.yml3
-rw-r--r--config/locales/simple_form.el.yml1
-rw-r--r--config/locales/simple_form.eo.yml6
-rw-r--r--config/locales/simple_form.es-AR.yml3
-rw-r--r--config/locales/simple_form.es-MX.yml12
-rw-r--r--config/locales/simple_form.es.yml3
-rw-r--r--config/locales/simple_form.et.yml1
-rw-r--r--config/locales/simple_form.eu.yml2
-rw-r--r--config/locales/simple_form.fa.yml2
-rw-r--r--config/locales/simple_form.fi.yml2
-rw-r--r--config/locales/simple_form.fr.yml5
-rw-r--r--config/locales/simple_form.gd.yml2
-rw-r--r--config/locales/simple_form.gl.yml5
-rw-r--r--config/locales/simple_form.hu.yml3
-rw-r--r--config/locales/simple_form.hy.yml1
-rw-r--r--config/locales/simple_form.id.yml2
-rw-r--r--config/locales/simple_form.is.yml3
-rw-r--r--config/locales/simple_form.it.yml3
-rw-r--r--config/locales/simple_form.ja.yml2
-rw-r--r--config/locales/simple_form.kab.yml1
-rw-r--r--config/locales/simple_form.kmr.yml3
-rw-r--r--config/locales/simple_form.ko.yml4
-rw-r--r--config/locales/simple_form.ku.yml1
-rw-r--r--config/locales/simple_form.lv.yml3
-rw-r--r--config/locales/simple_form.nl.yml1
-rw-r--r--config/locales/simple_form.nn.yml1
-rw-r--r--config/locales/simple_form.no.yml1
-rw-r--r--config/locales/simple_form.oc.yml1
-rw-r--r--config/locales/simple_form.pl.yml2
-rw-r--r--config/locales/simple_form.pt-BR.yml2
-rw-r--r--config/locales/simple_form.pt-PT.yml3
-rw-r--r--config/locales/simple_form.ro.yml1
-rw-r--r--config/locales/simple_form.ru.yml6
-rw-r--r--config/locales/simple_form.sc.yml1
-rw-r--r--config/locales/simple_form.sk.yml1
-rw-r--r--config/locales/simple_form.sq.yml4
-rw-r--r--config/locales/simple_form.sv.yml1
-rw-r--r--config/locales/simple_form.th.yml3
-rw-r--r--config/locales/simple_form.tr.yml3
-rw-r--r--config/locales/simple_form.uk.yml2
-rw-r--r--config/locales/simple_form.vi.yml3
-rw-r--r--config/locales/simple_form.zh-CN.yml2
-rw-r--r--config/locales/simple_form.zh-HK.yml2
-rw-r--r--config/locales/simple_form.zh-TW.yml3
-rw-r--r--config/locales/sk.yml14
-rw-r--r--config/locales/sl.yml43
-rw-r--r--config/locales/sq.yml98
-rw-r--r--config/locales/sr-Latn.yml6
-rw-r--r--config/locales/sr.yml11
-rw-r--r--config/locales/sv.yml19
-rw-r--r--config/locales/ta.yml1
-rw-r--r--config/locales/th.yml52
-rw-r--r--config/locales/tr.yml96
-rw-r--r--config/locales/tt.yml3
-rw-r--r--config/locales/uk.yml31
-rw-r--r--config/locales/vi.yml83
-rw-r--r--config/locales/zgh.yml1
-rw-r--r--config/locales/zh-CN.yml48
-rw-r--r--config/locales/zh-HK.yml18
-rw-r--r--config/locales/zh-TW.yml83
-rw-r--r--db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb2
-rw-r--r--db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb2
-rw-r--r--db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb17
-rw-r--r--db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb17
-rw-r--r--db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb17
-rw-r--r--db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb17
-rw-r--r--db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb17
-rw-r--r--db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb17
-rw-r--r--db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb17
-rw-r--r--db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb17
-rw-r--r--db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb17
-rw-r--r--db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb17
-rw-r--r--db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb17
-rw-r--r--db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb17
-rw-r--r--db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb17
-rw-r--r--db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb17
-rw-r--r--db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb17
-rw-r--r--db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb17
-rw-r--r--db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb17
-rw-r--r--db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb17
-rw-r--r--db/schema.rb38
-rw-r--r--lib/mastodon/maintenance_cli.rb41
-rw-r--r--lib/mastodon/migration_helpers.rb28
-rw-r--r--lib/tasks/db.rake15
-rw-r--r--spec/controllers/api/v1/emails/confirmations_controller_spec.rb64
-rw-r--r--spec/rails_helper.rb4
-rw-r--r--spec/services/activitypub/fetch_remote_status_service_spec.rb48
-rw-r--r--spec/services/activitypub/process_status_update_service_spec.rb20
310 files changed, 4166 insertions, 2778 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 68634e9e3..4948aea5a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -29,6 +29,9 @@ Layout/EmptyLineAfterMagicComment:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 
diff --git a/Gemfile b/Gemfile
index a80f2b73f..234aa464e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem 'parslet'
 gem 'posix-spawn'
 gem 'pundit', '~> 2.2'
 gem 'premailer-rails'
-gem 'rack-attack', '~> 6.5'
+gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 1.1', require: 'rack/cors'
 gem 'rails-i18n', '~> 6.0'
 gem 'rails-settings-cached', '~> 0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7201a0c0e..a88e56f36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -468,7 +468,7 @@ GEM
     raabro (1.4.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-attack (6.5.0)
+    rack-attack (6.6.0)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -804,7 +804,7 @@ DEPENDENCIES
   puma (~> 5.6)
   pundit (~> 2.2)
   rack (~> 2.2.3)
-  rack-attack (~> 6.5)
+  rack-attack (~> 6.6)
   rack-cors (~> 1.1)
   rails (~> 6.1.4)
   rails-controller-testing (~> 1.0)
diff --git a/app/controllers/api/v1/emails/confirmations_controller.rb b/app/controllers/api/v1/emails/confirmations_controller.rb
index f1d9954d0..3faaea2fb 100644
--- a/app/controllers/api/v1/emails/confirmations_controller.rb
+++ b/app/controllers/api/v1/emails/confirmations_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Emails::ConfirmationsController < Api::BaseController
-  before_action :doorkeeper_authorize!
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
   before_action :require_user_owned_by_application!
   before_action :require_user_not_confirmed!
 
@@ -19,6 +19,6 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController
   end
 
   def require_user_not_confirmed!
-    render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden if current_user.confirmed? || current_user.unconfirmed_email.blank?
+    render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden unless !current_user.confirmed? || current_user.unconfirmed_email.present?
   end
 end
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index c6557817d..102e4b132 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -15,6 +15,14 @@ module JsonLdHelper
     value.is_a?(Array) ? value.first : value
   end
 
+  def uri_from_bearcap(str)
+    if str&.start_with?('bear:')
+      Addressable::URI.parse(str).query_values['u']
+    else
+      str
+    end
+  end
+
   # The url attribute can be a string, an array of strings, or an array of objects.
   # The objects could include a mimeType. Not-included mimeType means it's text/html.
   def url_to_href(value, preferred_type = nil)
@@ -54,7 +62,7 @@ module JsonLdHelper
   end
 
   def unsupported_uri_scheme?(uri)
-    !uri.start_with?('http://', 'https://')
+    uri.nil? || !uri.start_with?('http://', 'https://')
   end
 
   def invalid_origin?(url)
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 87b83b563..020d39aff 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -116,7 +116,8 @@
 }
 
 .dropdown-menu__item {
-  a {
+  a,
+  button {
     background: $ui-base-color;
     color: $ui-secondary-color;
   }
@@ -172,7 +173,15 @@
   }
 }
 
-.dropdown-menu__separator {
+.dropdown-menu__separator,
+.dropdown-menu__item.edited-timestamp__history__item,
+.dropdown-menu__container__header,
+.compare-history-modal .report-modal__target,
+.report-dialog-modal .poll__option.dialog-option {
+  border-bottom-color: lighten($ui-base-color, 12%);
+}
+
+.report-dialog-modal__container {
   border-bottom-color: lighten($ui-base-color, 12%);
 }
 
@@ -233,6 +242,7 @@
 .embed-modal,
 .error-modal,
 .onboarding-modal,
+.compare-history-modal,
 .report-modal__comment .setting-text__wrapper,
 .report-modal__comment .setting-text,
 .report-dialog-modal__textarea {
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d31ed3fe9..3b450f89a 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 5fd1ab9e5..017bfe61c 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "حاول تعطيلهم وإنعاش الصفحة. إن لم ينجح ذلك، يمكنك دائمًا استخدام ماستدون عبر متصفح آخر أو تطبيق أصلي.",
   "errors.unexpected_crash.copy_stacktrace": "انسخ تتبع الارتباطات إلى الحافظة",
   "errors.unexpected_crash.report_issue": "الإبلاغ عن خلل",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "نتائج البحث",
+  "explore.suggested_follows": "لك",
+  "explore.title": "استكشف",
+  "explore.trending_links": "الأخبار",
+  "explore.trending_statuses": "المنشورات",
+  "explore.trending_tags": "الوسوم",
   "follow_recommendations.done": "تم",
   "follow_recommendations.heading": "تابع الأشخاص الذين ترغب في رؤية منشوراتهم! إليك بعض الاقتراحات.",
   "follow_recommendations.lead": "ستظهر منشورات الأشخاص الذين تُتابعتهم بترتيب تسلسلي زمني على صفحتك الرئيسية. لا تخف إذا ارتكبت أي أخطاء، تستطيع إلغاء متابعة أي شخص في أي وقت تريد!",
@@ -320,7 +320,7 @@
   "notification.update": "{name} edited a post",
   "notifications.clear": "امسح الإخطارات",
   "notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المُفَضَّلة:",
   "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
@@ -337,7 +337,7 @@
   "notifications.column_settings.status": "منشورات جديدة:",
   "notifications.column_settings.unread_notifications.category": "إشعارات غير مقروءة",
   "notifications.column_settings.unread_notifications.highlight": "علّم الإشعارات غير المقرؤة",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "التعديلات:",
   "notifications.filter.all": "الكل",
   "notifications.filter.boosts": "الترقيات",
   "notifications.filter.favourites": "المفضلة",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}ثا",
   "relative_time.today": "اليوم",
   "reply_indicator.cancel": "إلغاء",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "حظر",
+  "report.block_explanation": "لن ترى مشاركاتهم ولن يمكنهم متابعتك أو رؤية مشاركاتك، سيكون بديهيا لهم أنهم مكتمون.",
   "report.categories.other": "أخرى",
   "report.categories.spam": "مزعج",
   "report.categories.violation": "المحتوى ينتهك شرطا أو عدة شروط استخدام للخادم",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.title_account": "ملف تعريفي",
+  "report.category.title_status": "منشور",
+  "report.close": "تم",
+  "report.comment.title": "هل لديك شيء آخر لتخبرنا به؟",
   "report.forward": "التحويل إلى {target}",
   "report.forward_hint": "هذا الحساب ينتمي إلى خادوم آخَر. هل تودّ إرسال نسخة مجهولة مِن التقرير إلى هنالك أيضًا؟",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "كتم",
+  "report.mute_explanation": "لن ترى مشاركاتهم. لكن سيبقى بإمكانهم متابعتك ورؤية مشاركاتك دون أن يعرفوا أنهم مكتمون.",
+  "report.next": "التالي",
   "report.placeholder": "تعليقات إضافية",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.dislike": "لايعجبني",
+  "report.reasons.dislike_description": "ألا ترغب برؤيته",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "ينتهك قواعد الخادم",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
+  "report.rules.title": "ما هي القواعد المنتهكة؟",
   "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.statuses.title": "هل توجد مشاركات تدعم صحة هذا البلاغ؟",
   "report.submit": "إرسال",
   "report.target": "ابلغ عن {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action_actionable": "في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد @{name}:",
+  "report.thanks.title": "هل ترغب في مشاهدة هذا؟",
+  "report.thanks.title_actionable": "شُكرًا لَكَ على الإبلاغ، سَوفَ نَنظُرُ فِي هَذَا الأمر.",
+  "report.unfollow": "إلغاء متابعة @{name}",
+  "report.unfollow_explanation": "أنت تتابع هذا الحساب، لإزالة مَنشوراته من تغذيَتِكَ الرئيسة ألغ متابعته.",
   "search.placeholder": "ابحث",
   "search_popout.search_format": "نمط البحث المتقدم",
   "search_popout.tips.full_text": "النص البسيط يقوم بعرض المنشورات التي كتبتها أو قمت بإرسالها أو ترقيتها أو تمت الإشارة إليك فيها من طرف آخرين ، بالإضافة إلى مطابقة أسماء المستخدمين وأسماء العرض وعلامات التصنيف.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "جملة قصيرة تُمكّنُك من عرض أسماء و حسابات و كلمات رمزية",
   "search_popout.tips.user": "مستخدِم",
   "search_results.accounts": "أشخاص",
-  "search_results.all": "All",
+  "search_results.all": "الكل",
   "search_results.hashtags": "الوُسوم",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "تعذر العثور على نتائج تتضمن هذه المصطلحات",
   "search_results.statuses": "المنشورات",
   "search_results.statuses_fts_disabled": "البحث عن المنشورات عن طريق المحتوى ليس مفعل في خادم ماستدون هذا.",
   "search_results.total": "{count, number} {count, plural, zero {} one {نتيجة} two {نتيجتين} few {نتائج} many {نتائج} other {نتائج}}",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 4ca5f0123..c573a86ef 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -38,7 +38,7 @@
   "account.requested": "Esperando pola aprobación. Calca pa encaboxar la solicitú de siguimientu",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Amosar les comparticiones de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} artículu} other {{counter} artículos}}",
   "account.unblock": "Desbloquiar a @{name}",
   "account.unblock_domain": "Amosar {domain}",
   "account.unblock_short": "Unblock",
@@ -156,14 +156,14 @@
   "emoji_button.objects": "Oxetos",
   "emoji_button.people": "Persones",
   "emoji_button.recent": "Úsase davezu",
-  "emoji_button.search": "Guetar…",
+  "emoji_button.search": "Buscar…",
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viaxes y llugares",
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "¡Equí nun hai barritos!",
   "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "Entá nun bloquiesti a nunengún usuariu.",
+  "empty_column.blocks": "Entá nun bloquiesti a nengún usuariu.",
   "empty_column.bookmarked_statuses": "Entá nun tienes nengún barritu en Marcadores. Cuando amiestes unu, va amosase equí.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "Entá nun tienes nuengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí.",
@@ -182,17 +182,17 @@
   "empty_column.notifications": "Entá nun tienes nunengún avisu. Interactúa con otros p'aniciar la conversación.",
   "empty_column.public": "¡Equí nun hai nada! Escribi daqué público o sigui a usuarios d'otros sirvidores pa rellenar esto",
   "error.unexpected_crash.explanation": "Pola mor d'un fallu nel códigu o un problema de compatibilidá del restolador, esta páxina nun se pudo amosar correutamente.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.explanation_addons": "Esta páxina nun se pudo amosar correutamente. Ye probable que dalgún complementu del restolador o dalguna ferramienta de traducción automática produxere esti fallu.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
+  "explore.suggested_follows": "Pa ti",
   "explore.title": "Explore",
-  "explore.trending_links": "News",
+  "explore.trending_links": "Noticies",
   "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_tags": "Etiquetes",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
@@ -218,7 +218,7 @@
   "hashtag.column_settings.tag_mode.none": "Nenguna d'estes",
   "hashtag.column_settings.tag_toggle": "Incluyir les etiquetes adicionales d'esta columna",
   "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Amosar toots compartíos",
+  "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Amosar rempuestes",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
@@ -226,38 +226,38 @@
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
   "keyboard_shortcuts.back": "pa dir p'atrás",
-  "keyboard_shortcuts.blocked": "p'abrir la llista d'usuarios bloquiaos",
+  "keyboard_shortcuts.blocked": "Abrir la llista d'usuarios bloquiaos",
   "keyboard_shortcuts.boost": "pa compartir un toot",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "pa enfocar l'área de composición",
+  "keyboard_shortcuts.compose": "Enfocar l'área de composición",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "p'abrir la columna de los mensaxes direutos",
+  "keyboard_shortcuts.direct": "Abrir la columna de los mensaxes direutos",
   "keyboard_shortcuts.down": "pa baxar na llista",
   "keyboard_shortcuts.enter": "p'abrir estaos",
   "keyboard_shortcuts.favourite": "p'amestar a Favoritos",
-  "keyboard_shortcuts.favourites": "p'abrir la llista de favoritos",
-  "keyboard_shortcuts.federated": "p'abrir la llinia temporal federada",
+  "keyboard_shortcuts.favourites": "Abrir la llista de favoritos",
+  "keyboard_shortcuts.federated": "Abrir la llinia temporal federada",
   "keyboard_shortcuts.heading": "Atayos del tecláu",
   "keyboard_shortcuts.home": "p'abrir la llinia temporal d'aniciu",
   "keyboard_shortcuts.hotkey": "Atayu",
   "keyboard_shortcuts.legend": "p'amosar esta lleenda",
   "keyboard_shortcuts.local": "p'abrir la llinia temporal llocal",
   "keyboard_shortcuts.mention": "pa mentar al autor",
-  "keyboard_shortcuts.muted": "p'abrir la llista d'usuarios silenciaos",
+  "keyboard_shortcuts.muted": "Abrir la llista d'usuarios colos avisos desactivaos",
   "keyboard_shortcuts.my_profile": "p'abrir el to perfil",
-  "keyboard_shortcuts.notifications": "p'abrir la columna d'avisos",
+  "keyboard_shortcuts.notifications": "Abrir la columna d'avisos",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "p'abrir la llista de barritos fixaos",
-  "keyboard_shortcuts.profile": "p'abrir el perfil del autor",
+  "keyboard_shortcuts.pinned": "Abrir la llista d'artículos fixaos",
+  "keyboard_shortcuts.profile": "Abrir el perfil del autor/a",
   "keyboard_shortcuts.reply": "pa responder",
-  "keyboard_shortcuts.requests": "p'abrir la llista de solicitúes de siguimientu",
-  "keyboard_shortcuts.search": "pa enfocar la gueta",
+  "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
+  "keyboard_shortcuts.search": "Enfocar la barra de busca",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "p'abrir la columna «entamar»",
+  "keyboard_shortcuts.start": "Abrir la columna «Entamar»",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
   "keyboard_shortcuts.toot": "p'apenzar un barritu nuevu",
-  "keyboard_shortcuts.unfocus": "pa desenfocar l'área de composición/gueta",
+  "keyboard_shortcuts.unfocus": "Desenfocar l'área de composición/busca",
   "keyboard_shortcuts.up": "pa xubir na llista",
   "lightbox.close": "Close",
   "lightbox.compress": "Compress image view box",
@@ -275,14 +275,14 @@
   "lists.replies_policy.list": "Members of the list",
   "lists.replies_policy.none": "No one",
   "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Guetar ente la xente que sigues",
+  "lists.search": "Buscar ente la xente que sigues",
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Alternar la visibilidá",
-  "missing_indicator.label": "Nun s'alcontró",
-  "missing_indicator.sublabel": "Esti recursu nun pudo alcontrase",
-  "mute_modal.duration": "Duration",
+  "missing_indicator.label": "Nun s'atopó",
+  "missing_indicator.sublabel": "Nun se pudo atopar esti recursu",
+  "mute_modal.duration": "Duración",
   "mute_modal.hide_notifications": "¿Anubrir los avisos d'esti usuariu?",
   "mute_modal.indefinite": "Indefinite",
   "navigation_bar.apps": "Aplicaciones pa móviles",
@@ -316,8 +316,8 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "Finó una encuesta na que votesti",
   "notification.reblog": "{name} compartió'l to estáu",
-  "notification.status": "{name} just posted",
-  "notification.update": "{name} edited a post",
+  "notification.status": "{name} ta acabante d'espublizar",
+  "notification.update": "{name} editó l'artículu",
   "notifications.clear": "Llimpiar avisos",
   "notifications.clear_confirmation": "¿De xuru que quies llimpiar dafechu tolos avisos?",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
@@ -350,7 +350,7 @@
   "notifications.mark_as_read": "Mark every notification as read",
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
   "notifications_permission_banner.enable": "Activar los avisos d'escritoriu",
   "notifications_permission_banner.how_to_control": "Pa recibir avisos cuando Mastodon nun tea abiertu, activa los avisos del escritoriu. Pues controlar al milímetru qué tipu d'interaiciones xeneren avisos namás que s'activen, pente'l botón {icon} d'arriba.",
   "notifications_permission_banner.title": "Never miss a thing",
@@ -369,7 +369,7 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Namái siguidores",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all, shown in public timelines",
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Nun apaez nes llinies temporales públiques",
   "privacy.unlisted.short": "Nun llistar",
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
@@ -425,7 +425,7 @@
   "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
   "report.unfollow": "Unfollow @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
-  "search.placeholder": "Guetar",
+  "search.placeholder": "Buscar",
   "search_popout.search_format": "Formatu de gueta avanzada",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
@@ -435,7 +435,7 @@
   "search_results.accounts": "Xente",
   "search_results.all": "All",
   "search_results.hashtags": "Etiquetes",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Nun se pudo atopar nada con esos términos de busca",
   "search_results.statuses": "Barritos",
   "search_results.statuses_fts_disabled": "Esti sirvidor de Mastodon tien activada la gueta de barritos pol so conteníu.",
   "search_results.total": "{count, number} {count, plural, one {resultáu} other {resultaos}}",
@@ -444,7 +444,7 @@
   "status.block": "Bloquiar a @{name}",
   "status.bookmark": "Amestar a Marcadores",
   "status.cancel_reblog_private": "Dexar de compartir",
-  "status.cannot_reblog": "Esti artículu nun pue compartise",
+  "status.cannot_reblog": "Esti artículu nun se pue compartir",
   "status.copy": "Copiar l'enllaz al estáu",
   "status.delete": "Desaniciar",
   "status.detailed_status": "Detailed conversation view",
@@ -494,10 +494,10 @@
   "tabs_bar.notifications": "Avisos",
   "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {Queda # día} other {Queden # díes}}",
-  "time_remaining.hours": "{number, plural, one {# hora restante} other {# hores restantes}}",
+  "time_remaining.hours": "{number, plural, one {Queda # hora} other {Queden # hores}}",
   "time_remaining.minutes": "{number, plural, one {Queda # minutu} other {Queden # minutos}}",
   "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# segundu restante} other {# segundos restantes}}",
+  "time_remaining.seconds": "{number, plural, one {Queda # segundu} other {Queden # segundos}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 2e7038aa9..1024c4659 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 38d70853e..8aae9aa49 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index a07b21c78..5ef2eb8d8 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 0182170fd..356fbe989 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -18,7 +18,7 @@
   "account.followers": "Seguidors",
   "account.followers.empty": "Encara ningú no segueix aquest usuari.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
-  "account.following": "Following",
+  "account.following": "Seguint",
   "account.following_counter": "{count, plural, other {{counter} Seguint}}",
   "account.follows.empty": "Aquest usuari encara no segueix a ningú.",
   "account.follows_you": "Et segueix",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
   "account.unblock": "Desbloqueja @{name}",
   "account.unblock_domain": "Mostra {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Desbloqueja",
   "account.unendorse": "No recomanar en el perfil",
   "account.unfollow": "Deixa de seguir",
   "account.unmute": "Treure silenci de @{name}",
   "account.unmute_notifications": "Activar notificacions de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Deixa de silenciar",
   "account_note.placeholder": "Fes clic per afegir una nota",
   "admin.dashboard.daily_retention": "Ràtio de retenció per dia després del registre",
   "admin.dashboard.monthly_retention": "Ràtio de retenció per mes després del registre",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 4d75dbb08..e541d8c1c 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 97f4674ba..95cdcdc92 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 79ef2dfc6..9956640df 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 5861bac50..c8d6b78bc 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -1,28 +1,28 @@
 {
-  "account.account_note_header": "Note",
+  "account.account_note_header": "Notat",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "Blokér @{name}",
   "account.block_domain": "Blokér domænet {domain}",
   "account.blocked": "Blokeret",
-  "account.browse_more_on_origin_server": "Se mere på den oprindelige profil",
+  "account.browse_more_on_origin_server": "Tjek mere ud på den oprindelige profil",
   "account.cancel_follow_request": "Annullér følgeanmodning",
   "account.direct": "Direkte besked til @{name}",
   "account.disable_notifications": "Advisér mig ikke længere, når @{name} poster",
   "account.domain_blocked": "Domæne blokeret",
   "account.edit_profile": "Redigér profil",
-  "account.enable_notifications": "Giv besked når @{name} udgiver nyt",
+  "account.enable_notifications": "Advisér mig, når @{name} poster",
   "account.endorse": "Fremhæv på profil",
   "account.follow": "Følg",
   "account.followers": "Følgere",
-  "account.followers.empty": "Ingen følger brugeren endnu.",
+  "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} Følger} other {{counter} Følgere}}",
-  "account.following": "Following",
+  "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} Følges} other {{counter} Følges}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.follows_you": "Følger dig",
-  "account.hide_reblogs": "Skjul fremhævelser fra @{name}",
+  "account.hide_reblogs": "Skjul boosts fra @{name}",
   "account.joined": "Tilmeldt {date}",
   "account.link_verified_on": "Ejerskab af dette link blev tjekket {date}",
   "account.locked_info": "Denne kontos fortrolighedsstatus er sat til låst. Ejeren bedømmer manuelt, hvem der kan følge vedkommende.",
@@ -39,42 +39,42 @@
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Indlæg} other {{counter} Indlæg}}",
-  "account.unblock": "Fjern blokeringen af @{name}",
+  "account.unblock": "Afblokér @{name}",
   "account.unblock_domain": "Afblokér domænet {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Afblokér",
   "account.unendorse": "Fjern visning på din profil",
   "account.unfollow": "Følg ikke længere",
-  "account.unmute": "Fjern tavsgjort for @{name}",
-  "account.unmute_notifications": "Slå notifikationer om @{name} til igen",
-  "account.unmute_short": "Unmute",
+  "account.unmute": "Fjern tavsgørelsen af @{name}",
+  "account.unmute_notifications": "Fjern tavsgørelsen af notifikationer fra @{name}",
+  "account.unmute_short": "Fjern tavsgørelse",
   "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate efter dag efter tilmelding",
-  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate efter måned efter tilmelding",
   "admin.dashboard.retention.average": "Gennemsnitlig",
   "admin.dashboard.retention.cohort": "Tilmeldingsmåned",
   "admin.dashboard.retention.cohort_size": "Nye brugere",
   "alert.rate_limited.message": "Forsøg igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Hastighedsbegrænset",
-  "alert.unexpected.message": "Der skete en uventet fejl.",
+  "alert.unexpected.message": "En uventet fejl opstod.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Bekendtgørelse",
-  "attachments_list.unprocessed": "(ubearbejdet)",
+  "attachments_list.unprocessed": "(ubehandlet)",
   "autosuggest_hashtag.per_week": "{count} pr. uge",
-  "boost_modal.combo": "Du kan trykke på {combo} for at springe over næste gang",
+  "boost_modal.combo": "Du kan trykke på {combo} for at overspringe dette næste gang",
   "bundle_column_error.body": "Noget gik galt under indlæsningen af denne komponent.",
-  "bundle_column_error.retry": "Prøv igen",
+  "bundle_column_error.retry": "Forsøg igen",
   "bundle_column_error.title": "Netværksfejl",
   "bundle_modal_error.close": "Luk",
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af denne komponent.",
-  "bundle_modal_error.retry": "Prøv igen",
+  "bundle_modal_error.retry": "Forsøg igen",
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bogmærker",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direkte beskeder",
-  "column.directory": "Se profiler",
+  "column.directory": "Tjek profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.favourites": "Favoritter",
-  "column.follow_requests": "Følg-anmodninger",
+  "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.lists": "Lister",
   "column.mutes": "Tavsgjorte brugere",
@@ -92,16 +92,16 @@
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Kun medier",
   "community.column_settings.remote_only": "Kun udefra",
-  "compose_form.direct_message_warning": "Indlægget bliver kun sendt til de nævnte brugere.",
+  "compose_form.direct_message_warning": "Indlægget sendes kun til de nævnte brugere.",
   "compose_form.direct_message_warning_learn_more": "Få mere at vide",
-  "compose_form.hashtag_warning": "Dette trut vises ikke under noget hashtag, da det ikke er listet. Kun offentlige trut kan søges via hashtags.",
-  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Alle kan følge dig, så de også kan se de indlæg, der kun er til følgere.",
+  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, idet kun offentlige indlæg kan søges via hashtags.",
+  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
-  "compose_form.placeholder": "Hvad vil du gerne fortælle om?",
+  "compose_form.placeholder": "Hvad tænker du på?",
   "compose_form.poll.add_option": "Tilføj valgmulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
-  "compose_form.poll.remove_option": "Fjern valgmulighed",
+  "compose_form.poll.remove_option": "Fjern denne valgmulighed",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
   "compose_form.publish": "Udgiv",
@@ -110,41 +110,41 @@
   "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.spoiler.marked": "Fjern advarsel",
-  "compose_form.spoiler.unmarked": "Skjul bag advarsel",
+  "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
+  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
   "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Er du sikker på, du vil blokere {name}?",
+  "confirmations.block.message": "Sikker på, at du vil blokere {name}?",
   "confirmations.delete.confirm": "Slet",
-  "confirmations.delete.message": "Er du sikker på, at du vil slette indlægget?",
+  "confirmations.delete.message": "Sikker på, at du vil slette dette indlæg?",
   "confirmations.delete_list.confirm": "Slet",
   "confirmations.delete_list.message": "Sikker på, at du vil slette denne liste permanent?",
   "confirmations.discard_edit_media.confirm": "Kassér",
   "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
   "confirmations.domain_block.confirm": "Blokér hele domænet",
-  "confirmations.domain_block.message": "Er du helt sikker på, at du vil blokere hele {domain}-domænet? Oftest vil det være at foretrække istedet målrettet at blokere eller skjule nogle få brugere. Hvis du blokerer domænet, vil du ikke se indhold fra domænet på offentlige tidslinjer eller i dine notifikationer. Dine følgere fra domænet fjernes.",
+  "confirmations.domain_block.message": "Fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller tavsgørelser være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Log ud, sikker?",
-  "confirmations.mute.confirm": "Skjul",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men de kan stadig se dine indlæg og følge dig.",
+  "confirmations.mute.confirm": "Tavsgør",
+  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
   "confirmations.mute.message": "Er du sikker på, du vil skjule {name}?",
-  "confirmations.redraft.confirm": "Slet og omskriv",
-  "confirmations.redraft.message": "Er du sikker på, at du vil slette og omskrive indlægget? Favoritter og fremhævelser går tabt og svar til det oprindelige indlæg afassocieres.",
+  "confirmations.redraft.confirm": "Slet og omformulér",
+  "confirmations.redraft.message": "Sikker på, at du vil slette dette indlæg for at omskrive det? Favoritter og boosts går tabt, og svar til det oprindelige indlæg afassocieres.",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "At svare nu vil overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
   "confirmations.unfollow.confirm": "Følg ikke længere",
-  "confirmations.unfollow.message": "Er du sikker på, at du ikke vil følge {name}?",
+  "confirmations.unfollow.message": "Sikker på, at du ikke længere vil følge {name}?",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
-  "conversation.open": "Vis samtale",
+  "conversation.open": "Vis konversation",
   "conversation.with": "Med {names}",
-  "directory.federated": "Fra kendt Fællesvers",
+  "directory.federated": "Fra kendt fedivers",
   "directory.local": "Kun fra {domain}",
   "directory.new_arrivals": "Nye ankomster",
-  "directory.recently_active": "Aktive for nyligt",
-  "embed.instructions": "Indlejr indlægget på din side ved at kopiere koden nedenfor.",
+  "directory.recently_active": "Nyligt aktive",
+  "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
   "emoji_button.custom": "Tilpasset",
@@ -152,38 +152,38 @@
   "emoji_button.food": "Mad og drikke",
   "emoji_button.label": "Indsæt emoji",
   "emoji_button.nature": "Natur",
-  "emoji_button.not_found": "Kunne ikke finde tilsvarende emojis",
+  "emoji_button.not_found": "Ingen matchende emojis fundet",
   "emoji_button.objects": "Objekter",
   "emoji_button.people": "Personer",
-  "emoji_button.recent": "De sædvanlige",
+  "emoji_button.recent": "Oftest brugt",
   "emoji_button.search": "Søg...",
   "emoji_button.search_results": "Søgeresultater",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser og steder",
   "empty_column.account_suspended": "Konto suspenderet",
-  "empty_column.account_timeline": "Ingen trut her!",
+  "empty_column.account_timeline": "Ingen indlæg hér!",
   "empty_column.account_unavailable": "Profil utilgængelig",
-  "empty_column.blocks": "Du har ikke blokeret nogen endnu.",
-  "empty_column.bookmarked_statuses": "Du har ingen indlæg med bogmærke endnu. Når du sætter et bogmærke, vil det dukke op hér.",
+  "empty_column.blocks": "Ingen brugere blokeret endnu.",
+  "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.direct": "Du har ingen direkte beskeder endnu. Hvis du sender eller modtager en, bliver den vist hér.",
-  "empty_column.domain_blocks": "Der er ingen skjulte domæner endnu.",
-  "empty_column.explore_statuses": "Intet nye tendensen pt. Tjek igen senere!",
-  "empty_column.favourited_statuses": "Du har ikke markeret nogle indlæg som favorit. Når du markerer ét, bliver det vist hér.",
-  "empty_column.favourites": "Ingen har markeret indlægget som favorit endnu. Hvis der er nogen der gør, bliver det vist hér.",
-  "empty_column.follow_recommendations": "Det ser ud til, at der ikke kunne blive lavet forslag til dig. Du kan prøve med Søg for at finde personer, du kender, eller udforske hashtags.",
-  "empty_column.follow_requests": "Du har ingen følgeanmodninger endnu. Hvis du modtager en, bliver den vist her.",
-  "empty_column.hashtag": "Der er ingen indlæg med hashtagget endnu.",
-  "empty_column.home": "Din hjemmetidslinje er tom! Besøg {public} eller brug søgningen for at komme igang og møde andre brugere.",
-  "empty_column.home.suggestions": "Se nogle foreslag",
+  "empty_column.direct": "Du har endnu ingen direkte beskeder. Når du sender eller modtager én, vil den dukke op hér.",
+  "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
+  "empty_column.explore_statuses": "Ingen nye tendensen pt. Tjek igen senere!",
+  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoriserer ét, vil det dukke op hér.",
+  "empty_column.favourites": "Ingen har endnu favoriseret dette indlæg. Når nogen gør dét, vil det dukke op hér.",
+  "empty_column.follow_recommendations": "Ser ud til, at der ikke kunne genereres forslag til dig. Du kan prøve med Søg for at lede efter personer, du måske kender, eller udforske hashtags.",
+  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op hér.",
+  "empty_column.hashtag": "Der er intet med dette hashtag endnu.",
+  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at udfylde den. {suggestions}",
+  "empty_column.home.suggestions": "Se nogle forslag",
   "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
   "empty_column.mutes": "Du har endnu ikke tystnet nogle brugere.",
-  "empty_column.notifications": "Du har ingen notifikationer. Hvis andre interagerer med dig, bliver det vist her.",
+  "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
   "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
   "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
   "error.unexpected_crash.explanation_addons": "Denne side kunne ikke vises korrekt. Fejlen skyldes sandsynligvis en browsertilføjelse eller automatiske oversættelsesværktøjer.",
-  "error.unexpected_crash.next_steps": "Prøv at genindlæs siden. Hvis dette ikke hjælper, så forsøg venligst, at tilgå Mastodon via en anden browser eller app.",
+  "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
   "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiér stacktrace til udklipsholderen",
   "errors.unexpected_crash.report_issue": "Anmeld problem",
@@ -195,13 +195,13 @@
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Udført",
   "follow_recommendations.heading": "Følg personer du gerne vil se indlæg fra! Her er nogle forslag.",
-  "follow_recommendations.lead": "Indlæg, fra personer du følger, vises i kronologisk rækkefølge i hjemmetidslinjen. Bare prøv dig frem med hvem du følger her. Du kan altid vælge om igen!",
+  "follow_recommendations.lead": "Indlæg, fra personer du følger, vil fremgå kronologisk ordnet i dit hjemmefeed. Vær ikke bange for at begå fejl, da du altid og meget nemt kan ændre dit valg!",
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, antog {domain}-personalet, at du måske vil gennemgå dine anmodninger manuelt.",
   "generic.saved": "Gemt",
   "getting_started.developers": "Udviklere",
-  "getting_started.directory": "Profilliste",
+  "getting_started.directory": "Profilmappe",
   "getting_started.documentation": "Dokumentation",
   "getting_started.heading": "Startmenu",
   "getting_started.invite": "Invitér folk",
@@ -213,52 +213,52 @@
   "hashtag.column_header.tag_mode.none": "uden {additional}",
   "hashtag.column_settings.select.no_options_message": "Ingen forslag fundet",
   "hashtag.column_settings.select.placeholder": "Angiv hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Allesammen",
+  "hashtag.column_settings.tag_mode.all": "Alle disse",
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
   "hashtag.column_settings.tag_toggle": "Inkludér ekstra tags for denne kolonne",
   "home.column_settings.basic": "Grundlæggende",
-  "home.column_settings.show_reblogs": "Vis fremhævelser",
+  "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
   "home.show_announcements": "Vis bekendtgørelser",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
-  "keyboard_shortcuts.back": "for at navigere tilbage",
-  "keyboard_shortcuts.blocked": "Vis listen over blokerede brugere",
-  "keyboard_shortcuts.boost": "Fremhæv indlæg",
-  "keyboard_shortcuts.column": "for at fokusere et trut i en af kolonnerne",
-  "keyboard_shortcuts.compose": "for at fokusere på skriveområdet",
+  "keyboard_shortcuts.back": "Gå tilbage",
+  "keyboard_shortcuts.blocked": "Åbn Blokerede brugere-listen",
+  "keyboard_shortcuts.boost": "Boost indlæg",
+  "keyboard_shortcuts.column": "Fokusér kolonne",
+  "keyboard_shortcuts.compose": "Fokusér skriveområdet",
   "keyboard_shortcuts.description": "Beskrivelse",
-  "keyboard_shortcuts.direct": "Åben kolonnen med direkte beskeder",
-  "keyboard_shortcuts.down": "for at rykke nedad på listen",
-  "keyboard_shortcuts.enter": "Åben indlæg",
-  "keyboard_shortcuts.favourite": "Markér som favorit",
-  "keyboard_shortcuts.favourites": "for at åbne favoritlisten",
-  "keyboard_shortcuts.federated": "Åben den fælles tidslinje",
+  "keyboard_shortcuts.direct": "Åbn Direkte beskeder-kolonnen",
+  "keyboard_shortcuts.down": "Flyt nedad på listen",
+  "keyboard_shortcuts.enter": "Åbn indlæg",
+  "keyboard_shortcuts.favourite": "Favorisér indlæg",
+  "keyboard_shortcuts.favourites": "Åbn favoritlisten",
+  "keyboard_shortcuts.federated": "Åbn fælles tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
-  "keyboard_shortcuts.home": "for at åbne hjemmetidslinjen",
+  "keyboard_shortcuts.home": "Åbn hjemmetidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
-  "keyboard_shortcuts.legend": "for at vise dette symbol",
-  "keyboard_shortcuts.local": "for at åbne den lokale tidslinje",
-  "keyboard_shortcuts.mention": "for at nævne forfatteren",
-  "keyboard_shortcuts.muted": "for at åbne listen over tavsgjorte brugere",
-  "keyboard_shortcuts.my_profile": "for at åbne din profil",
+  "keyboard_shortcuts.legend": "Vis dette symbol",
+  "keyboard_shortcuts.local": "Åbn lokal tidslinje",
+  "keyboard_shortcuts.mention": "Nævn forfatter",
+  "keyboard_shortcuts.muted": "Åbn listen over tavsgjorte brugere",
+  "keyboard_shortcuts.my_profile": "Åbn din profil",
   "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen",
-  "keyboard_shortcuts.open_media": "for at åbne medier",
-  "keyboard_shortcuts.pinned": "Åben listen over fastgjorte indlæg",
-  "keyboard_shortcuts.profile": "for at åbne forfatterens profil",
-  "keyboard_shortcuts.reply": "for at besvare",
-  "keyboard_shortcuts.requests": "Åben listen over følgeanmodninger",
-  "keyboard_shortcuts.search": "for at fokusere søgningen",
-  "keyboard_shortcuts.spoilers": "for at vise/skjule CW-felt",
-  "keyboard_shortcuts.start": "for at åbne \"komme i gang\"-kolonnen",
-  "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
-  "keyboard_shortcuts.toggle_sensitivity": "for at vise/skjule medier",
-  "keyboard_shortcuts.toot": "for at påbegynde et helt nyt indlæg",
-  "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning",
-  "keyboard_shortcuts.up": "for at bevæge sig opad på listen",
+  "keyboard_shortcuts.open_media": "Åbn medier",
+  "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
+  "keyboard_shortcuts.profile": "Åbn forfatters profil",
+  "keyboard_shortcuts.reply": "Besvar indlægget",
+  "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
+  "keyboard_shortcuts.search": "Fokusér søgebjælke",
+  "keyboard_shortcuts.spoilers": "Vis/skjul CW-felt",
+  "keyboard_shortcuts.start": "Åbn \"komme i gang\"-kolonne",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul medier",
+  "keyboard_shortcuts.toot": "Påbegynd nyt indlæg",
+  "keyboard_shortcuts.unfocus": "Fjern fokus fra teksskrivningsområde/søgning",
+  "keyboard_shortcuts.up": "Flyt opad på listen",
   "lightbox.close": "Luk",
   "lightbox.compress": "Komprimér billedvisningsfelt",
   "lightbox.expand": "Udvid billedevisningsfelt",
@@ -271,21 +271,21 @@
   "lists.edit.submit": "Skift titel",
   "lists.new.create": "Tilføj liste",
   "lists.new.title_placeholder": "Ny listetitel",
-  "lists.replies_policy.followed": "Enhver fulgt bruger",
-  "lists.replies_policy.list": "Medlemmer af listen",
+  "lists.replies_policy.followed": "Enhver bruger, der følges",
+  "lists.replies_policy.list": "Listemedlemmer",
   "lists.replies_policy.none": "Ingen",
   "lists.replies_policy.title": "Vis svar til:",
-  "lists.search": "Søg blandt personer, du følger",
+  "lists.search": "Søg blandt personer, som følges",
   "lists.subheading": "Dine lister",
-  "load_pending": "{count, plural, one {# nyt punkt} other {# nye punkter}}",
+  "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
   "loading_indicator.label": "Indlæser...",
-  "media_gallery.toggle_visible": "Skjul {number, plural, one {billede} other {billeder}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "missing_indicator.label": "Ikke fundet",
   "missing_indicator.sublabel": "Denne ressource kunne ikke findes",
   "mute_modal.duration": "Varighed",
-  "mute_modal.hide_notifications": "Skjul notifikationer fra brugeren?",
+  "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
   "mute_modal.indefinite": "Tidsubegrænset",
-  "navigation_bar.apps": "Apps til mobilen",
+  "navigation_bar.apps": "Mobil-apps",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
@@ -295,33 +295,33 @@
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.edit_profile": "Redigér profil",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Tystnede ord",
+  "navigation_bar.filters": "Tavsgjorte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.info": "Om denne server",
-  "navigation_bar.keyboard_shortcuts": "Hurtigtaster",
+  "navigation_bar.keyboard_shortcuts": "Genvejstaster",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Log af",
-  "navigation_bar.mutes": "Tystnede brugere",
+  "navigation_bar.mutes": "Tavsgjorte brugere",
   "navigation_bar.personal": "Personlig",
   "navigation_bar.pins": "Fastgjorte indlæg",
   "navigation_bar.preferences": "Præferencer",
   "navigation_bar.public_timeline": "Fælles tidslinje",
   "navigation_bar.security": "Sikkerhed",
   "notification.admin.sign_up": "{name} tilmeldte sig",
-  "notification.favourite": "{name} favoriserede dit trut",
-  "notification.follow": "{name} fulgte dig",
+  "notification.favourite": "{name} favoriserede dit indlæg",
+  "notification.follow": "{name} begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
   "notification.mention": "{name} nævnte dig",
   "notification.own_poll": "Din afstemning er afsluttet",
-  "notification.poll": "En afstemning, du deltog i, er færdig",
-  "notification.reblog": "{name} fremhævede dit indlæg",
-  "notification.status": "{name} har netop udgivet",
+  "notification.poll": "En afstemning, hvori du stemte, er slut",
+  "notification.reblog": "{name} boostede dit indlæg",
+  "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
   "notifications.clear": "Ryd notifikationer",
-  "notifications.clear_confirmation": "Er du sikker på, du vil rydde alle dine notifikationer permanent?",
+  "notifications.clear_confirmation": "Sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
-  "notifications.column_settings.alert": "Skrivebordsnotifikationer",
+  "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
@@ -330,8 +330,8 @@
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
-  "notifications.column_settings.push": "Pushnotifikationer",
-  "notifications.column_settings.reblog": "Fremhævelser:",
+  "notifications.column_settings.push": "Push-notifikationer",
+  "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
   "notifications.column_settings.status": "Nye indlæg:",
@@ -339,7 +339,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Fremhæv ulæste notifikationer",
   "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
-  "notifications.filter.boosts": "Fremhævelser",
+  "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "Følger",
   "notifications.filter.mentions": "Omtaler",
@@ -348,13 +348,13 @@
   "notifications.grant_permission": "Tildel tilladelse.",
   "notifications.group": "{count} notifikationer",
   "notifications.mark_as_read": "Markér alle notifikationer som læst",
-  "notifications.permission_denied": "Skrivebordsnotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
-  "notifications.permission_denied_alert": "Skrivebordsnotifikationer kan ikke aktiveres, da browsertilladelse er blevet nægtet før",
-  "notifications.permission_required": "Skrivebordsnotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
-  "notifications_permission_banner.enable": "Aktivér skrivebordsnotifikationer",
-  "notifications_permission_banner.how_to_control": "Aktivér skrivebordsnotifikationer for at modtage notifikationer, når Mastodon ikke er åben. Du kan styre, præcist hvilke typer af interaktioner, som genererer skrivebordsnotifikationer via knappen {icon} ovenfor, når de er aktiveret.",
+  "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
+  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
+  "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications_permission_banner.enable": "Aktivér computernotifikationer",
+  "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
-  "picture_in_picture.restore": "Sæt det tilbage",
+  "picture_in_picture.restore": "Indsæt det igen",
   "poll.closed": "Lukket",
   "poll.refresh": "Opdatér",
   "poll.total_people": "{count, plural, one {# person} other {# personer}}",
@@ -364,14 +364,14 @@
   "poll.votes": "{votes, plural, one {# stemme} other {# stemmer}}",
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
-  "privacy.change": "Justér fortrolighed",
+  "privacy.change": "Justér indlægsfortrolighed",
   "privacy.direct.long": "Kun synlig for nævnte brugere",
   "privacy.direct.short": "Direkte",
   "privacy.private.long": "Kun synlig for følgere",
   "privacy.private.short": "Kun for følgere",
-  "privacy.public.long": "Synlig for alle og vises på offentlige tidslinjer",
+  "privacy.public.long": "Synlig for alle, fremgår på offentlige tidslinjer",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men vises ikke på offentlige tidslinjer",
+  "privacy.unlisted.long": "Synlig for alle, fremgår ikke på offentlige tidslinjer",
   "privacy.unlisted.short": "Diskret",
   "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
@@ -398,11 +398,11 @@
   "report.category.title_account": "profil",
   "report.category.title_status": "indlæg",
   "report.close": "Udført",
-  "report.comment.title": "Findes der noget andet, som vi burde vide?",
+  "report.comment.title": "Er der andet, som vi bør vide?",
   "report.forward": "Videresend til {target}",
-  "report.forward_hint": "Kontoen er fra en anden server. Send en anonymiseret kopi af anmeldelsen dertil også?",
+  "report.forward_hint": "Kontoen er fra en anden server. Send også en anonymiseret anmeldelseskopi dertil?",
   "report.mute": "Tavsgør",
-  "report.mute_explanation": "Du vil ikke se vedkommendes indlæg, men vedkommende kan stadig se dine/følge dig. Vedkommende vil ikke være bekendt med tavsgørelsen.",
+  "report.mute_explanation": "Du vil ikke se vedkommendes indlæg, men vedkommende kan stadig se dine og følge dig. Vedkommende vil ikke være bekendt med tavsgørelsen.",
   "report.next": "Næste",
   "report.placeholder": "Yderligere kommentarer",
   "report.reasons.dislike": "Synes ikke om den/dem",
@@ -414,20 +414,20 @@
   "report.reasons.violation": "Overtræder serverregler",
   "report.reasons.violation_description": "Det står klart, at det bryder bestemte regler",
   "report.rules.subtitle": "Vælg alle relevante",
-  "report.rules.title": "Hvilke regler brydes?",
+  "report.rules.title": "Hvilke regler overtrædes?",
   "report.statuses.subtitle": "Vælg alle relevante",
   "report.statuses.title": "Er der indlæg, som kan bekræfte denne anmeldelse?",
   "report.submit": "Indsend",
   "report.target": "Anmelder {target}",
-  "report.thanks.take_action": "Her er mulighederne styring af, hvad man ses på Mastodon:",
+  "report.thanks.take_action": "Dette er mulighederne for styring af, hvad man ses på Mastodon:",
   "report.thanks.take_action_actionable": "Mens dette gennemgås, kan der skrides til handling mod @{name}:",
   "report.thanks.title": "Ønsker ikke at se dette?",
-  "report.thanks.title_actionable": "Tak for anmeldelsen, der vil set nærmere på dette.",
+  "report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
   "report.unfollow": "Følg ikke længere @{name}",
-  "report.unfollow_explanation": "Denne konto følges. For at ophøre medat se vedkommendes indlæg i hjemmefeedet, vælg Følg ikke længere.",
+  "report.unfollow_explanation": "Denne konto følges. For at ophøre med at se vedkommendes indlæg på hjemmetidslinjen, vælg Følg ikke længere.",
   "search.placeholder": "Søg",
   "search_popout.search_format": "Avanceret søgeformat",
-  "search_popout.tips.full_text": "Simpel tekst returnerer trut, du har skrevet, favoriseret, fremhævede eller som er nævnt i/matcher bruger- og profilnavne samt hashtags.",
+  "search_popout.tips.full_text": "Simpel tekst returnerer indlæg, du har skrevet, favoriseret, boostet eller som er nævnt i/matcher bruger- og profilnavne samt hashtags.",
   "search_popout.tips.hashtag": "hashtag",
   "search_popout.tips.status": "indlæg",
   "search_popout.tips.text": "Simpel tekst returnerer matchende visnings- og brugernavne samt hashtags",
@@ -437,15 +437,15 @@
   "search_results.hashtags": "Hashtags",
   "search_results.nothing_found": "Ingen resultater for disse søgeord",
   "search_results.statuses": "Indlæg",
-  "search_results.statuses_fts_disabled": "På denne Mastodon-server er trutsøgning efter deres indhold ikke aktiveret.",
+  "search_results.statuses_fts_disabled": "Søgning på indlæg efter deres indhold ikke aktiveret på denne Mastodon-server.",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
-  "status.admin_status": "Åbn dette trut i modereringsbrugerflade",
+  "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
   "status.block": "Blokér @{name}",
-  "status.bookmark": "Tilføj bogmærke",
+  "status.bookmark": "Bogmærk",
   "status.cancel_reblog_private": "Fjern fremhævning",
-  "status.cannot_reblog": "Indlægget kan ikke fremhæves",
-  "status.copy": "Kopiér link til trut",
+  "status.cannot_reblog": "Dette indlæg kan ikke boostes",
+  "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
   "status.detailed_status": "Detaljeret samtalevisning",
   "status.direct": "Direkte besked til @{name}",
@@ -461,20 +461,20 @@
   "status.media_hidden": "Medie skjult",
   "status.mention": "Nævn @{name}",
   "status.more": "Mere",
-  "status.mute": "Skjul @{name}",
-  "status.mute_conversation": "Skjul samtale",
-  "status.open": "Udvid indlægget",
+  "status.mute": "Tystn @{name}",
+  "status.mute_conversation": "Tystn samtale",
+  "status.open": "Udvid dette indlæg",
   "status.pin": "Fastgør til profil",
-  "status.pinned": "Fastgjort trut",
+  "status.pinned": "Fastgjort indlæg",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
-  "status.reblog_private": "Fremhæv med oprindelig synlighed",
-  "status.reblogged_by": "{name} fremhævet",
-  "status.reblogs.empty": "Ingen har fremhævet indlægget endnu. Når nogen gør, vil det fremgå hér.",
-  "status.redraft": "Slet og omskriv",
+  "status.reblog_private": "Boost med oprindelig synlighed",
+  "status.reblogged_by": "{name} boostede",
+  "status.reblogs.empty": "Ingen har endnu boostet dette indlæg. Når nogen gør, vil det fremgå hér.",
+  "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
   "status.reply": "Besvar",
-  "status.replyAll": "Svar på tråd",
+  "status.replyAll": "Besvar alle",
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
@@ -496,7 +496,7 @@
   "time_remaining.days": "{number, plural, one {# dag} other {# dage}} tilbage",
   "time_remaining.hours": "{number, plural, one {# time} other {# timer}} tilbage",
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
-  "time_remaining.moments": "Et øjeblik tilbage",
+  "time_remaining.moments": "Få øjeblikke tilbage",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} tilbage",
   "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
   "timeline_hint.resources.followers": "Følgere",
@@ -505,24 +505,24 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} taler",
   "trends.trending_now": "Hot lige nu",
   "ui.beforeunload": "Dit udkast går tabt, hvis du lukker Mastodon.",
-  "units.short.billion": "{count}G",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}k",
+  "units.short.billion": "{count} MIA",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} K",
   "upload_area.title": "Træk og slip for at uploade",
-  "upload_button.label": "Tilføj billeder, en video- eller lydfil",
+  "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
   "upload_error.limit": "Grænse for filupload nået.",
   "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.edit": "Redigér",
-  "upload_form.thumbnail": "Skift miniaturer",
+  "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",
   "upload_modal.applying": "Effektuerer…",
   "upload_modal.choose_image": "Vælg billede",
-  "upload_modal.description_placeholder": "Høj bly gom vandt fræk sexquiz på wc",
+  "upload_modal.description_placeholder": "En hurtig brun ræv hopper over den dovne hund",
   "upload_modal.detect_text": "Detektér tekst i billede",
   "upload_modal.edit_media": "Redigér medie",
   "upload_modal.hint": "Klik eller træk cirklen i forhåndsvisningen for at vælge det fokuspunkt, der altid vil være synligt på alle miniaturer.",
@@ -535,8 +535,8 @@
   "video.expand": "Udvid video",
   "video.fullscreen": "Fuldskærm",
   "video.hide": "Skjul video",
-  "video.mute": "Sluk lyden",
-  "video.pause": "Sæt på pause",
+  "video.mute": "Tavsgør lyd",
+  "video.pause": "Pausér",
   "video.play": "Afspil",
-  "video.unmute": "Tænd for lyden"
+  "video.unmute": "Fjern lydtavsgørelse"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5344a444e..c78be6a75 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -18,7 +18,7 @@
   "account.followers": "Follower",
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
-  "account.following": "Following",
+  "account.following": "Folgt",
   "account.following_counter": "{count, plural, one {{counter} Folgender} other {{counter} Folgende}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
   "account.follows_you": "Folgt dir",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "account.unblock": "@{name} entblocken",
   "account.unblock_domain": "{domain} wieder anzeigen",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Blockierung aufheben",
   "account.unendorse": "Nicht auf Profil hervorheben",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
   "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Nicht mehr stummschalten",
   "account_note.placeholder": "Notiz durch Klicken hinzufügen",
   "admin.dashboard.daily_retention": "Benutzerverbleibrate nach Tag nach Anmeldung",
   "admin.dashboard.monthly_retention": "Benutzerverbleibrate nach Monat nach Anmeldung",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 4e8765d13..97ab833df 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Τουτ} other {{counter} Τουτ}}",
   "account.unblock": "Ξεμπλόκαρε @{name}",
   "account.unblock_domain": "Αποκάλυψε το {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Ξεμπλοκάρισμα",
   "account.unendorse": "Άνευ προβολής στο προφίλ",
   "account.unfollow": "Διακοπή παρακολούθησης",
   "account.unmute": "Διακοπή αποσιώπησης @{name}",
   "account.unmute_notifications": "Διακοπή αποσιώπησης ειδοποιήσεων του/της @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Κατάργηση σίγασης",
   "account_note.placeholder": "Κλικ για να βάλεις σημείωση",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 0628392ae..fa2bd59de 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -26,7 +26,7 @@
   "account.joined": "Kuniĝis {date}",
   "account.link_verified_on": "La posedanto de tiu ligilo estis kontrolita je {date}",
   "account.locked_info": "La privateco de tiu konto estas elektita kiel fermita. La posedanto povas mane akcepti tiun, kiu povas sekvi rin.",
-  "account.media": "Amaskomunikiloj",
+  "account.media": "Aŭdovidaĵoj",
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} moviĝis al:",
   "account.mute": "Silentigi @{name}",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Mesaĝo} other {{counter} Mesaĝoj}}",
   "account.unblock": "Malbloki @{name}",
   "account.unblock_domain": "Malbloki {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Malbloki",
   "account.unendorse": "Ne montri en profilo",
   "account.unfollow": "Ne plu sekvi",
   "account.unmute": "Malsilentigi @{name}",
   "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Malsilentigi",
   "account_note.placeholder": "Alklaku por aldoni noton",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@@ -106,7 +106,7 @@
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
   "compose_form.publish": "Hup",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
+  "compose_form.save_changes": "Konservi ŝanĝojn",
   "compose_form.sensitive.hide": "Marki la aŭdovidaĵojn kiel tiklaj",
   "compose_form.sensitive.marked": "Aŭdovidaĵo markita tikla",
   "compose_form.sensitive.unmarked": "Aŭdovidaĵo ne markita tikla",
@@ -125,8 +125,8 @@
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
-  "confirmations.logout.confirm": "Elsaluti",
-  "confirmations.logout.message": "Ĉu vi certas ke vi volas elsaluti?",
+  "confirmations.logout.confirm": "Adiaŭi",
+  "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
   "confirmations.mute.confirm": "Silentigi",
   "confirmations.mute.explanation": "Ĉi-tio kaŝos mesaĝojn el ili kaj mesaĝojn kiuj mencias ilin, sed ili ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
   "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Provu malaktivigi ilin kaj tiam refreŝigi la paĝon. Se tio ne helpas, vi ankoraŭ povus uzi Mastodon per malsama retumilo aŭ operaciuma aplikajo.",
   "errors.unexpected_crash.copy_stacktrace": "Kopii stakspuron en tondujo",
   "errors.unexpected_crash.report_issue": "Raporti problemon",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Serĉaj rezultoj",
+  "explore.suggested_follows": "Por vi",
+  "explore.title": "Esplori",
+  "explore.trending_links": "Novaĵoj",
+  "explore.trending_statuses": "Afiŝoj",
+  "explore.trending_tags": "Kradvortoj",
   "follow_recommendations.done": "Farita",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
@@ -301,14 +301,14 @@
   "navigation_bar.info": "Pri ĉi tiu servilo",
   "navigation_bar.keyboard_shortcuts": "Rapidklavoj",
   "navigation_bar.lists": "Listoj",
-  "navigation_bar.logout": "Elsaluti",
+  "navigation_bar.logout": "Adiaŭi",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.personal": "Persone",
   "navigation_bar.pins": "Alpinglitaj mesaĝoj",
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.public_timeline": "Fratara templinio",
   "navigation_bar.security": "Sekureco",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} registris",
   "notification.favourite": "{name} stelumis vian mesaĝon",
   "notification.follow": "{name} eksekvis vin",
   "notification.follow_request": "{name} petis sekvi vin",
@@ -317,7 +317,7 @@
   "notification.poll": "Partoprenita balotenketo finiĝis",
   "notification.reblog": "{name} diskonigis vian mesaĝon",
   "notification.status": "{name} ĵus afiŝita",
-  "notification.update": "{name} edited a post",
+  "notification.update": "{name} redaktis afiŝon",
   "notifications.clear": "Forviŝi sciigojn",
   "notifications.clear_confirmation": "Ĉu vi certas, ke vi volas porĉiame forviŝi ĉiujn viajn sciigojn?",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
@@ -337,7 +337,7 @@
   "notifications.column_settings.status": "Novaj mesaĝoj:",
   "notifications.column_settings.unread_notifications.category": "Nelegitaj sciigoj",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Redaktoj:",
   "notifications.filter.all": "Ĉiuj",
   "notifications.filter.boosts": "Diskonigoj",
   "notifications.filter.favourites": "Stelumoj",
@@ -379,7 +379,7 @@
   "relative_time.days": "{number}t",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
-  "relative_time.full.just_now": "just now",
+  "relative_time.full.just_now": "ĵus nun",
   "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
   "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
@@ -388,30 +388,30 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodiaŭ",
   "reply_indicator.cancel": "Nuligi",
-  "report.block": "Block",
+  "report.block": "Bloki",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
-  "report.categories.other": "Other",
-  "report.categories.spam": "Spam",
+  "report.categories.other": "Aliaj",
+  "report.categories.spam": "Spamo",
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
+  "report.category.title_account": "profilo",
+  "report.category.title_status": "afiŝo",
+  "report.close": "Farita",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Plusendi al {target}",
   "report.forward_hint": "La konto estas en alia servilo. Ĉu sendi sennomigitan kopion de la signalo ankaŭ tien?",
-  "report.mute": "Mute",
+  "report.mute": "Silentigi",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Sekva",
   "report.placeholder": "Pliaj komentoj",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "Mi ne ŝatas ĝin",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "Ĝi malrespektas servilajn regulojn",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
   "report.rules.title": "Which rules are being violated?",
@@ -423,7 +423,7 @@
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
   "report.thanks.title": "Don't want to see this?",
   "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow": "Malsekvi @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "search.placeholder": "Serĉi",
   "search_popout.search_format": "Detala serĉo",
@@ -433,7 +433,7 @@
   "search_popout.tips.text": "Simpla teksto montras la kongruajn afiŝitajn nomojn, uzantnomojn kaj kradvortojn",
   "search_popout.tips.user": "uzanto",
   "search_results.accounts": "Homoj",
-  "search_results.all": "All",
+  "search_results.all": "Ĉiuj",
   "search_results.hashtags": "Kradvortoj",
   "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Mesaĝoj",
@@ -449,14 +449,14 @@
   "status.delete": "Forigi",
   "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Rekte mesaĝi @{name}",
-  "status.edit": "Edit",
-  "status.edited": "Edited {date}",
-  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.edit": "Redakti",
+  "status.edited": "Redaktita {date}",
+  "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Stelumi",
   "status.filtered": "Filtrita",
-  "status.history.created": "{name} created {date}",
-  "status.history.edited": "{name} edited {date}",
+  "status.history.created": "{name} kreis {date}",
+  "status.history.edited": "{name} redaktis {date}",
   "status.load_more": "Ŝargi pli",
   "status.media_hidden": "Aŭdovidaĵo kaŝita",
   "status.mention": "Mencii @{name}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 811f814be..a27091ec6 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -18,7 +18,7 @@
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
-  "account.following": "Following",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Todavía este usuario no sigue a nadie.",
   "account.follows_you": "Te sigue",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Mensaje} other {{counter} Mensajes}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Desbloquear dominio {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "No destacar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Dejar de silenciar",
   "account_note.placeholder": "Hacé clic par agregar una nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día, después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes, después del registro",
@@ -168,7 +168,7 @@
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
   "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
   "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "No hay nada en tendencia ahora mismo. ¡Volvé a revisar más tarde!",
   "empty_column.favourited_statuses": "Todavía no tenés mensajes favoritos. Cuando marqués uno como favorito, se mostrará acá.",
   "empty_column.favourites": "Todavía nadie marcó este mensaje como favorito. Cuando alguien lo haga, se mostrará acá.",
   "empty_column.follow_recommendations": "Parece que no se pudieron generar sugerencias para vos. Podés intentar buscar gente que conozcas o explorar las tendencias de las etiquetas.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Intentá deshabilitarlos y recargá la página. Si eso no ayuda, podés usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar stacktrace al portapapeles",
   "errors.unexpected_crash.report_issue": "Informar problema",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Resultados de búsqueda",
+  "explore.suggested_follows": "Para vos",
+  "explore.title": "Explorá",
+  "explore.trending_links": "Noticias",
+  "explore.trending_statuses": "Mensajes",
+  "explore.trending_tags": "Etiquetas",
   "follow_recommendations.done": "Listo",
   "follow_recommendations.heading": "¡Seguí cuentas cuyos mensajes te gustaría ver! Acá tenés algunas sugerencias.",
   "follow_recommendations.lead": "Los mensajes de las cuentas que seguís aparecerán en orden cronológico en la columna \"Inicio\". No tengás miedo de meter la pata, ¡podés dejar de seguir cuentas fácilmente en cualquier momento!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Configuración",
   "navigation_bar.public_timeline": "Línea temporal federada",
   "navigation_bar.security": "Seguridad",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "Se registró {name}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} solicitó seguirte",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editó un mensaje",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "Bloquear",
+  "report.block_explanation": "No verás sus mensajes. No podrán ver tus mensajes ni seguirte. Se van a dar cuentra de que están bloqueados.",
   "report.categories.other": "Otra",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El contenido viola una o más reglas del servidor",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Elegí la mejor coincidencia",
+  "report.category.title": "Contanos lo que pasa con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "mensaje",
+  "report.close": "Listo",
+  "report.comment.title": "¿Hay algo más que creés que deberíamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "La cuenta es de otro servidor. ¿Querés enviar una copia anonimizada del informe también ahí?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No verás sus mensajes. Todavía pueden seguirte y ver tus mensajes y no sabrán que están silenciados.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "No me gusta",
+  "report.reasons.dislike_description": "No es algo que querés ver",
+  "report.reasons.other": "Es otra cosa",
+  "report.reasons.other_description": "El problema no aplica en otras categorías",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Enlaces maliciosos, interacciones falsas o respuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas del servidor",
+  "report.reasons.violation_description": "Sos consciente de que infringe normas específicas",
+  "report.rules.subtitle": "Seleccioná todo lo que corresponda",
+  "report.rules.title": "¿Qué reglas se están violando?",
+  "report.statuses.subtitle": "Seleccioná todo lo que corresponda",
+  "report.statuses.title": "¿Hay algún mensaje que respalde esta denuncia?",
   "report.submit": "Enviar",
   "report.target": "Denunciando a {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Acá están tus opciones para controlar lo que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientras revisamos esto, podés tomar medidas contra @{name}:",
+  "report.thanks.title": "¿No querés ver esto?",
+  "report.thanks.title_actionable": "Gracias por tu denuncia, vamos a revisarla.",
+  "report.unfollow": "Dejar de seguir a @{name}",
+  "report.unfollow_explanation": "Estás siguiendo a esta cuenta. Para no ver sus mensajes en tu línea temporal principal, dejá de seguirla.",
   "search.placeholder": "Buscar",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Las búsquedas de texto simple devuelven los mensajes que escribiste, los marcados como favoritos, los adheridos o en los que te mencionaron, así como nombres de usuarios, nombres mostrados y etiquetas.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Las búsquedas de texto simple devuelven nombres de usuarios, nombres mostrados y etiquetas que coincidan",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
-  "search_results.all": "All",
+  "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "No se pudo encontrar nada para estos términos de búsqueda",
   "search_results.statuses": "Mensajes",
   "search_results.statuses_fts_disabled": "No se pueden buscar mensajes por contenido en este servidor de Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index cb5d740fb..a8c57cbad 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -4,7 +4,7 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
-  "account.block_domain": "Ocultar todo de {domain}",
+  "account.block_domain": "Bloquear dominio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
@@ -13,12 +13,12 @@
   "account.domain_blocked": "Dominio oculto",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
-  "account.endorse": "Mostrar en perfil",
+  "account.endorse": "Destacar en mi perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
-  "account.following": "Following",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.follows_you": "Te sigue",
@@ -27,29 +27,29 @@
   "account.link_verified_on": "El proprietario de este link fue comprobado el {date}",
   "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
   "account.media": "Multimedia",
-  "account.mention": "Mencionar a @{name}",
+  "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} se ha mudado a:",
   "account.mute": "Silenciar a @{name}",
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots con respuestas",
+  "account.posts": "Publicaciones",
+  "account.posts_with_replies": "Publicaciones y respuestas",
   "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación",
+  "account.requested": "Esperando aprobación. Haga clic para cancelar la solicitud de seguimiento",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "No mostrar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Desmutear",
   "account_note.placeholder": "Clic para añadir nota",
-  "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después del registro",
-  "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después del registro",
+  "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después de unirse",
+  "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después de unirse",
   "admin.dashboard.retention.average": "Promedio",
   "admin.dashboard.retention.cohort": "Mes de registro",
   "admin.dashboard.retention.cohort_size": "Nuevos usuarios",
@@ -168,7 +168,7 @@
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
   "empty_column.favourites": "Nadie ha marcado este toot como preferido. Cuando alguien lo haga, aparecerá aquí.",
   "empty_column.follow_recommendations": "Parece que no se ha podido generar ninguna sugerencia para ti. Puedes probar a buscar a gente que quizá conozcas o explorar los hashtags que están en tendencia.",
@@ -187,11 +187,11 @@
   "error.unexpected_crash.next_steps_addons": "Intenta deshabilitarlos y recarga la página. Si eso no ayuda, podrías usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar el seguimiento de pila en el portapapeles",
   "errors.unexpected_crash.report_issue": "Informar de un problema/error",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
+  "explore.search_results": "Resultados de búsqueda",
+  "explore.suggested_follows": "Para ti",
+  "explore.title": "Descubrir",
+  "explore.trending_links": "Noticias",
+  "explore.trending_statuses": "Publicaciones",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Hecho",
   "follow_recommendations.heading": "¡Sigue a gente que publique cosas que te gusten! Aquí tienes algunas sugerencias.",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Historia federada",
   "navigation_bar.security": "Seguridad",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} se unio",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editó una publicación",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
@@ -361,7 +361,7 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Has votado a favor de esta respuesta",
-  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votes}}",
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
@@ -377,54 +377,54 @@
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
   "relative_time.days": "{number} d",
-  "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
-  "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
+  "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
   "relative_time.full.just_now": "justo ahora",
-  "relative_time.full.minutes": "hace {number, plural, one {# minuto} other {# minutos}}",
-  "relative_time.full.seconds": "hace {number, plural, one {# segundo} other {# segundos}}",
+  "relative_time.full.minutes": "Hace {number, plural, one {# minute} other {# minutos}}",
+  "relative_time.full.seconds": "Hace {number, plural, one {# second} other {# segundos}}",
   "relative_time.hours": "{number} h",
   "relative_time.just_now": "ahora",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
-  "report.categories.other": "Otros",
+  "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.other": "Otro",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El contenido viola una o más reglas del servidor",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Selecciona la mejor coincidencia",
+  "report.category.title": "Cuéntanos lo que sucede con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicación",
+  "report.close": "Realizado",
+  "report.comment.title": "¿Hay algo más que usted cree que debamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No veras sus publiaciones. Todavía pueden seguirte y ver tus publicaciones y no sabrán que están silenciados.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "No me gusta",
+  "report.reasons.dislike_description": "No es algo que desee ver",
+  "report.reasons.other": "Es algo más",
+  "report.reasons.other_description": "El problema no encaja en otras categorías",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Enlaces maliciosos, Interacciones falsas, o respuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas del servidor",
+  "report.reasons.violation_description": "Es consciente de que infringe normas específicas",
+  "report.rules.subtitle": "Selecciona todos los que apliquen",
+  "report.rules.title": "¿Qué reglas se están violando?",
+  "report.statuses.subtitle": "Seleccione todos lo que aplican",
+  "report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
   "report.submit": "Publicar",
   "report.target": "Reportando",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Aqui hay algunas opciones para controlar lo que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
+  "report.thanks.title": "¿No quieres ver esto?",
+  "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
+  "report.unfollow": "Dejar de seguir @{name}",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu sección de noticias, deja de seguirlo.",
   "search.placeholder": "Buscar",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Búsquedas de texto recuperan posts que has escrito, marcado como favoritos, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
-  "search_results.all": "All",
+  "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "No se pudo encontrar nada para estos términos de busqueda",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Buscar toots por su contenido no está disponible en este servidor de Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
@@ -451,12 +451,12 @@
   "status.direct": "Mensaje directo a @{name}",
   "status.edit": "Editar",
   "status.edited": "Editado {date}",
-  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
   "status.history.created": "{name} creó {date}",
-  "status.history.edited": "{name} editó {date}",
+  "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index d36798e7b..dcf3cf9f7 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -18,7 +18,7 @@
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
-  "account.following": "Following",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.follows_you": "Te sigue",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicaciones}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "No mostrar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Dejar de silenciar",
   "account_note.placeholder": "Clic para añadir nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después del registro",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editó una publicación",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
-  "notifications.column_settings.admin.sign_up": "Nuevas inscripciones:",
+  "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
@@ -389,7 +389,7 @@
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
   "report.block": "Bloquear",
-  "report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán decir que están bloqueados.",
+  "report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.other": "Otros",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El contenido viola una o más reglas del servidor",
@@ -410,21 +410,21 @@
   "report.reasons.other": "Es otra cosa",
   "report.reasons.other_description": "El problema no encaja en otras categorías",
   "report.reasons.spam": "Es spam",
-  "report.reasons.spam_description": "Enlaces maliciosos, compromisos falsos o respuestas repetitivas",
+  "report.reasons.spam_description": "Enlaces maliciosos, interacciones falsas o respuestas repetitivas",
   "report.reasons.violation": "Viola las reglas del servidor",
-  "report.reasons.violation_description": "Usted es consciente de que infringe las normas específicas",
-  "report.rules.subtitle": "Selecciona todos los que aplica",
+  "report.reasons.violation_description": "Eres consciente de que infringe las normas específicas",
+  "report.rules.subtitle": "Selecciona todos los que correspondan",
   "report.rules.title": "¿Qué normas se están violando?",
-  "report.statuses.subtitle": "Selecciona todos los que aplican",
+  "report.statuses.subtitle": "Selecciona todos los que correspondan",
   "report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
   "report.submit": "Publicar",
   "report.target": "Reportando",
   "report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
   "report.thanks.title": "¿No quieres esto?",
-  "report.thanks.title_actionable": "Gracias por reportar, estudiaremos esto.",
+  "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
   "report.unfollow": "Dejar de seguir a @{name}",
-  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirlas.",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
   "search.placeholder": "Buscar",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Las búsquedas de texto recuperan publicaciones que has escrito, marcado como favoritas, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 4b57f4b81..5642d68c1 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 0b25e8e95..db57505c6 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index a81efacbb..f38138ec7 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index d5fdcebdd..35eb36f16 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Message} other {{counter} Messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Débloquer",
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer @{name}",
   "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Ne plus masquer",
   "account_note.placeholder": "Cliquez pour ajouter une note",
   "admin.dashboard.daily_retention": "Taux de maintien des utilisateur·rice·s par jour après inscription",
   "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate efter måned efter tilmelding",
@@ -410,7 +410,7 @@
   "report.reasons.other": "Pour une autre raison",
   "report.reasons.other_description": "Le problème ne correspond pas aux autres catégories",
   "report.reasons.spam": "C'est du spam",
-  "report.reasons.spam_description": "Liens malveillants, engagement mensonger ou réponses répétitives",
+  "report.reasons.spam_description": "Liens malveillants, faux engagement ou réponses répétitives",
   "report.reasons.violation": "Infraction des règles du serveur",
   "report.reasons.violation_description": "Vous savez que des règles précises sont enfreintes",
   "report.rules.subtitle": "Sélectionnez toutes les réponses appropriées",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 6db991aac..e34cdeb4c 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -168,7 +168,7 @@
   "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
   "empty_column.direct": "Aínda non tes mensaxes directas. Cando envíes ou recibas unha, amosarase aquí.",
   "empty_column.domain_blocks": "Aínda non hai dominios agochados.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!",
   "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.",
   "empty_column.favourites": "A ninguén lle gustou esta publicación polo momento. Cando a alguén lle guste, aparecerá aquí.",
   "empty_column.follow_recommendations": "Semella que non temos suxestións para ti. Podes utilizar a busca para atopar persoas que coñezas ou explorar os cancelos en voga.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Intenta desactivalas e actualiza a páxina. Se isto non funciona, podes seguir usando Mastodon nun navegador diferente ou aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar trazas (stacktrace) ó portapapeis",
   "errors.unexpected_crash.report_issue": "Informar sobre un problema",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Resultados da busca",
+  "explore.suggested_follows": "Para ti",
+  "explore.title": "Descubrir",
+  "explore.trending_links": "Novas",
+  "explore.trending_statuses": "Publicacións",
+  "explore.trending_tags": "Cancelos",
   "follow_recommendations.done": "Feito",
   "follow_recommendations.heading": "Segue a persoas das que queiras ler publicacións! Aqui tes unhas suxestións.",
   "follow_recommendations.lead": "As publicacións das persoas que segues aparecerán na túa cronoloxía de inicio ordenadas temporalmente. Non teñas medo a equivocarte, podes deixar de seguirlas igual de fácil en calquera momento!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Cronoloxía federada",
   "navigation_bar.security": "Seguranza",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} rexistrouse",
   "notification.favourite": "{name} marcou a túa publicación como favorita",
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editou unha publicación",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoxe",
   "reply_indicator.cancel": "Desbotar",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "Bloquear",
+  "report.block_explanation": "Non vas ver as súas publicacións. Nin verán as túas publicacións nin poderán seguirte. Poderán comprobar que as bloqueaches.",
   "report.categories.other": "Outro",
   "report.categories.spam": "Spam",
   "report.categories.violation": "O contido viola unha ou máis regras do servidor",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Elixe a mellor coincidencia",
+  "report.category.title": "Dinos o que está a pasar con {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicación",
+  "report.close": "Feito",
+  "report.comment.title": "Hai algo máis que creas debamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "A conta é doutro servidor. Enviar unha copia anónima da denuncia aló tamén?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Acalar",
+  "report.mute_explanation": "Non verás as súas publicacións. Poderán seguirte e ver as túas publicacións e non saberán que as acalaches.",
+  "report.next": "Seguinte",
   "report.placeholder": "Comentarios adicionais",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "Non me gusta",
+  "report.reasons.dislike_description": "Non é algo que queiras ver",
+  "report.reasons.other": "É outra cousa",
+  "report.reasons.other_description": "O asunto non cae dentro de outras categorías",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Ligazóns perigosas, relacións falsas, ou respostas repetitivas",
+  "report.reasons.violation": "Viola as regras do servidor",
+  "report.reasons.violation_description": "Daste conta de que quebra unhas normas en concreto",
+  "report.rules.subtitle": "Elixe todo o que sexa de aplicación",
+  "report.rules.title": "Que regras foron incumpridas?",
+  "report.statuses.subtitle": "Elixe todo o que corresponda",
+  "report.statuses.title": "Hai algunha publicación que apoie esta denuncia?",
   "report.submit": "Enviar",
   "report.target": "Denunciar a {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Aquí tes unhas opcións para controlar o que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mentras revisamos esto, podes tomar accións contra @{name}:",
+  "report.thanks.title": "Non queres ver esto?",
+  "report.thanks.title_actionable": "Grazas pola denuncia, investigarémola.",
+  "report.unfollow": "Non seguir a @{name}",
+  "report.unfollow_explanation": "Estás a seguir esta conta. Deixar de ver as súas publicacións na túa cronoloxía, non seguila.",
   "search.placeholder": "Procurar",
   "search_popout.search_format": "Formato de procura avanzada",
   "search_popout.tips.full_text": "Texto simple devolve toots que ti escribiches, promoviches, marcaches favoritos, ou foches mencionada, así como nomes de usuaria coincidentes, nomes públicos e cancelos.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Texto simple devolve coincidencias con nomes públicos, nomes de usuaria e cancelos",
   "search_popout.tips.user": "usuaria",
   "search_results.accounts": "Persoas",
-  "search_results.all": "All",
+  "search_results.all": "Todo",
   "search_results.hashtags": "Cancelos",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Non atopamos nada con estos termos de busca",
   "search_results.statuses": "Publicacións",
   "search_results.statuses_fts_disabled": "Procurar publicacións polo seu contido non está activado neste servidor do Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 452b64d9e..672566692 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index bb08cc92e..3071cc3eb 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index a74c819c0..f9eecf218 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 494ca5f62..75e094056 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -18,7 +18,7 @@
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
   "account.followers_counter": "{count, plural, one {{counter} Követő} other {{counter} Követő}}",
-  "account.following": "Following",
+  "account.following": "Követve",
   "account.following_counter": "{count, plural, other {{counter} Követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
   "account.follows_you": "Követ téged",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Bejegyzés} other {{counter} Bejegyzés}}",
   "account.unblock": "@{name} letiltásának feloldása",
   "account.unblock_domain": "{domain} elrejtésének feloldása",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Tiltás feloldása",
   "account.unendorse": "Ne jelenjen meg a profilodon",
   "account.unfollow": "Követés megszüntetése",
   "account.unmute": "@{name} némítás feloldása",
   "account.unmute_notifications": "@{name} némított értesítéseinek feloldása",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Némitás feloldása",
   "account_note.placeholder": "Klikk a feljegyzéshez",
   "admin.dashboard.daily_retention": "Napi regisztráció utáni felhasználómegtartási arány",
   "admin.dashboard.monthly_retention": "Havi regisztráció utáni felhasználómegtartási arány",
@@ -389,7 +389,7 @@
   "relative_time.today": "ma",
   "reply_indicator.cancel": "Mégsem",
   "report.block": "Letiltás",
-  "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem követni sem fog tudni. Azt is meg fogja tudni mondani, hogy letiltottad.",
+  "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.other": "Egyéb",
   "report.categories.spam": "Kéretlen üzenet",
   "report.categories.violation": "A tartalom a kiszolgáló egy vagy több szabályát sérti",
@@ -420,7 +420,7 @@
   "report.submit": "Küldés",
   "report.target": "{target} jelentése",
   "report.thanks.take_action": "Itt vannak a beállítások, melyek szabályozzák, hogy mit látsz a Mastodonon:",
-  "report.thanks.take_action_actionable": "Míg átnézzük, a következőket tehet @{name} ellen:",
+  "report.thanks.take_action_actionable": "Míg átnézzük, a következőket teheted @{name} ellen:",
   "report.thanks.title": "Nem akarod ezt látni?",
   "report.thanks.title_actionable": "Köszönjük, hogy jelentetted, megnézzük.",
   "report.unfollow": "@{name} követésének leállítása",
@@ -435,7 +435,7 @@
   "search_results.accounts": "Emberek",
   "search_results.all": "Összes",
   "search_results.hashtags": "Hashtagek",
-  "search_results.nothing_found": "Nincs találat erre a keresési kifejezésekre",
+  "search_results.nothing_found": "Nincs találat ezekre a keresési kifejezésekre",
   "search_results.statuses": "Bejegyzések",
   "search_results.statuses_fts_disabled": "Ezen a Mastodon szerveren nem engedélyezett a bejegyzések tartalom szerinti keresése.",
   "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 934d41a41..cd9312333 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index bc0b3c087..1b5cf6582 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -18,7 +18,7 @@
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
   "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
-  "account.following": "Following",
+  "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, other {{counter} Mengikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti siapapun.",
   "account.follows_you": "Mengikuti anda",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, other {{counter} Toot}}",
   "account.unblock": "Hapus blokir @{name}",
   "account.unblock_domain": "Buka blokir domain {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Buka blokir",
   "account.unendorse": "Jangan tampilkan di profil",
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications": "Berhenti bisukan pemberitahuan dari @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Bunyikan",
   "account_note.placeholder": "Klik untuk menambah catatan",
   "admin.dashboard.daily_retention": "Tingkat retensi pengguna perhari setelah mendaftar",
   "admin.dashboard.monthly_retention": "Tingkat retensi pengguna perbulan setelah mendaftar",
@@ -168,7 +168,7 @@
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
   "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
   "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Silakan mengecek lagi nanti!",
   "empty_column.favourited_statuses": "Anda belum memiliki toot favorit. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
   "empty_column.favourites": "Belum ada yang memfavoritkan toot ini. Ketika seseorang melakukannya, akan muncul disini.",
   "empty_column.follow_recommendations": "Sepertinya tak ada saran yang dibuat untuk Anda. Anda dapat mencoba menggunakan pencarian untuk menemukan orang yang Anda ketahui atau menjelajahi tagar yang sedang tren.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Coba nonaktifkan mereka lalu segarkan halaman. Jika tak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi murni.",
   "errors.unexpected_crash.copy_stacktrace": "Salin stacktrace ke papan klip",
   "errors.unexpected_crash.report_issue": "Laporkan masalah",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Hasil pencarian",
+  "explore.suggested_follows": "Untuk Anda",
+  "explore.title": "Jelajahi",
+  "explore.trending_links": "Berita",
+  "explore.trending_statuses": "Postingan",
+  "explore.trending_tags": "Tagar",
   "follow_recommendations.done": "Selesai",
   "follow_recommendations.heading": "Ikuti orang yang ingin Anda lihat kirimannya! Ini ada beberapa saran.",
   "follow_recommendations.lead": "Kiriman dari orang yang Anda ikuti akan tampil berdasar waktu di beranda Anda. Jangan takut membuat kesalahan, Anda dapat berhenti mengikuti mereka dengan mudah kapan saja!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Pengaturan",
   "navigation_bar.public_timeline": "Linimasa gabungan",
   "navigation_bar.security": "Keamanan",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} mendaftar",
   "notification.favourite": "{name} menyukai status anda",
   "notification.follow": "{name} mengikuti anda",
   "notification.follow_request": "{name} ingin mengikuti Anda",
@@ -320,7 +320,7 @@
   "notification.update": "{name} mengedit kiriman",
   "notifications.clear": "Hapus notifikasi",
   "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Notifikasi desktop",
   "notifications.column_settings.favourite": "Favorit:",
   "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}d",
   "relative_time.today": "hari ini",
   "reply_indicator.cancel": "Batal",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "Blokir",
+  "report.block_explanation": "Anda tidak akan melihat postingan mereka. Mereka tidak akan bisa melihat postingan Anda atau mengikuti Anda. Mereka akan mampu menduga bahwa mereka diblokir.",
   "report.categories.other": "Lainnya",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Konten melanggar satu atau lebih peraturan server",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Pilih pasangan terbaik",
+  "report.category.title": "Beritahu kami apa yang terjadi dengan {type} ini",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "postingan",
+  "report.close": "Selesai",
+  "report.comment.title": "Adakah hal lain yang perlu kami ketahui?",
   "report.forward": "Teruskan ke {target}",
   "report.forward_hint": "Akun dari server lain. Kirim salinan laporan scr anonim ke sana?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Bisukan",
+  "report.mute_explanation": "Anda tidak akan melihat postingan mereka. Mereka masih dapat mengikuti Anda dan melihat postingan Anda dan tidak akan mengetahui bahwa mereka dibisukan.",
+  "report.next": "Selanjutnya",
   "report.placeholder": "Komentar tambahan",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "Saya tidak menyukainya",
+  "report.reasons.dislike_description": "Ini bukan hal yang ingin Anda lihat",
+  "report.reasons.other": "Itu sesuatu yang lain",
+  "report.reasons.other_description": "Permasalahan ini tidak sesuai pada kategori lain",
+  "report.reasons.spam": "Ini spam",
+  "report.reasons.spam_description": "Tautan berbahaya, interaksi palsu, atau balasan berulang",
+  "report.reasons.violation": "Melanggar ketentuan server",
+  "report.reasons.violation_description": "Anda menyadari bahwa ia melanggar ketentuan tertentu",
+  "report.rules.subtitle": "Pilih semua yang berlaku",
+  "report.rules.title": "Ketentuan manakah yang dilanggar?",
+  "report.statuses.subtitle": "Pilih semua yang berlaku",
+  "report.statuses.title": "Adakah postingan yang mendukung pelaporan ini?",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Berikut adalah pilihan Anda untuk mengatur apa yang Anda lihat di Mastodon:",
+  "report.thanks.take_action_actionable": "Ketika kami meninjau ini, Anda dapat mengambil tindakan terhadap @{name}:",
+  "report.thanks.title": "Tidak ingin melihat ini?",
+  "report.thanks.title_actionable": "Terima kasih atas pelaporan Anda, kami akan memeriksa ini lebih lanjut.",
+  "report.unfollow": "Berhenti mengikuti @{name}",
+  "report.unfollow_explanation": "Anda mengikuti akun ini. Untuk tidak melihat postingan mereka di Beranda Anda, berhenti mengikuti mereka.",
   "search.placeholder": "Pencarian",
   "search_popout.search_format": "Format pencarian mahir",
   "search_popout.tips.full_text": "Teks simpel menampilkan status yang Anda tulis, favoritkan, boost-kan, atau status yang menyebut Anda, serta nama pengguna, nama yang ditampilkan, dan tagar yang cocok.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Teks sederhana menampilkan nama yang ditampilkan, nama pengguna, dan tagar yang cocok",
   "search_popout.tips.user": "pengguna",
   "search_results.accounts": "Orang",
-  "search_results.all": "All",
+  "search_results.all": "Semua",
   "search_results.hashtags": "Tagar",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Tidak dapat menemukan apapun untuk istilah-istilah pencarian ini",
   "search_results.statuses": "Toot",
   "search_results.statuses_fts_disabled": "Pencarian toot berdasarkan konten tidak diaktifkan di server Mastadon ini.",
   "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index a60f68fba..b15bde61e 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index ab8c55d1e..411bf18cf 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -18,7 +18,7 @@
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjandi} other {{counter} fylgjendur}}",
-  "account.following": "Following",
+  "account.following": "Fylgist með",
   "account.following_counter": "{count, plural, one {{counter} fylgist með} other {{counter} fylgjast með}}",
   "account.follows.empty": "Þessi notandi fylgist ennþá ekki með neinum.",
   "account.follows_you": "Fylgir þér",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "account.unblock": "Aflétta útilokun af @{name}",
   "account.unblock_domain": "Aflétta útilokun lénsins {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Hætta að loka á",
   "account.unendorse": "Ekki birta á notandasniði",
   "account.unfollow": "Hætta að fylgja",
   "account.unmute": "Hætta að þagga niður í @{name}",
   "account.unmute_notifications": "Hætta að þagga tilkynningar frá @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Hætta að þagga niður",
   "account_note.placeholder": "Smelltu til að bæta við minnispunkti",
   "admin.dashboard.daily_retention": "Hlutfall virkra notenda eftir nýskráningu eftir dögum",
   "admin.dashboard.monthly_retention": "Hlutfall virkra notenda eftir nýskráningu eftir mánuðum",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 389986ef5..0f7d2f71b 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -18,7 +18,7 @@
   "account.followers": "Follower",
   "account.followers.empty": "Nessuno segue ancora questo utente.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
-  "account.following": "Following",
+  "account.following": "Seguiti",
   "account.following_counter": "{count, plural, other {{counter} Seguiti}}",
   "account.follows.empty": "Questo utente non segue nessuno ancora.",
   "account.follows_you": "Ti segue",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Post}}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Sblocca il dominio {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Sblocca",
   "account.unendorse": "Non mostrare sul profilo",
   "account.unfollow": "Smetti di seguire",
   "account.unmute": "Riattiva @{name}",
   "account.unmute_notifications": "Riattiva le notifiche da @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Riattiva l'audio",
   "account_note.placeholder": "Clicca per aggiungere una nota",
   "admin.dashboard.daily_retention": "Tasso di ritenzione utente per giorno dopo la registrazione",
   "admin.dashboard.monthly_retention": "Tasso di ritenzione utente per mese dopo la registrazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 19b8cb705..f66cf49f3 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -191,12 +191,12 @@
   "error.unexpected_crash.next_steps_addons": "それらを無効化してからリロードをお試しください。それでも解決しない場合、他のブラウザやアプリで Mastodon をお試しください。",
   "errors.unexpected_crash.copy_stacktrace": "スタックトレースをクリップボードにコピー",
   "errors.unexpected_crash.report_issue": "問題を報告",
-  "explore.search_results": "Search results",
+  "explore.search_results": "検索結果",
   "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.title": "エクスプローラー",
+  "explore.trending_links": "ニュース",
+  "explore.trending_statuses": "投稿",
+  "explore.trending_tags": "ハッシュタグ",
   "follow_recommendations.done": "完了",
   "follow_recommendations.heading": "投稿を見たい人をフォローしてください!ここにおすすめがあります。",
   "follow_recommendations.lead": "あなたがフォローしている人の投稿は、ホームフィードに時系列で表示されます。いつでも簡単に解除できるので、気軽にフォローしてみてください!",
@@ -313,7 +313,7 @@
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.misc": "その他",
   "navigation_bar.security": "セキュリティ",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} がサインアップしました",
   "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
@@ -393,34 +393,34 @@
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今日",
   "reply_indicator.cancel": "キャンセル",
-  "report.block": "Block",
+  "report.block": "ブロック",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.other": "その他",
   "report.categories.spam": "スパム",
   "report.categories.violation": "サーバーのルールに違反",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
+  "report.category.title_account": "プロフィール",
+  "report.category.title_status": "投稿",
+  "report.close": "完了",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "{target} に転送する",
   "report.forward_hint": "このアカウントは別のサーバーに所属しています。通報内容を匿名で転送しますか?",
-  "report.mute": "Mute",
+  "report.mute": "ミュート",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "次へ",
   "report.placeholder": "追加コメント",
   "report.reasons.dislike": "I don't like it",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "サーバーのルールに違反しています",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
+  "report.rules.subtitle": "当てはまるものをすべて選んでください:",
+  "report.rules.title": "どのルールに違反していますか?",
+  "report.statuses.subtitle": "当てはまるものをすべて選んでください:",
   "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "通報する",
   "report.target": "{target}さんを通報する",
@@ -428,8 +428,8 @@
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
   "report.thanks.title": "Don't want to see this?",
   "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.unfollow": "@{name}のフォローを解除",
+  "report.unfollow_explanation": "このアカウントをフォローしています。ホームフィードに彼らの投稿を表示しないようにするには、彼らのフォローを外してください。",
   "search.placeholder": "検索",
   "search_popout.search_format": "高度な検索フォーマット",
   "search_popout.tips.full_text": "表示名やユーザー名、ハッシュタグのほか、あなたの投稿やお気に入り、ブーストした投稿、返信に一致する単純なテキスト。",
@@ -438,7 +438,7 @@
   "search_popout.tips.text": "表示名やユーザー名、ハッシュタグに一致する単純なテキスト",
   "search_popout.tips.user": "ユーザー",
   "search_results.accounts": "人々",
-  "search_results.all": "All",
+  "search_results.all": "すべて",
   "search_results.hashtags": "ハッシュタグ",
   "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "投稿",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index fd848a164..84ea5e85d 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 213f529e3..cc255d1b3 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -188,11 +188,11 @@
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
   "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
+  "explore.suggested_follows": "I kečč·kem",
   "explore.title": "Explore",
   "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_statuses": "Tisuffaɣ",
+  "explore.trending_tags": "Ihacṭagen",
   "follow_recommendations.done": "Immed",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
@@ -395,13 +395,13 @@
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
+  "report.category.title_account": "ameγnu",
+  "report.category.title_status": "tasuffeɣt",
+  "report.close": "Immed",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Bren-it ɣeṛ {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.mute": "Mute",
+  "report.mute": "Sgugem",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
   "report.next": "Next",
   "report.placeholder": "Iwenniten-nniḍen",
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 1802d5fdf..3e4ac2be6 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/kmr.json b/app/javascript/mastodon/locales/kmr.json
index 43468eee4..f6fe83799 100644
--- a/app/javascript/mastodon/locales/kmr.json
+++ b/app/javascript/mastodon/locales/kmr.json
@@ -18,7 +18,7 @@
   "account.followers": "Şopîner",
   "account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following": "Following",
+  "account.following": "Dişopîne",
   "account.following_counter": "{count, plural, one {{counter} Dişopîne} other {{counter} Dişopîne}}",
   "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
   "account.follows_you": "Te dişopîne",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural,one {{counter} şandî}other {{counter} şandî}}",
   "account.unblock": "Astengê li ser @{name} rake",
   "account.unblock_domain": "Astengê li ser navperê {domain} rake",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Astengiyê rake",
   "account.unendorse": "Li ser profîl nîşan neke",
   "account.unfollow": "Neşopîne",
   "account.unmute": "@{name} Bêdeng bike",
   "account.unmute_notifications": "Agahdariyan ji @{name} bêdeng bike",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Bêdeng neke",
   "account_note.placeholder": "Bitikîne bo nîşeyekê tevlî bikî",
   "admin.dashboard.daily_retention": "Rêjeya ragirtina bikarhêner bi roj piştî tomarkirinê",
   "admin.dashboard.monthly_retention": "Rêjeya ragirtina bikarhêner bi meh piştî tomarkirinê",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 133ad1848..f64cc3d3f 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 79f6de035..dade7bc17 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -18,7 +18,7 @@
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 유저를 팔로우하고 있지 않습니다.",
   "account.followers_counter": "{counter} 팔로워",
-  "account.following": "Following",
+  "account.following": "팔로잉",
   "account.following_counter": "{counter} 팔로잉",
   "account.follows.empty": "이 유저는 아직 아무도 팔로우하고 있지 않습니다.",
   "account.follows_you": "날 팔로우합니다",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{counter} 게시물",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
   "account.unfollow": "팔로우 해제",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications": "@{name}의 알림 뮤트 해제",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "뮤트 해제",
   "account_note.placeholder": "클릭해서 노트 추가",
   "admin.dashboard.daily_retention": "가입 후 일별 사용자 유지율",
   "admin.dashboard.monthly_retention": "가입 후 월별 사용자 유지율",
@@ -134,8 +134,8 @@
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 포스트에 대한 부스트와 즐겨찾기를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.reply.confirm": "답글",
   "confirmations.reply.message": "답글을 달기 위해 현재 작성 중인 메시지가 덮어 씌워집니다. 진행하시겠습니까?",
-  "confirmations.unfollow.confirm": "언팔로우",
-  "confirmations.unfollow.message": "정말로 {name}를 언팔로우하시겠습니까?",
+  "confirmations.unfollow.confirm": "팔로우 해제",
+  "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
@@ -168,7 +168,7 @@
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
   "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
   "empty_column.favourited_statuses": "아직 즐겨찾기 한 게시물이 없습니다. 게시물을 즐겨찾기 하면 여기에 나타납니다.",
   "empty_column.favourites": "아직 아무도 이 게시물을 즐겨찾기 하지 않았습니다. 누군가 즐겨찾기를 하면 여기에 나타납니다.",
   "empty_column.follow_recommendations": "당신을 위한 제안이 생성될 수 없는 것 같습니다. 알 수도 있는 사람을 검색하거나 유행하는 해시태그를 둘러볼 수 있습니다.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "그것들을 끄고 페이지를 새로고침 해보세요. 그래도 해결되지 않는 경우, 다른 브라우저나 네이티브 앱으로도 마스토돈을 이용하실 수 있습니다.",
   "errors.unexpected_crash.copy_stacktrace": "에러 내용을 클립보드에 복사",
   "errors.unexpected_crash.report_issue": "문제 신고",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "검색 결과",
+  "explore.suggested_follows": "당신을 위한 추천",
+  "explore.title": "둘러보기",
+  "explore.trending_links": "소식",
+  "explore.trending_statuses": "게시물",
+  "explore.trending_tags": "해시태그",
   "follow_recommendations.done": "완료",
   "follow_recommendations.heading": "게시물을 받아 볼 사람들을 팔로우 하세요! 여기 몇몇의 추천이 있습니다.",
   "follow_recommendations.lead": "당신이 팔로우 하는 사람들의 게시물이 시간순으로 정렬되어 당신의 홈 피드에 표시될 것입니다. 실수를 두려워 하지 마세요, 언제든지 쉽게 팔로우 취소를 할 수 있습니다!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "사용자 설정",
   "navigation_bar.public_timeline": "연합 타임라인",
   "navigation_bar.security": "보안",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} 님이 가입했습니다",
   "notification.favourite": "{name} 님이 즐겨찾기 했습니다",
   "notification.follow": "{name} 님이 나를 팔로우 했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
@@ -320,7 +320,7 @@
   "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notifications.clear": "알림 지우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "즐겨찾기:",
   "notifications.column_settings.filter_bar.advanced": "카테고리의 모든 종류를 표시",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
   "reply_indicator.cancel": "취소",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "차단",
+  "report.block_explanation": "당신은 그의 게시물을 보지 않게 됩니다. 그는 당신의 게시물을 보거나 팔로우 할 수 없습니다. 그가 차단되었다는 사실을 알 수 있습니다.",
   "report.categories.other": "기타",
   "report.categories.spam": "스팸",
   "report.categories.violation": "컨텐츠가 한 개 이상의 서버 규칙을 위반합니다",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "가장 알맞은 것을 선택하세요",
+  "report.category.title": "이 {type}에 무슨 문제가 있는지 알려주세요",
+  "report.category.title_account": "프로필",
+  "report.category.title_status": "게시물",
+  "report.close": "완료",
+  "report.comment.title": "우리가 더 알아야 할 내용이 있나요?",
   "report.forward": "{target}에 포워드 됨",
   "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "침묵",
+  "report.mute_explanation": "당신은 그의 게시물을 보지 않게 됩니다. 그는 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 뮤트 되었는지 알지 못합니다.",
+  "report.next": "다음",
   "report.placeholder": "코멘트",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "마음에 안듭니다",
+  "report.reasons.dislike_description": "내가 보기 싫은 종류에 속합니다",
+  "report.reasons.other": "기타",
+  "report.reasons.other_description": "이슈가 다른 분류에 속하지 않습니다",
+  "report.reasons.spam": "스팸입니다",
+  "report.reasons.spam_description": "악성 링크, 반응 스팸, 또는 반복적인 답글",
+  "report.reasons.violation": "서버 규칙을 위반합니다",
+  "report.reasons.violation_description": "특정 규칙을 위반합니다",
+  "report.rules.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.rules.title": "어떤 규칙을 위반했나요?",
+  "report.statuses.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.statuses.title": "이 신고에 대해서 더 참고해야 할 게시물이 있나요?",
   "report.submit": "신고하기",
   "report.target": "{target} 신고하기",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "마스토돈에서 나에게 보이는 것을 조절하기 위한 몇 가지 선택사항들이 존재합니다:",
+  "report.thanks.take_action_actionable": "서버의 중재자들이 이것을 심사하는 동안, 당신은 @{name}에 대한 행동을 취할 수 있습니다:",
+  "report.thanks.title": "이런 것을 보지 않길 원하나요?",
+  "report.thanks.title_actionable": "신고해주셔서 감사합니다, 중재자분들이 확인할 예정입니다.",
+  "report.unfollow": "@{name}을 팔로우 해제",
+  "report.unfollow_explanation": "당신을 이 계정을 팔로우 하고 있습니다. 홈 피드에서 게시물을 보지 않으려면, 팔로우를 해제하세요.",
   "search.placeholder": "검색",
   "search_popout.search_format": "고급 검색 방법",
   "search_popout.tips.full_text": "단순한 텍스트 검색은 당신이 작성했거나, 관심글로 지정했거나, 부스트했거나, 멘션을 받은 게시글, 그리고 유저네임, 디스플레이네임, 해시태그를 반환합니다.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "단순한 텍스트 검색은 관계된 프로필 이름, 유저 이름 그리고 해시태그를 표시합니다",
   "search_popout.tips.user": "유저",
   "search_results.accounts": "사람",
-  "search_results.all": "All",
+  "search_results.all": "전부",
   "search_results.hashtags": "해시태그",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "검색어에 대한 결과를 찾을 수 없습니다",
   "search_results.statuses": "게시물",
   "search_results.statuses_fts_disabled": "이 마스토돈 서버에선 게시물의 내용을 통한 검색이 활성화 되어 있지 않습니다.",
   "search_results.total": "{count, number}건의 결과",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 5a3e5a1f2..0cde9e388 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 068732610..47eda8b82 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 57f6c6216..44ee9a6f9 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index aa3c6de3d..39f1c24ac 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -18,7 +18,7 @@
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam patreiz nav sekotāju.",
   "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
-  "account.following": "Following",
+  "account.following": "Seko",
   "account.following_counter": "{count, plural, one {{counter} Sekojošs} other {{counter} Sekojoši}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.follows_you": "Seko tev",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}}",
   "account.unblock": "Atbloķēt lietotāju @{name}",
   "account.unblock_domain": "Atbloķēt domēnu {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Atbloķēt",
   "account.unendorse": "Neattēlot profilā",
   "account.unfollow": "Pārstāt sekot",
   "account.unmute": "Noņemt apklusinājumu @{name}",
   "account.unmute_notifications": "Rādīt paziņojumus no lietotāja @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Ieslēgt skaņu",
   "account_note.placeholder": "Noklikšķiniet, lai pievienotu piezīmi",
   "admin.dashboard.daily_retention": "Lietotāju saglabāšanas rādītājs dienā pēc reģistrēšanās",
   "admin.dashboard.monthly_retention": "Lietotāju saglabāšanas rādītājs mēnesī pēc reģistrēšanās",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index a263d407b..e4eb048b4 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index f20de5554..baea4c267 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 213c6c80d..d1a3cac6a 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 7b79d38a5..40e816af6 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 4ab0d3b64..620d18230 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ddfeb2a97..a634228ef 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 896989b14..233cd6834 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index b1ee0a977..ffdb8ece0 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index d31ed3fe9..3b450f89a 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 481675f5c..05d4d2ac6 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -18,7 +18,7 @@
   "account.followers": "Śledzący",
   "account.followers.empty": "Nikt jeszcze nie śledzi tego użytkownika.",
   "account.followers_counter": "{count, plural, one {{counter} śledzący} few {{counter} śledzących} many {{counter} śledzących} other {{counter} śledzących}}",
-  "account.following": "Following",
+  "account.following": "Śledzenie",
   "account.following_counter": "{count, plural, one {{counter} śledzony} few {{counter} śledzonych} many {{counter} śledzonych} other {{counter} śledzonych}}",
   "account.follows.empty": "Ten użytkownik nie śledzi jeszcze nikogo.",
   "account.follows_you": "Śledzi Cię",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Odblokuj",
   "account.unendorse": "Przestań polecać",
   "account.unfollow": "Przestań śledzić",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "account.unmute_notifications": "Cofnij wyciszenie powiadomień od @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Włącz dźwięki",
   "account_note.placeholder": "Naciśnij aby dodać notatkę",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@@ -415,7 +415,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Niebezpieczne linki, fałszywe zaangażowanie lub powtarzające się odpowiedzi",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index d23b5bfda..368c5dc7b 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -187,10 +187,10 @@
   "error.unexpected_crash.next_steps_addons": "Tente desativá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar dados do erro para área de transferência",
   "errors.unexpected_crash.report_issue": "Reportar problema",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
+  "explore.search_results": "Resultado da pesquisa",
+  "explore.suggested_follows": "Para você",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Novidades",
   "explore.trending_statuses": "Posts",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Salvar",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Linha global",
   "navigation_bar.security": "Segurança",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} se inscreveu",
   "notification.favourite": "{name} favoritou teu toot",
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editou uma publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
@@ -388,41 +388,41 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
-  "report.block": "Block",
+  "report.block": "Bloquear",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.other": "Outro",
   "report.categories.spam": "Spam",
   "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicação",
+  "report.close": "Concluído",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Encaminhar para {target}",
   "report.forward_hint": "A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá?",
-  "report.mute": "Mute",
+  "report.mute": "Silenciar",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Próximo",
   "report.placeholder": "Comentários adicionais aqui",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "Eu não gosto disso",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.other_description": "O problema não se encaixa em outras categorias",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
+  "report.reasons.violation_description": "Você está ciente de que isso quebra regras específicas",
+  "report.rules.subtitle": "Selecione tudo que se aplica",
   "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.subtitle": "Selecione tudo que se aplica",
   "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Enviar",
   "report.target": "Denunciando {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.thanks.take_action_actionable": "Enquanto revisamos isso, você pode tomar medidas contra @{name}:",
+  "report.thanks.title": "Não quer ver isto?",
+  "report.thanks.title_actionable": "Obrigado por reportar. Vamos analisar.",
   "report.unfollow": "Unfollow @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "search.placeholder": "Pesquisar",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Texto simples retorna nomes de exibição e de usuário, e hashtags correspondentes",
   "search_popout.tips.user": "usuário",
   "search_results.accounts": "Pessoas",
-  "search_results.all": "All",
+  "search_results.all": "Tudo",
   "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Não foi possível encontrar nada para estes termos de busca",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Pesquisar toots por seu conteúdo não está ativado nesta instância Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index d36e2d0ef..b83f57a14 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -18,7 +18,7 @@
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
-  "account.following": "Following",
+  "account.following": "A seguir",
   "account.following_counter": "{count, plural, other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
   "account.follows_you": "Segue-te",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Mostrar {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "Não mostrar no perfil",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
   "account.unmute_notifications": "Deixar de silenciar @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Deixar de silenciar",
   "account_note.placeholder": "Clique para adicionar nota",
   "admin.dashboard.daily_retention": "Taxa de retenção de utilizadores por dia após a inscrição",
   "admin.dashboard.monthly_retention": "Taxa de retenção de utilizadores por mês após a inscrição",
@@ -168,7 +168,7 @@
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
   "empty_column.direct": "Ainda não tem qualquer mensagem direta. Quando enviar ou receber alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Nada em destaque por agora. Volte mais tarde!",
   "empty_column.favourited_statuses": "Ainda não tens quaisquer toots favoritos. Quando tiveres algum, ele irá aparecer aqui.",
   "empty_column.favourites": "Ainda ninguém marcou este toot como favorito. Quando alguém o fizer, ele irá aparecer aqui.",
   "empty_column.follow_recommendations": "Parece que não foi possível gerar nenhuma sugestão para si. Pode tentar utilizar a pesquisa para procurar pessoas que conheça ou explorar as hashtags em destaque.",
@@ -187,11 +187,11 @@
   "error.unexpected_crash.next_steps_addons": "Tente desabilitá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar a stacktrace para o clipboard",
   "errors.unexpected_crash.report_issue": "Reportar problema",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
+  "explore.search_results": "Resultados da pesquisa",
+  "explore.suggested_follows": "Para si",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Notícias",
+  "explore.trending_statuses": "Publicações",
   "explore.trending_tags": "Hashtags",
   "follow_recommendations.done": "Concluído",
   "follow_recommendations.heading": "Siga pessoas das quais gostaria de ver publicações! Aqui estão algumas sugestões.",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.security": "Segurança",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} inscreveu-se",
   "notification.favourite": "{name} adicionou a tua publicação aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
@@ -320,7 +320,7 @@
   "notification.update": "{name} editou uma publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.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.other": "Outro",
   "report.categories.spam": "Spam",
   "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Escolha a melhor correspondência",
+  "report.category.title": "Diga-nos o que se passa com esse {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicação",
+  "report.close": "Concluído",
+  "report.comment.title": "Há algo mais que pensa que devemos saber?",
   "report.forward": "Reenviar para {target}",
   "report.forward_hint": "A conta é de outro servidor. Enviar uma cópia anónima da denúncia para lá também?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "Não verá as publicações deles. Eles ainda poderão segui-lo e ver as suas publicações e não saberão que estão silenciados.",
+  "report.next": "Seguinte",
   "report.placeholder": "Comentários adicionais",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "Não gosto disso",
+  "report.reasons.dislike_description": "Não é algo que deseje ver",
+  "report.reasons.other": "É outra coisa",
+  "report.reasons.other_description": "O problema não se encaixa nas outras categorias",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Links maliciosos, contactos falsos, ou respostas repetitivas",
+  "report.reasons.violation": "Viola as regras do servidor",
+  "report.reasons.violation_description": "Está ciente de que infringe regras específicas",
+  "report.rules.subtitle": "Selecione tudo o que se aplicar",
+  "report.rules.title": "Que regras estão a ser violadas?",
+  "report.statuses.subtitle": "Selecione tudo o que se aplicar",
+  "report.statuses.title": "Existe alguma publicação que suporte esta denúncia?",
   "report.submit": "Enviar",
   "report.target": "A denunciar {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Aqui estão as suas opções para controlar o que vê no Mastodon:",
+  "report.thanks.take_action_actionable": "Enquanto revemos a sua denúncia, pode tomar medidas contra @{name}:",
+  "report.thanks.title": "Não quer ver isto?",
+  "report.thanks.title_actionable": "Obrigado por reportar, vamos analisar.",
+  "report.unfollow": "Deixar de seguir @{name}",
+  "report.unfollow_explanation": "Está a seguir esta conta. Para não ver mais as publicações desta conta na sua página inicial, deixe de segui-la.",
   "search.placeholder": "Pesquisar",
   "search_popout.search_format": "Formato avançado de pesquisa",
   "search_popout.tips.full_text": "Texto simples devolve publicações que escreveu, marcou como favorita, partilhou ou em que foi mencionado, tal como nomes de utilizador, alcunhas e hashtags.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "O texto simples retorna a correspondência de nomes, utilizadores e hashtags",
   "search_popout.tips.user": "utilizador",
   "search_results.accounts": "Pessoas",
-  "search_results.all": "All",
+  "search_results.all": "Tudo",
   "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Não foi possível encontrar resultados para as expressões pesquisadas",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "A pesquisa de toots pelo seu conteúdo não está disponível nesta instância Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index aed16677e..6e8296317 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index cacfac23a..20386a66f 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} пост} many {{counter} постов} other {{counter} поста}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Разблокировать",
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unfollow": "Отписаться",
   "account.unmute": "Убрать {name} из игнорируемых",
   "account.unmute_notifications": "Показывать уведомления от @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Не игнорировать",
   "account_note.placeholder": "Текст заметки",
   "admin.dashboard.daily_retention": "Уровень удержания пользователей после регистрации, в днях",
   "admin.dashboard.monthly_retention": "Уровень удержания пользователей после регистрации, в месяцах",
@@ -54,7 +54,7 @@
   "admin.dashboard.retention.cohort": "Месяц регистрации",
   "admin.dashboard.retention.cohort_size": "Новые пользователи",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Вы выполняете действие слишком часто",
+  "alert.rate_limited.title": "Ограничение количества запросов",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Упс!",
   "announcement.announcement": "Объявление",
@@ -168,7 +168,7 @@
   "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
   "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
   "empty_column.domain_blocks": "Скрытых доменов пока нет.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Нет актуального. Проверьте позже!",
   "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.",
   "empty_column.favourites": "Никто ещё не добавил этот пост в «Избранное». Как только кто-то это сделает, это отобразится здесь.",
   "empty_column.follow_recommendations": "Похоже, у нас нет предложений для вас. Вы можете попробовать поискать людей, которых уже знаете, или изучить актуальные хэштеги.",
@@ -187,7 +187,7 @@
   "error.unexpected_crash.next_steps_addons": "Попробуйте их отключить и перезагрузить страницу. Если это не поможет, вы по-прежнему сможете войти в Mastodon через другой браузер или приложение.",
   "errors.unexpected_crash.copy_stacktrace": "Скопировать диагностическую информацию",
   "errors.unexpected_crash.report_issue": "Сообщить о проблеме",
-  "explore.search_results": "Search results",
+  "explore.search_results": "Результаты поиска",
   "explore.suggested_follows": "Для вас",
   "explore.title": "Обзор",
   "explore.trending_links": "Новости",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Настройки",
   "navigation_bar.public_timeline": "Глобальная лента",
   "navigation_bar.security": "Безопасность",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} зарегистрирован",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
@@ -320,7 +320,7 @@
   "notification.update": "{name} изменил(а) пост",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
   "notifications.column_settings.favourite": "Ваш пост добавили в «избранное»:",
   "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
@@ -337,7 +337,7 @@
   "notifications.column_settings.status": "Новые посты:",
   "notifications.column_settings.unread_notifications.category": "Непрочитанные уведомления",
   "notifications.column_settings.unread_notifications.highlight": "Выделять непрочитанные уведомления",
-  "notifications.column_settings.update": "Изменения:",
+  "notifications.column_settings.update": "Правки:",
   "notifications.filter.all": "Все",
   "notifications.filter.boosts": "Продвижения",
   "notifications.filter.favourites": "Отметки «избранного»",
@@ -394,23 +394,23 @@
   "report.categories.spam": "Спам",
   "report.categories.violation": "Содержимое нарушает одно или несколько правил узла",
   "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.title": "Расскажите нам, что происходит с {type}",
+  "report.category.title_account": "профиль",
+  "report.category.title_status": "пост",
+  "report.close": "Готово",
+  "report.comment.title": "Есть что-нибудь еще, что мы должны знать?",
   "report.forward": "Переслать в {target}",
   "report.forward_hint": "Эта учётная запись расположена на другом узле. Отправить туда анонимную копию вашей жалобы?",
   "report.mute": "Mute",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Далее",
   "report.placeholder": "Комментарий",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "Мне не нравится",
   "report.reasons.dislike_description": "It is not something you want to see",
   "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.other_description": "Проблема не подпадает под другие категории",
+  "report.reasons.spam": "Это спам",
+  "report.reasons.spam_description": "Вредоносные ссылки, поддельные действия или повторяющиеся ответы",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
@@ -421,9 +421,9 @@
   "report.target": "Жалоба на {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
+  "report.thanks.title": "Не хотите видеть это?",
+  "report.thanks.title_actionable": "Спасибо за обращение, мы его рассмотрим.",
+  "report.unfollow": "Отписаться от @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "search.placeholder": "Поиск",
   "search_popout.search_format": "Продвинутый формат поиска",
@@ -433,7 +433,7 @@
   "search_popout.tips.text": "Простой ввод текста покажет совпадающие имена пользователей, отображаемые имена и хэштеги",
   "search_popout.tips.user": "пользователь",
   "search_results.accounts": "Люди",
-  "search_results.all": "All",
+  "search_results.all": "Все",
   "search_results.hashtags": "Хэштеги",
   "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Посты",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index d94bf8c31..30a4596b2 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 0f77e776b..2923eb27c 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index bec751ac7..1b1b63eed 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -52,7 +52,7 @@
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.retention.cohort_size": "නව පරිශීලකයින්",
   "alert.rate_limited.message": "කරුණාකර {retry_time, time, medium} ට පසු නැවත උත්සාහ කරන්න.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
@@ -121,7 +121,7 @@
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.confirm": "ඉවත ලන්න",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "සම්පූර්ණ වසම අවහිර කරන්න",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index deb9ffafc..398b0b180 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -18,7 +18,7 @@
   "account.followers": "Sledujúci",
   "account.followers.empty": "Tohto používateľa ešte nikto nenásleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúci} other {{counter} Sledujúci}}",
-  "account.following": "Following",
+  "account.following": "Nasledujem",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "Tento používateľ ešte nikoho nenasleduje.",
   "account.follows_you": "Nasleduje ťa",
@@ -31,7 +31,7 @@
   "account.moved_to": "{name} sa presunul/a na:",
   "account.mute": "Nevšímaj si @{name}",
   "account.mute_notifications": "Stĺm oboznámenia od @{name}",
-  "account.muted": "Utíšený/á",
+  "account.muted": "Nevšímaný/á",
   "account.posts": "Príspevky",
   "account.posts_with_replies": "Príspevky, aj s odpoveďami",
   "account.report": "Nahlás @{name}",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Prestaň skrývať {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Odblokuj",
   "account.unendorse": "Nezobrazuj na profile",
   "account.unfollow": "Prestaň následovať",
   "account.unmute": "Prestaň ignorovať @{name}",
-  "account.unmute_notifications": "Zruš stĺmenie oboznámení od @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_notifications": "Zruš nevšímanie si oznámení od @{name}",
+  "account.unmute_short": "Zruš nevšímanie",
   "account_note.placeholder": "Klikni pre vloženie poznámky",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@@ -77,7 +77,7 @@
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
-  "column.mutes": "Ignorovaní užívatelia",
+  "column.mutes": "Nevšímaní užívatelia",
   "column.notifications": "Oboznámenia",
   "column.pins": "Pripnuté príspevky",
   "column.public": "Federovaná časová os",
@@ -106,7 +106,7 @@
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
   "compose_form.publish": "Pošli",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
+  "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ý",
@@ -127,9 +127,9 @@
   "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.logout.confirm": "Odhlás sa",
   "confirmations.logout.message": "Si si istý/á, že sa chceš odhlásiť?",
-  "confirmations.mute.confirm": "Ignoruj",
+  "confirmations.mute.confirm": "Nevšímaj si",
   "confirmations.mute.explanation": "Toto nastavenie pred tebou skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa následovať.",
-  "confirmations.mute.message": "Naozaj chceš ignorovať {name}?",
+  "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
   "confirmations.redraft.confirm": "Vyčisti a prepíš",
   "confirmations.redraft.message": "Si si istý/á, že chceš premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.reply.confirm": "Odpovedz",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Skús ich vypnúť, a obnoviť túto stránku. Ak to nepomôže, pravdepodobne budeš stále môcť Mastodon používať cez iný prehliadač, alebo natívnu aplikáciu.",
   "errors.unexpected_crash.copy_stacktrace": "Skopíruj stacktrace do schránky",
   "errors.unexpected_crash.report_issue": "Nahlás problém",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
+  "explore.search_results": "Výsledky hľadania",
+  "explore.suggested_follows": "Pre teba",
   "explore.title": "Explore",
   "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_statuses": "Príspevky",
+  "explore.trending_tags": "Haštagy",
   "follow_recommendations.done": "Hotovo",
   "follow_recommendations.heading": "Následuj ľudí od ktorých by si chcel/a vidieť príspevky! Tu sú nejaké návrhy.",
   "follow_recommendations.lead": "Príspevky od ľudi ktorých sledujete sa zobrazia v chronologickom poradí na Vašej nástenke. Nebojte sa spraviť chyby, vždy môžete zrušiť sledovanie konkrétnych ľudí!",
@@ -302,7 +302,7 @@
   "navigation_bar.keyboard_shortcuts": "Klávesové skratky",
   "navigation_bar.lists": "Zoznamy",
   "navigation_bar.logout": "Odhlás sa",
-  "navigation_bar.mutes": "Ignorovaní užívatelia",
+  "navigation_bar.mutes": "Stíšení užívatelia",
   "navigation_bar.personal": "Osobné",
   "navigation_bar.pins": "Pripnuté príspevky",
   "navigation_bar.preferences": "Nastavenia",
@@ -337,7 +337,7 @@
   "notifications.column_settings.status": "Nové príspevky:",
   "notifications.column_settings.unread_notifications.category": "Neprečítané oboznámenia",
   "notifications.column_settings.unread_notifications.highlight": "Zdôrazni neprečítané oboznámenia",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Všetky",
   "notifications.filter.boosts": "Vyzdvihnutia",
   "notifications.filter.favourites": "Obľúbené",
@@ -379,7 +379,7 @@
   "relative_time.days": "{number}dní",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
-  "relative_time.full.just_now": "just now",
+  "relative_time.full.just_now": "práve teraz",
   "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
   "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}hod",
@@ -395,23 +395,23 @@
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
   "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
+  "report.category.title_account": "profilom",
+  "report.category.title_status": "príspevkom",
+  "report.close": "Hotovo",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Posuň ku {target}",
   "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
-  "report.mute": "Mute",
+  "report.mute": "Nevšímaj si",
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Ďalej",
   "report.placeholder": "Ďalšie komentáre",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
+  "report.reasons.dislike": "Nepáči sa mi",
+  "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
+  "report.reasons.other": "Je to niečo iné",
   "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
+  "report.reasons.spam": "Je to spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "Porušuje pravidlá servera",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
   "report.rules.title": "Which rules are being violated?",
@@ -421,7 +421,7 @@
   "report.target": "Nahlás {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title": "Nechceš to vidieť?",
   "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
   "report.unfollow": "Unfollow @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
@@ -449,7 +449,7 @@
   "status.delete": "Zmazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",
   "status.direct": "Priama správa pre @{name}",
-  "status.edit": "Edit",
+  "status.edit": "Uprav",
   "status.edited": "Edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Vložiť",
@@ -461,8 +461,8 @@
   "status.media_hidden": "Skryté médiá",
   "status.mention": "Spomeň @{name}",
   "status.more": "Viac",
-  "status.mute": "Utíš @{name}",
-  "status.mute_conversation": "Ignoruj konverzáciu",
+  "status.mute": "Nevšímaj si @{name}",
+  "status.mute_conversation": "Nevšímaj si konverzáciu",
   "status.open": "Otvor tento príspevok",
   "status.pin": "Pripni na profil",
   "status.pinned": "Pripnutý príspevok",
@@ -484,7 +484,7 @@
   "status.show_more_all": "Všetkým ukáž viac",
   "status.show_thread": "Ukáž diskusné vlákno",
   "status.uncached_media_warning": "Nedostupný/é",
-  "status.unmute_conversation": "Prestaň ignorovať konverzáciu",
+  "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
   "status.unpin": "Odopni z profilu",
   "suggestions.dismiss": "Zavrhni návrh",
   "suggestions.header": "Mohlo by ťa zaujímať…",
@@ -535,7 +535,7 @@
   "video.expand": "Zväčši video",
   "video.fullscreen": "Zobraz na celú obrazovku",
   "video.hide": "Skry video",
-  "video.mute": "Vypni zvuk",
+  "video.mute": "Stlm zvuk",
   "video.pause": "Pauza",
   "video.play": "Prehraj",
   "video.unmute": "Zapni zvuk"
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index a9c68d8cd..d50a703b7 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -41,7 +41,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Odblokiraj @{name}",
   "account.unblock_domain": "Razkrij {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Odblokiraj",
   "account.unendorse": "Ne vključi v profil",
   "account.unfollow": "Prenehaj slediti",
   "account.unmute": "Odtišaj @{name}",
@@ -168,7 +168,7 @@
   "empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
   "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
   "empty_column.domain_blocks": "Še vedno ni skritih domen.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Trenutno ni nič v trendu. Preverite znova kasneje!",
   "empty_column.favourited_statuses": "Nimate priljubljenih tutov. Ko boste vzljubili kakšnega, se bo prikazal tukaj.",
   "empty_column.favourites": "Nihče še ni vzljubil tega tuta. Ko ga bo nekdo, se bo pojavil tukaj.",
   "empty_column.follow_recommendations": "Kaže, da za vas ni mogoče pripraviti nobenih predlogov. Poskusite uporabiti iskanje, da poiščete osebe, ki jih poznate, ali raziščete ključnike, ki so v trendu.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Poskusite jih onemogočiti in osvežiti stran. Če to ne pomaga, boste morda še vedno lahko uporabljali Mastodon prek drugega brskalnika ali z domorodno aplikacijo.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiraj sledenje sklada na odložišče",
   "errors.unexpected_crash.report_issue": "Prijavi težavo",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Rezultati iskanja",
+  "explore.suggested_follows": "Za vas",
+  "explore.title": "Razišči",
+  "explore.trending_links": "Novice",
+  "explore.trending_statuses": "Objave",
+  "explore.trending_tags": "Ključniki",
   "follow_recommendations.done": "Opravljeno",
   "follow_recommendations.heading": "Sledite osebam, katerih objave želite videti! Tukaj je nekaj predlogov.",
   "follow_recommendations.lead": "Objave oseb, ki jim sledite, se bodo prikazale v kronološkem zaporedju v vašem domačem viru. Ne bojte se storiti napake, osebam enako enostavno nehate slediti kadar koli!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Nastavitve",
   "navigation_bar.public_timeline": "Združena časovnica",
   "navigation_bar.security": "Varnost",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} se je vpisal/a",
   "notification.favourite": "{name} je vzljubil/a vaš status",
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
@@ -320,7 +320,7 @@
   "notification.update": "{name} je uredil(a) objavo",
   "notifications.clear": "Počisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa vaša obvestila?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "danes",
   "reply_indicator.cancel": "Prekliči",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "Blokiraj",
+  "report.block_explanation": "Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.",
   "report.categories.other": "Drugo",
   "report.categories.spam": "Neželeno",
   "report.categories.violation": "Vsebina krši eno ali več pravil strežnika",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Izberite najboljši zadetek",
+  "report.category.title": "Povejte nam, kaj se dogaja s to/tem {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "objava",
+  "report.close": "Opravljeno",
+  "report.comment.title": "Je še kaj, za kar menite, da bi morali vedeti?",
   "report.forward": "Posreduj do {target}",
   "report.forward_hint": "Račun je iz drugega strežnika. Pošljem anonimno kopijo poročila tudi na drugi strežnik?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Utišaj",
+  "report.mute_explanation": "Njihovih objav ne boste videli. Še vedno vam lahko sledijo in vidijo vaše objave, ne bodo vedeli, da so utišani.",
+  "report.next": "Naprej",
   "report.placeholder": "Dodatni komentarji",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "Ni mi všeč",
+  "report.reasons.dislike_description": "To ni tisto, kar želim videti",
+  "report.reasons.other": "Gre za nekaj drugega",
+  "report.reasons.other_description": "Težava ne sodi v druge kategorije",
+  "report.reasons.spam": "To je neželena vsebina",
+  "report.reasons.spam_description": "Škodljive povezave, lažno prizadevanje ali ponavljajoči se odgovori",
+  "report.reasons.violation": "Krši strežniška pravila",
+  "report.reasons.violation_description": "Zavedate se, da krši določena pravila",
+  "report.rules.subtitle": "Izberite vse, kar ustreza",
+  "report.rules.title": "Katera pravila so kršena?",
+  "report.statuses.subtitle": "Izberite vse, kar ustreza",
+  "report.statuses.title": "Ali so kakšne objave, ki dokazujejo trditve iz tega poročila?",
   "report.submit": "Pošlji",
   "report.target": "Prijavi {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Tukaj so vaše možnosti za nadzor tistega, kar vidite na Mastodonu:",
+  "report.thanks.take_action_actionable": "Medtem, ko to pregledujemo, lahko proti @{name} ukrepate:",
+  "report.thanks.title": "Ali si želite to pogledati?",
+  "report.thanks.title_actionable": "Hvala za poročilo, bomo preverili.",
+  "report.unfollow": "Ne sledi več @{name}",
+  "report.unfollow_explanation": "Temu računu sledite. Da ne boste več videli njegovih objav v svojem domačem viru, mu prenehajte slediti.",
   "search.placeholder": "Iskanje",
   "search_popout.search_format": "Napredna oblika iskanja",
   "search_popout.tips.full_text": "Enostavno besedilo vrne statuse, ki ste jih napisali, vzljubili, spodbudili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Enostavno besedilo vrne ujemajoča se prikazna imena, uporabniška imena in ključnike",
   "search_popout.tips.user": "uporabnik",
   "search_results.accounts": "Ljudje",
-  "search_results.all": "All",
+  "search_results.all": "Vse",
   "search_results.hashtags": "Ključniki",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Za ta iskalni niz ni zadetkov",
   "search_results.statuses": "Tuti",
   "search_results.statuses_fts_disabled": "Iskanje tutov po njihovi vsebini ni omogočeno na tem strežniku Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index fff26e8a4..f201e3351 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 064a2dac8..c1eb53032 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index fed4e7bca..c33079fd2 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -18,7 +18,7 @@
   "account.followers": "Följare",
   "account.followers.empty": "Ingen följer denna användare än.",
   "account.followers_counter": "{count, plural, one {{counter} Följare} other {{counter} Följare}}",
-  "account.following": "Following",
+  "account.following": "Följer",
   "account.following_counter": "{count, plural, one {{counter} Följer} other {{counter} Följer}}",
   "account.follows.empty": "Denna användare följer inte någon än.",
   "account.follows_you": "Följer dig",
@@ -41,7 +41,7 @@
   "account.statuses_counter": "{count, plural,one {{counter} Tuta} other {{counter} Tutor}}",
   "account.unblock": "Avblockera @{name}",
   "account.unblock_domain": "Sluta dölja {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Avblockera",
   "account.unendorse": "Visa inte på profil",
   "account.unfollow": "Sluta följ",
   "account.unmute": "Sluta tysta @{name}",
@@ -192,7 +192,7 @@
   "explore.title": "Utforska",
   "explore.trending_links": "Nyheter",
   "explore.trending_statuses": "Inlägg",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_tags": "Hashtaggar",
   "follow_recommendations.done": "Klar",
   "follow_recommendations.heading": "Följ personer som du skulle vilja se inlägg från! Här finns det några förslag.",
   "follow_recommendations.lead": "Inlägg från personer du följer kommer att dyka upp i kronologisk ordning i ditt hem-flöde. Var inte rädd för att göra misstag, du kan sluta följa människor lika enkelt när som helst!",
@@ -337,7 +337,7 @@
   "notifications.column_settings.status": "Nya tutor:",
   "notifications.column_settings.unread_notifications.category": "O-lästa aviseringar",
   "notifications.column_settings.unread_notifications.highlight": "Markera o-lästa aviseringar",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Redigeringar:",
   "notifications.filter.all": "Alla",
   "notifications.filter.boosts": "Knuffar",
   "notifications.filter.favourites": "Favoriter",
@@ -393,11 +393,11 @@
   "report.categories.other": "Övrigt",
   "report.categories.spam": "Skräppost",
   "report.categories.violation": "Innehåll bryter mot en eller flera serverregler",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.subtitle": "Välj den bästa träffen",
+  "report.category.title": "Berätta för oss vad som händer med den här {type}",
   "report.category.title_account": "profil",
   "report.category.title_status": "inlägg",
-  "report.close": "Done",
+  "report.close": "Färdig",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Vidarebefordra till {target}",
   "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
@@ -405,14 +405,14 @@
   "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
   "report.next": "Nästa",
   "report.placeholder": "Ytterligare kommentarer",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
+  "report.reasons.dislike": "Jag tycker inte om det",
+  "report.reasons.dislike_description": "Det är inget som du vill se",
+  "report.reasons.other": "Det är något annat",
   "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.reasons.spam": "Det är skräppost",
+  "report.reasons.spam_description": "Skadliga länkar, bedrägligt beteende eller repetitiva svar",
+  "report.reasons.violation": "Det bryter mot serverns regler",
+  "report.reasons.violation_description": "Du är medveten om att det bryter mot specifika regler",
   "report.rules.subtitle": "Select all that apply",
   "report.rules.title": "Which rules are being violated?",
   "report.statuses.subtitle": "Select all that apply",
@@ -421,7 +421,7 @@
   "report.target": "Rapporterar {target}",
   "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
   "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title": "Vill du inte se det här?",
   "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
   "report.unfollow": "Sluta följ @{username}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index d31ed3fe9..3b450f89a 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index bd59ddda8..6e2247bfd 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 9c0074184..acd286e31 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 6ac4f1d9b..941315547 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index c4e9a3f6f..86ca9c1e9 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -353,7 +353,7 @@
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "ไม่พลาดสิ่งต่าง ๆ",
+  "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
   "picture_in_picture.restore": "นำกลับมา",
   "poll.closed": "ปิดแล้ว",
   "poll.refresh": "รีเฟรช",
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index d4cee1569..f67b237f9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -18,7 +18,7 @@
   "account.followers": "Takipçi",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
   "account.followers_counter": "{count, plural, one {{counter} Takipçi} other {{counter} Takipçi}}",
-  "account.following": "Following",
+  "account.following": "Takip Ediliyor",
   "account.following_counter": "{count, plural, one {{counter} Takip Edilen} other {{counter} Takip Edilen}}",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Gönderi} other {{counter} Gönderi}}",
   "account.unblock": "@{name} adlı kişinin engelini kaldır",
   "account.unblock_domain": "{domain} alan adının engelini kaldır",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Engeli kaldır",
   "account.unendorse": "Profilde gösterme",
   "account.unfollow": "Takibi bırak",
   "account.unmute": "@{name} adlı kişinin sesini aç",
   "account.unmute_notifications": "@{name} adlı kişinin bildirimlerini aç",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Susturmayı kaldır",
   "account_note.placeholder": "Not eklemek için tıklayın",
   "admin.dashboard.daily_retention": "Kayıttan sonra günlük kullanıcı saklama oranı",
   "admin.dashboard.monthly_retention": "Kayıttan sonra aylık kullanıcı saklama oranı",
@@ -122,7 +122,7 @@
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
   "confirmations.discard_edit_media.confirm": "Vazgeç",
-  "confirmations.discard_edit_media.message": "Ortam açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
+  "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
   "confirmations.domain_block.confirm": "Alanın tamamını engelle",
   "confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
   "confirmations.logout.confirm": "Oturumu kapat",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 20a4b2ecd..52a59713f 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index d31ed3fe9..3b450f89a 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index b1f335a84..f6fac3669 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 9a40cdd47..a5676209f 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 217cd3861..aa0199b3e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -18,7 +18,7 @@
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
   "account.followers_counter": "{count, plural, one {{counter} Người theo dõi} other {{counter} Người theo dõi}}",
-  "account.following": "Following",
+  "account.following": "Đang theo dõi",
   "account.following_counter": "{count, plural, one {{counter} Theo dõi} other {{counter} Theo dõi}}",
   "account.follows.empty": "Người này chưa theo dõi ai.",
   "account.follows_you": "Đang theo dõi bạn",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural, one {{counter} Tút} other {{counter} Tút}}",
   "account.unblock": "Bỏ chặn @{name}",
   "account.unblock_domain": "Bỏ ẩn {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Bỏ chặn",
   "account.unendorse": "Ngưng tôn vinh người này",
   "account.unfollow": "Ngưng theo dõi",
   "account.unmute": "Bỏ ẩn @{name}",
   "account.unmute_notifications": "Mở lại thông báo từ @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Bỏ ẩn",
   "account_note.placeholder": "Nhấn để thêm",
   "admin.dashboard.daily_retention": "Tỉ lệ người dùng sau đăng ký ở lại theo ngày",
   "admin.dashboard.monthly_retention": "Tỉ lệ người dùng sau đăng ký ở lại theo tháng",
@@ -168,7 +168,7 @@
   "empty_column.community": "Máy chủ của bạn chưa có tút nào công khai. Bạn hãy thử viết gì đó đi!",
   "empty_column.direct": "Bạn chưa có tin nhắn nào. Khi bạn gửi hoặc nhận tin nhắn, nó sẽ hiển thị ở đây.",
   "empty_column.domain_blocks": "Chưa ẩn bất kỳ máy chủ nào.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Chưa có xu hướng nào. Kiểm tra lại sau!",
   "empty_column.favourited_statuses": "Bạn chưa thích tút nào. Hãy thử đi, nó sẽ xuất hiện ở đây.",
   "empty_column.favourites": "Chưa có ai thích tút này.",
   "empty_column.follow_recommendations": "Bạn chưa có gợi ý theo dõi nào. Hãy thử tìm kiếm những người thú vị hoặc khám phá những hashtag xu hướng.",
@@ -187,12 +187,12 @@
   "error.unexpected_crash.next_steps_addons": "Hãy tắt add-on và làm tươi trang. Nếu vẫn không được, bạn nên thử đăng nhập Mastodon trên trình duyệt khác hoặc app khác.",
   "errors.unexpected_crash.copy_stacktrace": "Sao chép stacktrace vào clipboard",
   "errors.unexpected_crash.report_issue": "Báo cáo lỗi",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
+  "explore.search_results": "Kết quả tìm kiếm",
+  "explore.suggested_follows": "Đề xuất cho bạn",
+  "explore.title": "Khám phá",
+  "explore.trending_links": "Tin tức",
+  "explore.trending_statuses": "Tút",
+  "explore.trending_tags": "Hashtag",
   "follow_recommendations.done": "Xong",
   "follow_recommendations.heading": "Theo dõi những người bạn muốn đọc tút của họ! Dưới đây là vài gợi ý.",
   "follow_recommendations.lead": "Tút từ những người bạn theo dõi sẽ hiện theo thứ tự thời gian trên bảng tin. Đừng ngại, bạn có thể dễ dàng ngưng theo dõi họ bất cứ lúc nào!",
@@ -308,7 +308,7 @@
   "navigation_bar.preferences": "Cài đặt",
   "navigation_bar.public_timeline": "Thế giới",
   "navigation_bar.security": "Bảo mật",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "{name} vừa đăng ký",
   "notification.favourite": "{name} thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
@@ -320,7 +320,7 @@
   "notification.update": "{name} đã viết lại một tút",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "Lượt đăng ký mới:",
   "notifications.column_settings.alert": "Thông báo trên máy tính",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
@@ -388,43 +388,43 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hôm nay",
   "reply_indicator.cancel": "Hủy bỏ",
-  "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block": "Chặn",
+  "report.block_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ biết là họ đã bị chặn.",
   "report.categories.other": "Khác",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Vi phạm quy tắc máy chủ",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.category.subtitle": "Chọn mục gần khớp nhất",
+  "report.category.title": "Nói với họ chuyện gì xảy ra với {type}",
+  "report.category.title_account": "người dùng",
+  "report.category.title_status": "tút",
+  "report.close": "Xong",
+  "report.comment.title": "Bạn nghĩ chúng tôi nên biết thêm điều gì?",
   "report.forward": "Chuyển đến {target}",
   "report.forward_hint": "Người này thuộc máy chủ khác. Gửi một báo cáo ẩn danh tới máy chủ đó?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.mute": "Ẩn",
+  "report.mute_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ không biết là họ đã bị bạn ẩn.",
+  "report.next": "Tiếp theo",
   "report.placeholder": "Bổ sung thêm",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "Tôi không thích nó",
+  "report.reasons.dislike_description": "Đó không phải là thứ gì mà bạn muốn thấy",
+  "report.reasons.other": "Một lý do khác",
+  "report.reasons.other_description": "Vấn đề không nằm trong những mục trên",
+  "report.reasons.spam": "Đây là spam",
+  "report.reasons.spam_description": "Liên kết độc hại, tạo tương tác giả hoặc trả lời lặp đi lặp lại",
+  "report.reasons.violation": "Vi phạm quy tắc máy chủ",
+  "report.reasons.violation_description": "Bạn nhận thấy nó vi phạm quy tắc máy chủ",
+  "report.rules.subtitle": "Chọn tất cả những áp dụng",
+  "report.rules.title": "Vi phạm quy tắc nào?",
+  "report.statuses.subtitle": "Chọn tất cả những áp dụng",
+  "report.statuses.title": "Bạn muốn gửi tút nào kèm báo cáo này?",
   "report.submit": "Gửi đi",
   "report.target": "Báo cáo {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.thanks.take_action": "Đây là một số cách để kiểm soát thứ bạn nhìn thấy trên Mastodon:",
+  "report.thanks.take_action_actionable": "Trong lúc chờ chúng tôi xem xét, bạn có thể áp dụng hành động với @{name}:",
+  "report.thanks.title": "Không muốn xem thứ này?",
+  "report.thanks.title_actionable": "Cảm ơn đã báo cáo, chúng tôi sẽ xem xét kỹ.",
+  "report.unfollow": "Ngưng theo dõi @{name}",
+  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trong bảng tin nữa, hãy ngưng theo dõi.",
   "search.placeholder": "Tìm kiếm",
   "search_popout.search_format": "Gợi ý",
   "search_popout.tips.full_text": "Nội dung trả về bao gồm những tút mà bạn đã viết, thích, chia sẻ hoặc những tút có nhắc đến bạn. Bạn cũng có thể tìm địa chỉ người dùng, tên hiển thị và hashtag.",
@@ -433,9 +433,9 @@
   "search_popout.tips.text": "Nội dung trả về là tên người dùng, tên hiển thị và hashtag",
   "search_popout.tips.user": "người dùng",
   "search_results.accounts": "Người dùng",
-  "search_results.all": "All",
+  "search_results.all": "Toàn bộ",
   "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.nothing_found": "Không tìm thấy kết quả trùng khớp",
   "search_results.statuses": "Tút",
   "search_results.statuses_fts_disabled": "Máy chủ của bạn không bật tính năng tìm kiếm tút.",
   "search_results.total": "{count, number} {count, plural, one {kết quả} other {kết quả}}",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 0fc7c56da..855986def 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1be5f796f..f0051b5ba 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -403,14 +403,14 @@
   "report.forward_hint": "这名用户来自另一个服务器。是否要向那个服务器发送一条匿名的举报?",
   "report.mute": "静音",
   "report.mute_explanation": "你将不会看到他们的嘟文。他们仍然可以关注你并看到你的嘟文,但他们不会知道他们被静音了。",
-  "report.next": "Next",
+  "report.next": "下一步",
   "report.placeholder": "备注",
   "report.reasons.dislike": "我不喜欢它",
   "report.reasons.dislike_description": "这不是你想看到的东西",
   "report.reasons.other": "其他原因",
   "report.reasons.other_description": "该问题不符合其他类别",
   "report.reasons.spam": "它是垃圾信息",
-  "report.reasons.spam_description": "恶意链接、虚假参与或重复性回复",
+  "report.reasons.spam_description": "恶意链接,虚假互动和重复回复",
   "report.reasons.violation": "它违反了服务器规则",
   "report.reasons.violation_description": "你清楚它违反了特定的规则",
   "report.rules.subtitle": "选择所有适用选项",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 823fb37fb..5aa531407 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -410,7 +410,7 @@
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "It violates server rules",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
   "report.rules.subtitle": "Select all that apply",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index a53f59ddf..63691ca93 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -18,7 +18,7 @@
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
   "account.followers_counter": "被 {count, plural,one {{counter} 人}other {{counter} 人}} 跟隨",
-  "account.following": "Following",
+  "account.following": "跟隨中",
   "account.following_counter": "正在跟隨 {count, plural,one {{counter}}other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
   "account.follows_you": "跟隨了您",
@@ -41,12 +41,12 @@
   "account.statuses_counter": "{count, plural,one {{counter} 則}other {{counter} 則}}嘟文",
   "account.unblock": "取消封鎖 @{name}",
   "account.unblock_domain": "取消封鎖域名 {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "解除封鎖",
   "account.unendorse": "不再於個人資料頁面推薦對方",
   "account.unfollow": "取消跟隨",
   "account.unmute": "取消靜音 @{name}",
   "account.unmute_notifications": "重新接收來自 @{name} 的通知",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "解除靜音",
   "account_note.placeholder": "按此添加備注",
   "admin.dashboard.daily_retention": "註冊後使用者存留率(日)",
   "admin.dashboard.monthly_retention": "註冊後使用者存留率(月)",
@@ -272,7 +272,7 @@
   "lists.new.create": "新增名單",
   "lists.new.title_placeholder": "新名單標題",
   "lists.replies_policy.followed": "任何跟隨的使用者",
-  "lists.replies_policy.list": "列表成員",
+  "lists.replies_policy.list": "名單成員",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆:",
   "lists.search": "搜尋您跟隨的使用者",
@@ -294,7 +294,7 @@
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "隱藏的網域",
   "navigation_bar.edit_profile": "編輯個人資料",
-  "navigation_bar.favourites": "收藏",
+  "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
   "navigation_bar.follow_requests": "跟隨請求",
   "navigation_bar.follows_and_followers": "跟隨中與跟隨者",
@@ -410,7 +410,7 @@
   "report.reasons.other": "其他原因",
   "report.reasons.other_description": "這個問題不屬於其他分類",
   "report.reasons.spam": "垃圾訊息",
-  "report.reasons.spam_description": "有害連結,假造的互動,或是重複性回覆",
+  "report.reasons.spam_description": "有害連結、假造的互動,或是重複性回覆",
   "report.reasons.violation": "違反伺服器規則",
   "report.reasons.violation_description": "您知道它違反特定規則",
   "report.rules.subtitle": "請選擇所有適用的選項",
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 7a2dd0330..2c8162b28 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -304,7 +304,8 @@ html {
   }
 
   &__item {
-    a {
+    a,
+    button {
       background: $white;
       color: $darker-text-color;
     }
@@ -336,10 +337,18 @@ html {
   color: $white;
 }
 
-.dropdown-menu__separator {
+.dropdown-menu__separator,
+.dropdown-menu__item.edited-timestamp__history__item,
+.dropdown-menu__container__header,
+.compare-history-modal .report-modal__target,
+.report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
 }
 
+.report-dialog-modal__container {
+  border-top-color: lighten($ui-base-color, 4%);
+}
+
 // Change the background colors of modals
 .actions-modal,
 .boost-modal,
@@ -351,6 +360,7 @@ html {
 .embed-modal,
 .error-modal,
 .onboarding-modal,
+.compare-history-modal,
 .report-modal__comment .setting-text__wrapper,
 .report-modal__comment .setting-text,
 .announcements,
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 706960f92..f599e1b58 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -71,15 +71,7 @@ class ActivityPub::Activity
   end
 
   def object_uri
-    @object_uri ||= begin
-      str = value_or_id(@object)
-
-      if str&.start_with?('bear:')
-        Addressable::URI.parse(str).query_values['u']
-      else
-        str
-      end
-    end
+    @object_uri ||= uri_from_bearcap(value_or_id(@object))
   end
 
   def unsupported_object_type?
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 36ad5f446..5802ead5d 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -20,7 +20,7 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
   end
 
   def update_status
-    return reject_payload! if invalid_origin?(@object['id'])
+    return reject_payload! if invalid_origin?(object_uri)
 
     @status = Status.find_by(uri: object_uri, account_id: @account.id)
 
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 4d91b9805..631af183c 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -68,6 +68,8 @@ class Admin::StatusBatchAction
   end
 
   def handle_mark_as_sensitive!
+    representative_account = Account.representative
+
     # Can't use a transaction here because UpdateStatusService queues
     # Sidekiq jobs
     statuses.includes(:media_attachments, :preview_cards).find_each do |status|
@@ -76,7 +78,7 @@ class Admin::StatusBatchAction
       authorize(status, :update?)
 
       if target_account.local?
-        UpdateStatusService.new.call(status, current_account.id, sensitive: true)
+        UpdateStatusService.new.call(status, representative_account.id, sensitive: true)
       else
         status.update(sensitive: true)
       end
diff --git a/app/models/concerns/account_merging.rb b/app/models/concerns/account_merging.rb
index 119773e6b..8161761fb 100644
--- a/app/models/concerns/account_merging.rb
+++ b/app/models/concerns/account_merging.rb
@@ -15,7 +15,8 @@ module AccountMerging
       Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite,
       Follow, FollowRequest, Block, Mute,
       AccountModerationNote, AccountPin, AccountStat, ListAccount,
-      PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression
+      PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
+      Appeal
     ]
 
     owned_classes.each do |klass|
@@ -47,6 +48,10 @@ module AccountMerging
       record.update_attribute(:reference_account_id, id)
     end
 
+    Appeal.where(account_warning_id: other_account.id).find_each do |record|
+      record.update_attribute(:account_warning_id, id)
+    end
+
     # Some follow relationships have moved, so the cache is stale
     Rails.cache.delete_matched("followers_hash:#{id}:*")
     Rails.cache.delete_matched("relationships:#{id}:*")
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 7434d3322..c01c23077 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -33,7 +33,7 @@ class Instance < ApplicationRecord
   end
 
   def unavailable?
-    unavailable_domain.present?
+    unavailable_domain.present? || domain_block&.suspend?
   end
 
   def failing?
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 4f789d50b..9672b3d2b 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -15,24 +15,30 @@ class ActivityPub::FetchRemoteStatusService < BaseService
 
     return unless supported_context?
 
-    actor_id = nil
+    actor_uri     = nil
     activity_json = nil
+    object_uri    = nil
 
     if expected_object_type?
-      actor_id = value_or_id(first_of_value(@json['attributedTo']))
-      activity_json = { 'type' => 'Create', 'actor' => actor_id, 'object' => @json }
+      actor_uri     = value_or_id(first_of_value(@json['attributedTo']))
+      activity_json = { 'type' => 'Create', 'actor' => actor_uri, 'object' => @json }
+      object_uri    = uri_from_bearcap(@json['id'])
     elsif expected_activity_type?
-      actor_id = value_or_id(first_of_value(@json['actor']))
+      actor_uri     = value_or_id(first_of_value(@json['actor']))
       activity_json = @json
+      object_uri    = uri_from_bearcap(value_or_id(@json['object']))
     end
 
-    return if activity_json.nil? || !trustworthy_attribution?(@json['id'], actor_id)
+    return if activity_json.nil? || object_uri.nil? || !trustworthy_attribution?(@json['id'], actor_uri)
 
-    actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
-    actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update?(actor)
+    actor = account_from_uri(actor_uri)
 
     return if actor.nil? || actor.suspended?
 
+    # If we fetched a status that already exists, then we need to treat the
+    # activity as an update rather than create
+    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
+
     ActivityPub::Activity.factory(activity_json, actor).perform
   end
 
@@ -43,6 +49,12 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
   end
 
+  def account_from_uri(uri)
+    actor = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
+    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, id: true) if actor.nil? || actor.possibly_stale?
+    actor
+  end
+
   def supported_context?
     super(@json)
   end
@@ -54,8 +66,4 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   def expected_object_type?
     equals_or_includes_any?(@json['type'], ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES)
   end
-
-  def needs_update?(actor)
-    actor.possibly_stale?
-  end
 end
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index 1260c0482..47a788c30 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -13,7 +13,9 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @poll_changed              = false
 
     # Only native types can be updated at the moment
-    return if !expected_type? || already_updated_more_recently?
+    return @status if !expected_type? || already_updated_more_recently?
+
+    last_edit_date = status.edited_at.presence || status.created_at
 
     # Only allow processing one create/update per status at a time
     RedisLock.acquire(lock_options) do |lock|
@@ -37,13 +39,18 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
         raise Mastodon::RaceConditionError
       end
     end
+
+    forward_activity! if significant_changes? && @status_parser.edited_at.present? && @status_parser.edited_at > last_edit_date
+
+    @status
   end
 
   private
 
   def update_media_attachments!
-    previous_media_attachments = @status.media_attachments.to_a
-    next_media_attachments     = []
+    previous_media_attachments     = @status.media_attachments.to_a
+    previous_media_attachments_ids = @status.ordered_media_attachment_ids || previous_media_attachments.map(&:id)
+    next_media_attachments         = []
 
     as_array(@json['attachment']).each do |attachment|
       media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
@@ -83,7 +90,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @status.ordered_media_attachment_ids = next_media_attachments.map(&:id)
     @status.media_attachments.reload
 
-    @media_attachments_changed = true if @status.ordered_media_attachment_ids_changed?
+    @media_attachments_changed = true if @status.ordered_media_attachment_ids != previous_media_attachments_ids
   end
 
   def update_poll!
@@ -263,4 +270,12 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
     PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)
   end
+
+  def forward_activity!
+    forwarder.forward! if forwarder.forwardable?
+  end
+
+  def forwarder
+    @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
+  end
 end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index c3733e377..745eb5d3b 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -118,9 +118,9 @@ class Rack::Attack
     req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/sign_in'
   end
 
-  self.throttled_response = lambda do |env|
+  self.throttled_responder = lambda do |request|
     now        = Time.now.utc
-    match_data = env['rack.attack.match_data']
+    match_data = request.env['rack.attack.match_data']
 
     headers = {
       'Content-Type'          => 'application/json',
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 47cd8765d..34cf0b837 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -24,7 +24,7 @@ fr:
         status:
           attributes:
             reblog:
-              taken: du statut existe déjà
+              taken: du message existe déjà
         user:
           attributes:
             email:
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
index 4f6a348dd..f23f9ae6c 100644
--- a/config/locales/activerecord.nn.yml
+++ b/config/locales/activerecord.nn.yml
@@ -7,6 +7,7 @@ nn:
         options: Val
       user:
         email: E-mail address
+        locale: Område
         password: Passord
       user/account:
         username: Brukernavn
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 62822b0b2..b177c8cac 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -16,6 +16,7 @@ ar:
     contact: للتواصل معنا
     contact_missing: لم يتم تعيينه
     contact_unavailable: غير متوفر
+    continue_to_web: المتابعة إلى تطبيق الويب
     discover_users: اكتشف مستخدِمين
     documentation: الدليل
     federation_hint_html: بواسطة حساب في %{instance} ستتمكن من تتبع أناس في أي خادم ماستدون وأكثر.
@@ -81,7 +82,6 @@ ar:
     media: الوسائط
     moved_html: "%{name} إنتقلَ إلى %{new_profile_link}:"
     network_hidden: إنّ المعطيات غير متوفرة
-    never_active: أبدا
     nothing_here: لا يوجد أي شيء هنا!
     people_followed_by: الأشخاص الذين يتبعهم %{name}
     people_who_follow: الأشخاص الذين يتبعون %{name}
@@ -242,6 +242,7 @@ ar:
       whitelisted: في القائمة البيضاء
     action_logs:
       action_types:
+        approve_appeal: الموافقة على الطعن
         approve_user: الموافقة على المستخدم
         assigned_to_self_report: أسند التقرير
         change_email_user: تغيير عنوان البريد الإلكتروني الخاص بالمستخدم
@@ -273,6 +274,7 @@ ar:
         enable_user: تفعيل المستخدم
         memorialize_account: جعل الحساب تذكاريا
         promote_user: ترقية المستخدم
+        reject_appeal: رفض الطعن
         reject_user: ارفض المستخدم
         remove_avatar_user: احذف الصورة الرمزية
         reopen_report: إعادة فتح التقرير
@@ -404,6 +406,10 @@ ar:
       top_languages: اللغات الأكثر نشاطا
       top_servers: الخوادم الأكثر نشاطا
       website: موقع الويب
+    disputes:
+      appeals:
+        empty: ليست هناك أية طعون.
+        title: الطعون
     domain_allows:
       add_new: إضافة النطاق إلى القائمة البيضاء
       created_msg: تمت إضافة النطاق إلى القائمة البيضاء بنجاح
@@ -435,17 +441,6 @@ ar:
       reject_media_hint: يزيل ملفات الوسائط المخزنة محليًا ويرفض تنزيل أي ملفات في المستقبل. غير ذي صلة للتعليق
       reject_reports: رفض التقارير
       reject_reports_hint: تجاهل جميع تقارير الإبلاغ القادمة من هذا النطاق. هذا يستثي التعليقات
-      rejecting_media: جار رفض ملفات الوسائط
-      rejecting_reports: جار رفض التقارير
-      severity:
-        silence: تم كتمه
-        suspend: تم تعليقه
-      show:
-        retroactive:
-          silence: إلغاء الكتم عن كافة الحسابات المتواجدة على هذا النطاق
-          suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
-        title: رفع حظر النطاق عن %{domain}
-        undo: إلغاء
       undo: إلغاء حجب النطاق
       view: عرض كتلة النطاق
     email_domain_blocks:
@@ -475,21 +470,14 @@ ar:
         clear: مسح أخطاء التسليم
         restart: إعادة تشغيل التوصيل
         stop: إيقاف التوصيل
-        title: التوصيل
         unavailable: غير متوفر
-        unavailable_message: التوصيل غير متوفر
-        warning: تحذير
-        warning_message:
-          few: فشل التوصيل لـ%{count} أيام
-          many: فشل التوصيل لـ%{count} يوم
-          one: فشل التوصيل لـ%{count} يوم
-          other: فشل التوصيل لـ%{count} يوم
-          two: فشل التوصيل لـ%{count} يوم
-          zero: فشل التوصيل لـ%{count} يوم
       delivery_available: التسليم متوفر
       delivery_error_days: أيام أخطاء التوصيل
       delivery_error_hint: إذا كان التوصيل غير ممكناً لـ%{count} يوم، فستوضع عليها علامة {غير قابلة للتسليم} تلقائياً.
       empty: لم يتم العثور على نطاقات.
+      known_accounts:
+        one: "%{count} حساب معروف"
+        other: "%{count} حسابات معروفة"
       moderation:
         all: كافتها
         limited: محدود
@@ -700,12 +688,16 @@ ar:
       back_to_report: العودة إلى صفحة التقرير
       batch:
         remove_from_report: إزالة من التقرير
+        report: إبلاغ
       deleted: محذوف
       media:
         title: الوسائط
       no_status_selected: لم يطرأ أي تغيير على أي منشور بما أنه لم يتم اختيار أي واحد
       title: منشورات الحساب
       with_media: تحتوي على وسائط
+    strikes:
+      appeal_approved: طُعِن فيه
+      appeal_pending: طعن قيد المراجعة
     system_checks:
       database_schema_check:
         message_html: هناك عمليات هجرة معلقة لقواعد البيانات. يرجى تشغيلها لضمان تصرف التطبيق كما هو متوقع
@@ -759,6 +751,15 @@ ar:
       empty: لم تحدد أي إعدادات تحذير مسبقة بعد.
       title: إدارة نماذج التحذير
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: لحذف منشوراتهم
+        disable: لتجميد حسابهم
+        mark_statuses_as_sensitive: لوضع علامة حساس على منشوراتهم
+        none: لتحذيرهم
+        sensitive: لجعل حسابهم كحساس
+        silence: للحد من حسابهم
+        suspend: لتعليق حسابهم
     new_pending_account:
       body: تفاصيل الحساب الجديد أدناه. يمكنك الموافقة على هذا الطلب أو رفضه.
       subject: حساب جديد في انتظار مراجعة على %{instance} (%{username})
@@ -766,6 +767,11 @@ ar:
       body: قام %{reporter} بالإبلاغ عن %{target}
       body_remote: أبلغ شخص ما من %{domain} عن %{target}
       subject: تقرير جديد ل%{instance} (#%{id})
+    new_trends:
+      new_trending_statuses:
+        title: المنشورات الشائعة
+      new_trending_tags:
+        title: الوسوم المتداولة
   aliases:
     add_new: أنشئ كُنية
     created_msg: تم إنشاء الكُنية الجديدة بنجاح. يمكنكم الآن الشروع في الإنتقال مِن حسابكم القديم.
@@ -904,6 +910,27 @@ ar:
     directory: سِجلّ الصفحات التعريفية
     explanation: استكشف مستخدِمين آخرين حسب المواضيع التي تهمهم
     explore_mastodon: استكشف %{title}
+  disputes:
+    strikes:
+      action_taken: الإجراء المتخذ
+      appeal: طعن
+      appeal_rejected: رُفِض الطعن
+      appeal_submitted_at: طعن أرسِل في
+      appealed_msg: تم تقديم طعنك. إذا تمت الموافقة عليه، سيتم إبلاغك.
+      appeals:
+        submit: تقديم طعن
+      associated_report: التقرير المتربط
+      created_at: بتاريخ
+      recipient: موجّه إلى
+      status: 'المنشور #%{id}'
+      title_actions:
+        delete_statuses: إزالة منشور
+        disable: تجميد للحساب
+        none: تحذير
+        suspend: تعليق للحساب
+      your_appeal_approved: تمت الموافقة على طعنك
+      your_appeal_pending: لقد قمت بتقديم طعن
+      your_appeal_rejected: تم رفض طعنك
   domain_validator:
     invalid_domain: ليس بإسم نطاق صالح
   errors:
@@ -1382,6 +1409,7 @@ ar:
       '2629746': شهر واحد
       '31556952': سنة واحدة
       '5259492': شهران
+      '604800': أسبوع
       '63113904': أسبوعان
       '7889238': 3 أشهر
     min_age_label: عتبة العمر
@@ -1504,6 +1532,13 @@ ar:
     recovery_instructions_html: إن فقدت الوصول إلى هاتفك، يمكنك استخدام أحد رموز الاسترداد أدناه لاستعادة الوصول إلى حسابك. <strong>حافظ على رموز الاسترداد بأمان</strong>. يمكنك ، على سبيل المثال ، طباعتها وتخزينها مع مستندات أخرى هامة.
     webauthn: مفاتيح الأمان
   user_mailer:
+    appeal_approved:
+      action: انتقل إلى حسابك
+      subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
+      title: تم قبول طعنك
+    appeal_rejected:
+      subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
+      title: رُفض الاستئناف
     backup_ready:
       explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
       subject: نسخة بيانات حسابك جاهزة للتنزيل
@@ -1515,13 +1550,14 @@ ar:
       subject: الرجاء تأكيد محاولة الولوج
       title: محاولة الولوج
     warning:
+      appeal: تقديم طعن
+      appeal_description: إذا كنت تعتقد أن هذا خطأ، يمكنك تقديم طعن إلى فريق %{instance}.
       categories:
         spam: مزعج
         violation: ينتهك المحتوى المبادئ التوجيهية التالية للمجتمع
       explanation:
         sensitive: من الآن فصاعدا، سيتم وضع علامة على جميع ملفات الوسائط التي يتم تحميلها على أنها حساسة وستكون مخفية خلف تحذير يُنقر.
         silence: لا يزال بإمكانك استخدام حسابك ولكن فقط الأشخاص الذين يتابعونك فقط يمكنهم رؤية منشوراتك على هذا الخادم، وقد يتم استبعادك من ميزات الاكتشاف المختلفة. قد يتبعك آخرون على كل حال يدوياً.
-      get_in_touch: إذا كنت تعتقد أن هذا خطأ، يمكنك الرد على هذا البريد الإلكتروني للتواصل مع فريق %{instance}.
       reason: 'السبب:'
       subject:
         disable: تم تجميد حسابك %{acct}
@@ -1532,7 +1568,6 @@ ar:
         delete_statuses: منشورات محذوفة
         disable: الحساب مُجمَّد
         none: تحذير
-        sensitive: الوسائط المخفية
         silence: الحساب محدود
         suspend: الحساب مُعلَّق
     welcome:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 2a76b8773..7b2321510 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -42,7 +42,6 @@ ast:
     joined: Xunióse en %{date}
     moved_html: "%{name} mudóse a %{new_profile_link}:"
     network_hidden: Esta información nun ta disponible
-    never_active: Enxamás
     nothing_here: "¡Equí nun hai nada!"
     people_followed_by: Persones a les que sigue %{name}
     people_who_follow: Persones que siguen a %{name}
@@ -56,10 +55,12 @@ ast:
   admin:
     accounts:
       are_you_sure: "¿De xuru?"
+      avatar: Avatar
       by_domain: Dominiu
       domain: Dominiu
       email: Corréu
       followers: Siguidores
+      ip: IP
       location:
         local: Llocal
         title: Allugamientu
@@ -82,17 +83,31 @@ ast:
         title: Anunciu nuevu
       published_msg: "¡L'anunciu espublizóse coreutamente!"
       title: Anuncios
+      updated_msg: "¡L'anunciu anovóse correutamente!"
     custom_emojis:
       by_domain: Dominiu
       copy_failed_msg: Nun pudo facese una copia llocal d'esi fustaxe
       emoji: Fustaxe
+      not_permitted: Nun tienes permisu pa facer esta aición
       update_failed_msg: Nun pudo anovase esi fustaxe
+    dashboard:
+      media_storage: Almacenamientu multimedia
+      software: Software
+      website: Sitiu web
     domain_blocks:
       domain: Dominiu
+      private_comment: Comentariu priváu
+      public_comment: Comentariu públicu
     email_domain_blocks:
       domain: Dominiu
     instances:
+      availability:
+        title: Disponibilidá
       by_domain: Dominiu
+      content_policies:
+        comment: Nota interna
+        policy: Política
+        reason: Motivu públicu
       private_comment: Comentariu priváu
       public_comment: Comentariu públicu
       title: Federación
@@ -161,9 +176,12 @@ ast:
     login: Aniciar sesión
     migrate_account: Mudase a otra cuenta
     migrate_account_html: Si deseyes redirixir esta cuenta a otra, pues <a href="%{path}">configuralo equí</a>.
+    providers:
+      cas: CAS
+      saml: SAML
     register: Rexistrase
     security: Seguranza
-    trouble_logging_in: "¿Problemes col aniciu de sesión?"
+    trouble_logging_in: "¿Tienes problemes col aniciu de sesión?"
   authorize_follow:
     already_following: Yá tas siguiendo a esta cuenta
     already_requested: Yá unviesti una solicitú de siguimientu a esa cuenta
@@ -175,8 +193,16 @@ ast:
       web: Dir a la web
   datetime:
     distance_in_words:
+      about_x_hours: "%{count} h"
+      about_x_years: "%{count} a"
+      almost_x_years: "%{count} a"
       half_a_minute: Puramente agora
+      less_than_x_minutes: "%{count} m"
       less_than_x_seconds: Puramente agora
+      over_x_years: "%{count} a"
+      x_days: "%{count} d"
+      x_minutes: "%{count} m"
+      x_seconds: "%{count} s"
   deletes:
     challenge_not_passed: La información qu'introduxesti nun yera correuta
     confirm_password: Introduz la contraseña pa verificar la to identidá
@@ -193,7 +219,7 @@ ast:
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': Nun tienes permisu pa ver esta páxina.
-    '404': La páxina que tabes guetando nun ta equí.
+    '404': La páxina que busques nun ta equí.
     '406': Esta páxina nun ta disponible nel formatu solicitáu.
     '410': La páxina que tabes guetando yá nun esiste.
     '422':
@@ -201,7 +227,7 @@ ast:
       title: Falló la verificación de seguranza
     '429': Ficiéronse milenta solicitúes
     '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '503': Nun se pudo sirvir la páxina pola mor d'un fallu temporal del sirvidor.
   exports:
     archive_takeout:
       date: Data
@@ -213,6 +239,7 @@ ast:
     blocks: Xente que bloquiesti
     lists: Llistes
     mutes: Xente que silenciesti
+    storage: Almacenamientu multimedia
   featured_tags:
     add_new: Amestar
   filters:
@@ -275,8 +302,8 @@ ast:
       limit: Algamesti la cantidá máxima de llistes
   media_attachments:
     validations:
-      images_and_video: Nun pue axuntase un videu a un estáu que yá contién imáxenes
-      too_many: Nun puen axuntase más de 4 ficheros
+      images_and_video: Nun se pue axuntar nengún videu a un artículu que yá contién imáxenes
+      too_many: Nun se puen axuntar más de 4 ficheros
   migrations:
     acct: nome_usuariu@dominiu de la cuenta nueva
     incoming_migrations: Mudase dende otra cuenta
@@ -349,6 +376,11 @@ ast:
       generic: Restolador desconocíu
       ie: Internet Explorer
       micro_messenger: MicroMessenger
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      uc_browser: UCBrowser
+      weibo: Weibo
     current_session: Sesión actual
     description: "%{browser} en %{platform}"
     ip: IP
@@ -399,7 +431,7 @@ ast:
     boosted_from_html: Compartióse'l barritu dende %{acct_link}
     pin_errors:
       limit: Yá fixesti'l númberu máximu de barritos
-      ownership: Nun pue fixase'l barritu d'otra persona
+      ownership: Nun se pue fixar l'artículu d'otru perfil
       reblog: Nun pue fixase un barritu compartíu
     poll:
       total_people:
@@ -423,6 +455,7 @@ ast:
       '2629746': 1 mes
       '31556952': 1 añu
       '5259492': 2 meses
+      '604800': 1 selmana
       '63113904': 2 años
       '7889238': 3 meses
   stream_entries:
@@ -446,6 +479,7 @@ ast:
     webauthn: Claves d'autenticación
   user_mailer:
     warning:
+      reason: 'Motivu:'
       subject:
         suspend: Suspendióse la cuenta %{acct}
       title:
@@ -456,6 +490,7 @@ ast:
       subject: Afáyate en Mastodon
       tips: Conseyos
   users:
+    follow_limit_reached: Nun pues siguir a más de %{limit} persones
     invalid_otp_token: El códigu nun ye válidu
     otp_lost_help_html: Si pierdes l'accesu, contauta con %{email}
     seamless_external_login: Aniciesti sesión pente un serviciu esternu, polo que los axustes de la contraseña y corréu nun tán disponibles.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ba0d2e4a5..e017dd0e2 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -61,7 +61,6 @@ bg:
     media: Мултимедия
     moved_html: "%{name} се премести в %{new_profile_link}:"
     network_hidden: Тази информация не е налична
-    never_active: Никога
     nothing_here: Тук няма никого!
     people_followed_by: Хора, които %{name} следва
     people_who_follow: Хора, които следват %{name}
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 5d7f89a70..75563b5ac 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -64,7 +64,6 @@ bn:
     media: ছবি বা ভিডিও
     moved_html: "%{name} চলে গেছে %{new_profile_link} তে:"
     network_hidden: এই তথ্যটি নেই
-    never_active: কখনও না
     nothing_here: এখানে কিছুই নেই!
     people_followed_by: "%{name} যাদেরকে অনুসরণ করে"
     people_who_follow: যারা %{name} কে অনুসরণ করে
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 0f66b6fbc..618ea48b5 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -36,7 +36,6 @@ br:
       other: Heulier·ez
       two: Heulier·ez
     following: O heuliañ
-    never_active: Birviken
     posts:
       few: Toud
       many: Toud
@@ -117,11 +116,6 @@ br:
           noop: Hini ebet
           silence: Mudañ
           suspend: Astalañ
-      severity:
-        silence: mudet
-        suspend: astalet
-      show:
-        undo: Dizober
     email_domain_blocks:
       add_new: Ouzhpenniñ unan nevez
       delete: Dilemel
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 11cd14566..741d172b2 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -16,6 +16,7 @@ ca:
     contact: Contacte
     contact_missing: No configurat
     contact_unavailable: N/D
+    continue_to_web: Continua a l'aplicació web
     discover_users: Descobrir usuaris
     documentation: Documentació
     federation_hint_html: Amb un compte de %{instance} podràs seguir persones de qualsevol servidor Mastodon i altres.
@@ -25,6 +26,8 @@ ca:
       Aquest compte és un actor virtual utilitzat per a representar al propi servidor i no cap usuari individual.
       S'utilitza per a propòsits de federació i no ha de ser bloquejat si no voleu bloquejar tota la instància, en aquest cas hauríeu d'utilitzar un bloqueig de domini.
     learn_more: Més informació
+    logged_in_as_html: Actualment has iniciat sessió com a %{username}.
+    logout_before_registering: Ja has iniciat sessió.
     privacy_policy: Política de privadesa
     rules: Normes del servidor
     rules_html: 'El de sota és un resum de les normes que has de seguir si vols tenir un compte en aquest servidor de Mastodon:'
@@ -69,7 +72,6 @@ ca:
     media: Mèdia
     moved_html: "%{name} s'ha mogut a %{new_profile_link}:"
     network_hidden: Aquesta informació no està disponible
-    never_active: Mai
     nothing_here: No hi ha res aquí!
     people_followed_by: Usuaris seguits per %{name}
     people_who_follow: Usuaris que segueixen %{name}
@@ -448,21 +450,6 @@ ca:
       reject_media_hint: Elimina els fitxers multimèdia emmagatzemats localment i impedeix baixar-ne cap en el futur. Irrellevant en les suspensions
       reject_reports: Rebutja informes
       reject_reports_hint: Ignora tots els informes procedents d'aquest domini. No és rellevant per a les suspensions
-      rejecting_media: rebutjant els fitxers multimèdia
-      rejecting_reports: rebutjant els informes
-      severity:
-        silence: silenciat
-        suspend: suspès
-      show:
-        affected_accounts:
-          one: Un compte afectat en la base de dades
-          other: "%{count} comptes afectats en la base de dades"
-          zero: Cap compte afectat en la base de dades
-        retroactive:
-          silence: Desfés el silenci a tots els comptes existents d'aquest domini
-          suspend: Desfés la suspensió de tots els comptes d'aquest domini
-        title: Desfés el bloqueig de domini de %{domain}
-        undo: Desfés
       undo: Desfés el bloqueig del domini
       view: Veure el bloqueig del domini
     email_domain_blocks:
@@ -493,23 +480,47 @@ ca:
       title: Seguir les recomanacions
       unsuppress: Restaurar les recomanacions de seguiment
     instances:
+      availability:
+        description_html:
+          one: Si la tramesa cap el domini falla <strong>%{count} dia</strong> sense èxit, no es faran més intents d'entrega a no ser que es rebi una tramesa <em>des de</em> el domini.
+          other: Si la tramesa cap el domini falla durant <strong>%{count} diferents dies</strong> sense èxit, no es faran més intents a no se que es rebi una tramesa <em>des de</em> el domini.
+        failure_threshold_reached: Llindar de fallada assolit el %{date}.
+        failures_recorded:
+          one: Inten fallit en %{count} dia.
+          other: Intents fallits en %{count} diferents dies.
+        no_failures_recorded: Sense errors registrats.
+        title: Disponibilitat
       back_to_all: Totes
       back_to_limited: Limitades
       back_to_warning: Avís
       by_domain: Domini
       confirm_purge: Estàs segur que vols eliminar permanentment les dades d'aquest domini?
+      content_policies:
+        comment: Nota interna
+        description_html: Pots definir polítiques de contingut que seran aplicades a tots els comptes d'aquest domini i a qualsevol dels seus subdominis.
+        policies:
+          reject_media: Rebutja mèdia
+          reject_reports: Rebutja informes
+          silence: Límit
+          suspend: Suspèn
+        policy: Política
+        reason: Raó pública
+        title: Polítiques de contingut
+      dashboard:
+        instance_accounts_dimension: Comptes més seguits
+        instance_accounts_measure: comptes desats
+        instance_followers_measure: els nostres seguidors d'allà
+        instance_follows_measure: els seus seguidors d'aquí
+        instance_languages_dimension: Idiomes principals
+        instance_media_attachments_measure: adjunts multimèdia desats
+        instance_reports_measure: informes sobre ells
+        instance_statuses_measure: publicacions desades
       delivery:
         all: Totes
         clear: Neteja els errors de lliurament
         restart: Reinicia el lliurament
         stop: Atura el lliurament
-        title: Lliurament
         unavailable: No disponible
-        unavailable_message: El lliurament no està disponible
-        warning: Avís
-        warning_message:
-          one: Fallada de lliurament %{count} dia
-          other: Fallada de lliurament %{count} dies
       delivery_available: El lliurament està disponible
       delivery_error_days: Dies de fallades de lliurament
       delivery_error_hint: Si el lliurament no és possible per %{count} dies, serà automàticament marcat com a no lliurable.
@@ -526,12 +537,14 @@ ca:
       private_comment: Comentari privat
       public_comment: Comentari públic
       purge: Purga
+      purge_description_html: Si creus que aquest domini està fora de línia per sempre, pots esborrar tots els seus comptes i dades relacionades del teu emmagatzematge. Això pot trigar una estona.
       title: Federació
       total_blocked_by_us: Bloquejats per nosaltres
       total_followed_by_them: Seguits per ells
       total_followed_by_us: Seguits per nosaltres
       total_reported: Informes sobre ells
       total_storage: Adjunts multimèdia
+      totals_time_period_hint_html: Els totals mostrats a sota incloeixen dades de tots els temps.
     invites:
       deactivate_all: Desactiva-ho tot
       filter:
@@ -586,6 +599,7 @@ ca:
       action_taken_by: Mesures adoptades per
       actions:
         delete_description_html: Les publicacions reportades seran eliminades i un cop serà gravat per ajudar-te a escalar en futures infraccions des d'el mateix compte.
+        mark_as_sensitive_description_html: Els mèdia de les publicacions reportades seran marcats com a sensibles i una acció serà gravada per ajudar a escalar en futures infraccions del mateix compte.
         other_description_html: Veu més opcions controlant el comportament del compte i personalitza la comunicació al compte reportat.
         resolve_description_html: No serà presa cap acció contra el compte reportat, cap cop serà gravat i l'informe es tancarà.
         silence_description_html: El perfil serà visible només per aquells que ja el seguien o en cerca manual, limitant severament el seu alcanç. Sempre pot ser revertit.
@@ -606,6 +620,7 @@ ca:
       forwarded: Reenviat
       forwarded_to: Reenviat a %{domain}
       mark_as_resolved: Marca com a resolt
+      mark_as_sensitive: Marca com a sensible
       mark_as_unresolved: Marcar com a sense resoldre
       no_one_assigned: Ningú
       notes:
@@ -749,6 +764,7 @@ ca:
       actions:
         delete_statuses: "%{name} ha eliminat les publicacions de %{target}"
         disable: "%{name} ha congelat el compte de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcat les publicacions de %{target} com a sensibles"
         none: "%{name} ha enviat un avís a %{target}"
         sensitive: "%{name} ha marcat el compte de %{target} com a sensible"
         silence: "%{name} ha limitat el compte de %{target}"
@@ -774,6 +790,7 @@ ca:
       links:
         allow: Permet enllaç
         allow_provider: Permet mitjà
+        description_html: Aquests son enllaços que ara mateix s'estan compartint molt per els comptes que el teu servidor en veu les publicacions. Poden ajudar als teus usuaris a trobar què està passant en el món. Cap dels enllaços es mostra publicament fins que no aprovis el mitjà. També pots aceptar o rebutjar enllaços individuals.
         disallow: No permetre l'enllaç
         disallow_provider: No permetre el mitjà
         shared_by_over_week:
@@ -785,14 +802,17 @@ ca:
       pending_review: Revisió pendent
       preview_card_providers:
         allowed: Els enllaços d'aquest mitjà poden estar en tendència
+        description_html: Aquest son els dominis des d´els quals es comparteixen sovint enllaços en el teu servidor. Els enllaços no seran tendència pública fins que el domini del enllaç s'aprovi. La teva aprovació (o rebuig) es fa extensible als subdominis.
         rejected: Els enllaços d'aquest mitjà no poden estar en tendència
         title: Mitjans
       rejected: Rebutjat
       statuses:
         allow: Permet publicació
         allow_account: Permet autor
+        description_html: Aquestes son publicacions que el teu servidor veu i que ara mateix s'estan compartint i afavorint molt. Poden ajudar als teus nous usuaris i als que retornen a trobar més gent a qui seguir. Cap publicació es mostra publicament fins que no aprovis l'autor i l'autor permeti que el seu compte sigui sugerit a altres. També pots aceptar o rebutjar publicacions individuals.
         disallow: Rebutja publicació
         disallow_account: Rebutja autor
+        not_discoverable: L'autor no ha activat poder ser detectable
         shared_by:
           one: Compartit o afavorit una vegada
           other: Compartit i afavorit %{friendly_count} vegades
@@ -805,6 +825,7 @@ ca:
           tag_servers_dimension: Els millors servidors
           tag_servers_measure: diferents servidors
           tag_uses_measure: total usos
+        description_html: Aquestes son etiquetes que ara mateix estan apareixen en moltes publicacions que el teu servidor veu. Poden ajudar als teus usuaris a trobar de què està parlant majoritariament la gent en aquest moment. Cap etiqueta es mostra publicament fins que no l'aprovis.
         listable: Es pot suggerir
         not_listable: No es pot suggerir
         not_trendable: No apareixeran en les tendències
@@ -831,6 +852,7 @@ ca:
       actions:
         delete_statuses: eliminar les seves publicacions
         disable: congelar els seus comptes
+        mark_statuses_as_sensitive: marcar les seves publicacions com a sensibles
         none: un avís
         sensitive: marcar els seus comptes com a sensibles
         silence: limitar els seus comptes
@@ -933,8 +955,10 @@ ca:
     status:
       account_status: Estat del compte
       confirming: Esperant que es completi la confirmació del correu electrònic.
+      functional: El teu compte està completament operatiu.
       pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
       redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
+      view_strikes: Veure accions del passat contra el teu compte
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
     trouble_logging_in: Problemes per iniciar la sessió?
     use_security_key: Usa clau de seguretat
@@ -1010,6 +1034,7 @@ ca:
         submit: Apel·lació emesa
       associated_report: Informe associat
       created_at: Datada
+      description_html: Aquestes son accions preses contra el teu compte i avisos que se t'han enviat per l'equip de %{instance}.
       recipient: Dirigida a
       status: 'Publicació #%{id}'
       status_removed: Publicació ja esborrada del sistema
@@ -1017,8 +1042,9 @@ ca:
       title_actions:
         delete_statuses: Eliminació de publicació
         disable: Congelació del compte
+        mark_statuses_as_sensitive: Marcatge de les publicacions com a sensibles
         none: Avís
-        sensitive: Marcant com a sensible el compte
+        sensitive: Marcatge del compte com a sensible
         silence: Limitació del compte
         suspend: Suspensió del compte
       your_appeal_approved: La teva apel·lació s'ha aprovat
@@ -1390,6 +1416,7 @@ ca:
     profile: Perfil
     relationships: Seguits i seguidors
     statuses_cleanup: Esborrat automàtic de publicacions
+    strikes: Accions de mediació
     two_factor_authentication: Autenticació de dos factors
     webauthn_authentication: Claus de seguretat
   statuses:
@@ -1469,6 +1496,7 @@ ca:
       '2629746': 1 mes
       '31556952': 1 any
       '5259492': 2 mesos
+      '604800': 1 setmana
       '63113904': 2 anys
       '7889238': 3 mesos
     min_age_label: Llindar d'edat
@@ -1616,17 +1644,18 @@ ca:
         spam: Contingut brossa
         violation: El contingut viola les següents guies de la comunitat
       explanation:
-        delete_statuses: Algunes de les teves publicacions han estat trobades que violen les guies de la comunitat i han estat per tant esborrades per els moderadors de %{instance}. Futures violacions podrien resultar en accions més punitives contra el teu compte.
+        delete_statuses: Algunes de les teves publicacions s'han trobat que violen una o més directrius de la comunitat i per tant han estat eliminades per els moderadors de %{instance}.
         disable: Ja no pots utilitzar el teu compte però el teu perfil i altres dades segueixen intactes. Pots demanar una copia de les teves dades, canviar els ajustaments del teu compte o esborrar-lo.
+        mark_statuses_as_sensitive: Algunes de les teves publicacions han estat marcades com a sensibles per els moderadors de %{instance}. Això significa que la gent necessitarà tocar els mèdia en les publicacions per a que la previsualització sigui mostrada. Tu mateix pots marcar els teus mèdia com a sensibles quan publiquis en el futur.
         sensitive: A partir d'ara, tots els mèdia pujats seran marcats com a sensibles i ocultats darrera un avís.
         silence: Encara pots fer servir el teu compte però només la gent que ja t'està seguint veuran les teves publicacions en aquest servidor i tu podries ser exclòs de les diverses opcions de descobriment. De totes maneres altres podrien encara seguir-te manualment.
         suspend: Ja no pots utilitzar el teu compte i el teu perfil i altres dades ja no son accessibles. Encara pots iniciar sessió per a demanar una copia de les teves dades fins que siguin totalment eliminades als 30 dies però es mantindran les dades bàsiques per evitar que esquivis la suspensió.
-      get_in_touch: Si tu creus que això és un error pots respondre aquest correu electrònic per a contactar amb l'equip de %{instance}.
       reason: 'Raó:'
-      statuses: 'Publicacions que han estat trobades com a violació:'
+      statuses: 'Publicacions citades:'
       subject:
         delete_statuses: Les teves publicacions de %{acct} han estat esborrades
         disable: S'ha congelat el teu compte %{acct}
+        mark_statuses_as_sensitive: Les teves publicacions de %{acct} han estat marcades com a sensibles
         none: Avís per a %{acct}
         sensitive: Els teus mèdia de %{acct} seran marcades com a sensibles a partir d'ara
         silence: El teu compte %{acct} ha estat limitat
@@ -1634,8 +1663,9 @@ ca:
       title:
         delete_statuses: Publicacions esborrades
         disable: Compte congelat
+        mark_statuses_as_sensitive: Publicacions marcades com a sensibles
         none: Avís
-        sensitive: Mèdia ocult
+        sensitive: Compte marcat com a sensible
         silence: Compte limitat
         suspend: Compte suspès
     welcome:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 4d5327aef..4de3f56cf 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -69,7 +69,6 @@ co:
     media: Media
     moved_html: "%{name} hà cambiatu di contu, avà hè nant’à %{new_profile_link}:"
     network_hidden: St'infurmazione ùn hè micca dispunibule
-    never_active: Mai
     nothing_here: Ùn c’hè nunda quì!
     people_followed_by: Seguitati da %{name}
     people_who_follow: Seguitanu %{name}
@@ -409,17 +408,6 @@ co:
       reject_media_hint: Sguassa tutti i media caricati è ricusa caricamenti futuri. Inutile per una suspensione
       reject_reports: Righjittà i riporti
       reject_reports_hint: Ignurà tutti i signalamenti chì venenu d'issu duminiu. Senz'oghjettu pè e suspensione
-      rejecting_media: righjettu di i fugliali media
-      rejecting_reports: righjettu di i signalamenti
-      severity:
-        silence: silenzatu
-        suspend: suspesu
-      show:
-        retroactive:
-          silence: Ùn silenzà più i conti affettati di stu duminiu
-          suspend: Ùn suspende più i conti affettati di stu duminiu
-        title: Ùn bluccà più u duminiu %{domain}
-        undo: Annullà
       undo: Annullà u blucchime di duminiu
       view: Vede blucchime di duminiu
     email_domain_blocks:
@@ -448,13 +436,7 @@ co:
         clear: Sguassà l'errori di distribuzione
         restart: Riprincipià a distribuzione
         stop: Firmà a distribuzione
-        title: Distribuzione
         unavailable: Indispunibule
-        unavailable_message: Distribuzione micca dispunibule
-        warning: Avertimentu
-        warning_message:
-          one: Errore di distribuzione per %{count} ghjornu
-          other: Errore di distribuzione per %{count} ghjorni
       delivery_available: Distribuzione dispunibule
       delivery_error_days: Ghjorni d'errori di a distribuzione
       delivery_error_hint: S'ellu ùn si pò distribuì à u duminiu per %{count} ghjorni, sarà autumaticamente marcatu cum'è indistribuibile.
@@ -1251,6 +1233,7 @@ co:
       '2629746': 1 mese
       '31556952': 1 annu
       '5259492': 2 mesi
+      '604800': 1 week
       '63113904': 2 anni
       '7889238': 3 mesi
     min_age_label: Età minima
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0db4bd7e5..ee8ab2474 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -75,7 +75,6 @@ cs:
     media: Média
     moved_html: "%{name} se přesunul a na %{new_profile_link}:"
     network_hidden: Tato informace není k dispozici
-    never_active: Nikdy
     nothing_here: Nic tu není!
     people_followed_by: Lidé, které sleduje %{name}
     people_who_follow: Lidé, kteří sledují %{name}
@@ -428,17 +427,6 @@ cs:
       reject_media_hint: Odstraní lokálně uložené mediální soubory a odmítne jejich stahování v budoucnosti. Nepodstatné pro pozastavení
       reject_reports: Odmítat hlášení
       reject_reports_hint: Ignorovat všechna hlášení pocházející z této domény. Nepodstatné pro pozastavení
-      rejecting_media: odmítají se mediální soubory
-      rejecting_reports: odmítají se hlášení
-      severity:
-        silence: omezena
-        suspend: pozastaveno
-      show:
-        retroactive:
-          silence: Vzít zpět omezení existujících dotčených účtů z této domény
-          suspend: Zrušit pozastavení existujících ovlivněných účtů z této domény
-        title: Zrušit blokaci domény %{domain}
-        undo: Odvolat
       undo: Odvolat blokaci domény
       view: Zobrazit blokaci domény
     email_domain_blocks:
@@ -469,15 +457,7 @@ cs:
         clear: Vymazat chyby doručení
         restart: Restartovat doručování
         stop: Zastavit doručování
-        title: Doručování
         unavailable: Nedostupný
-        unavailable_message: Doručování nedostupné
-        warning: Varování
-        warning_message:
-          few: Doručení selhává %{count} dny
-          many: Doručení selhává %{count} dnů
-          one: Doručení selhává %{count} den
-          other: Doručení selhává %{count} dnů
       delivery_available: Doručení je k dispozici
       delivery_error_days: Dny chybného doručování
       delivery_error_hint: Není-li možné doručení po dobu %{count} dnů, bude automaticky označen za nedoručitelný.
@@ -1339,6 +1319,7 @@ cs:
       '2629746': 1 měsíc
       '31556952': 1 rok
       '5259492': 2 měsíce
+      '604800': 1 week
       '63113904': 2 roky
       '7889238': 3 měsíce
     min_age_label: Hranice stáří
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 066a54cbc..ad2e0a936 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -77,7 +77,6 @@ cy:
     media: Cyfryngau
     moved_html: 'Mae %{name} wedi symud i %{new_profile_link}:'
     network_hidden: Nid yw'r wybodaeth hyn ar gael
-    never_active: Peidiwch byth
     nothing_here: Does dim byd yma!
     people_followed_by: Pobl y mae %{name} yn ei ddilyn
     people_who_follow: Pobl sy'n dilyn %{name}
@@ -328,17 +327,6 @@ cy:
       reject_media_hint: Dileu dogfennau cyfryngau wedi eu cadw yn lleol ac yn gwrthod i lawrlwytho unrhyw rai yn y dyfodol. Amherthnasol i ataliadau
       reject_reports: Gwrthod adroddiadau
       reject_reports_hint: Anwybyddu'r holl adroddiadau sy'n dod o'r parth hwn. Amherthnasol i ataliadau
-      rejecting_media: Yn gwrthod ffeiliau cyfryngau
-      rejecting_reports: Yn gwrthod adroddiadau
-      severity:
-        silence: tawelu
-        suspend: ataliedig
-      show:
-        retroactive:
-          silence: Dad-dawelu pob cyfri presennol o'r parth hwn
-          suspend: Dad-atal pob cyfrif o'r parth hwn sy'n bodoli
-        title: Dadwneud blocio parth ar gyfer %{domain}
-        undo: Dadwneud
       undo: Dadwneud bloc parth
       view: Gweld bloc parth
     email_domain_blocks:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 8d9be5f18..acf79160f 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1,53 +1,56 @@
 ---
 da:
   about:
-    about_hashtag_html: Disse er offentlige trut tagget med <strong>#%{hashtag}</strong>. Du kan interagere med dem, hvis du har en konto hvor som helst i fediverset.
-    about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Ej dine data med Mastodon!'
+    about_hashtag_html: Disse er offentlige indlæg tagget med <strong>#%{hashtag}</strong>, som man kan interagere med, hvis man har en konto hvor som helst i fediverset.
+    about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Vær ejer af egne data med Mastodon!'
     about_this: Om
     active_count_after: aktive
     active_footnote: Månedlige aktive brugere (MAU)
-    administered_by: 'Administreres af:'
+    administered_by: 'Håndteres af:'
     api: API
     apps: Mobil-apps
     apps_platforms: Benyt Mastodon på Android, iOS og andre platforme
-    browse_directory: Gennemse en profilindholdsfortegnelse og filtrér efter interesser
+    browse_directory: Gennemse en profilmappe og filtrér efter interesser
     browse_local_posts: Gennemse en live stream af offentlige indlæg fra denne server
     browse_public_posts: Gennemse en live stream af offentlige indlæg på Mastodon
     contact: Kontakt
-    contact_missing: Ikke sat
+    contact_missing: Ikke angivet
     contact_unavailable: Utilgængelig
+    continue_to_web: Fortsæt til web-app
     discover_users: Find brugere
     documentation: Dokumentation
-    federation_hint_html: Med en konto på %{instance} vil du kunne følge andre på en hvilken som helst Mastodon-server.
+    federation_hint_html: Vha. en konto på %{instance} vil man kunne følge andre på en hvilken som helst Mastodon-server.
     get_apps: Prøv en mobil-app
     hosted_on: Mostodon hostet på %{domain}
     instance_actor_flash: |
-      Denne konto er en virtuel skuespiller, der bruges til at repræsentere selve serveren og ikke nogen individuel bruger.
-      Det bruges til føderationsformål og bør ikke blokeres, medmindre du vil blokere hele forekomsten og i så tilfælde bør bruge en domæneblokering.
-    learn_more: Få mere at vide
+      Denne konto er en virtuel aktør brugt som repræsentation af selve serveren og ikke en individuel bruger.
+      Den bruges til fællesformål og bør ikke blokeres, medmindre hele instansen ønskes blokeret, i hvilket tilfælde man bør bruge domæneblokering.
+    learn_more: Læs mere
+    logged_in_as_html: Du er pt. logget ind som %{username}.
+    logout_before_registering: Allerede logget ind.
     privacy_policy: Fortrolighedspolitik
     rules: Serverregler
-    rules_html: 'Nedenfor ses en oversigt over regler, som skal følges, hvis du ønsker at have en konto på denne Mastodon-server:'
+    rules_html: 'Nedenfor ses en oversigt over regler, som skal følges, hvis man ønsker at have en konto på denne Mastodon-server:'
     see_whats_happening: Se, hvad der sker
     server_stats: 'Serverstatstik:'
     source_code: Kildekode
     status_count_after:
-      one: status
-      other: statusser
-    status_count_before: Som har skrevet
-    tagline: Følg venner og find nye
+      one: indlæg
+      other: indlæg
+    status_count_before: Som har postet
+    tagline: Følg venner og opdag nye
     terms: Tjenestevilkår
     unavailable_content: Modererede servere
     unavailable_content_description:
       domain: Server
       reason: Årsag
-      rejecting_media: 'Mediefiler fra disse servere behandles eller gemmes ikke, og ingen miniaturebilleder vises, og kræver manuel klik-igennem til originalfilen:'
+      rejecting_media: 'Mediefiler fra disse servere hverken behandles eller gemmes, og ingen miniaturebilleder vises, hvilket kræver manuelt klik-igennem til originalfilen:'
       rejecting_media_title: Filtrerede medier
-      silenced: 'Indlæg fra disse servere er skjult i offentlige tidslinjer og konversationer, og der genereres ingen notifikationer fra deres brugerinteraktioner, medmindre du følger dem:'
-      silenced_title: Tavsgjorte servere
-      suspended: 'Ingen data fra disse servere behandles, gemmes eller udveksles, hvilket umuliggør interaktion eller kommunikation med brugere fra disse servere:'
+      silenced: 'Indlæg fra disse servere er skjult i offentlige tidslinjer og konversationer, og der genereres ingen notifikationer fra deres brugerinteraktioner, medmindre man følger dem:'
+      silenced_title: Begrænsede servere
+      suspended: 'Data fra disse servere hverken behandles, gemmes eller udveksles, hvilket umuliggør interaktion eller kommunikation med brugere fra disse servere:'
       suspended_title: Suspenderede servere
-    unavailable_content_html: Mastodon tillader dig generelt at se indhold og interagere med brugere fra enhver anden server i fediverset. Disse er undtagelserne, som er implementeret på netop denne servertype.
+    unavailable_content_html: Mastodon tillader generelt, at man ser indhold og interagere med brugere fra enhver anden server i fediverset. Disse er undtagelserne, som er implementeret på netop denne server.
     user_count_after:
       one: bruger
       other: brugere
@@ -55,31 +58,30 @@ da:
     what_is_mastodon: Hvad er Mastodon?
   accounts:
     choices_html: "%{name}s valg:"
-    endorsements_hint: Du kan støtte personer, du følger, fra webgrænsefladen, og de vil fremgå hér.
-    featured_tags_hint: Du kan fremhæve bestemte hashtags, som så vil fremgå hér.
+    endorsements_hint: Man kan støtte personer, man følger, fra webgrænsefladen, som så vil fremgå hér.
+    featured_tags_hint: Man kan fremhæve bestemte hashtags, som så vil fremgå hér.
     follow: Følg
     followers:
       one: Følger
       other: Følgere
     following: Følger
-    instance_actor_flash: Denne konto er en virtuel aktør, der bruges til at repræsentere selve serveren og ikke nogen individuel bruger. Den anvendes til føderation og bør ikke suspenderes.
+    instance_actor_flash: Denne konto er en virtuel aktør repræsenterende selve serveren og ikke en individuel bruger. Den anvendes til fællesformål og bør ikke suspenderes.
     joined: Tilmeldt %{date}
     last_active: senest aktiv
     link_verified_on: Ejerskab af dette link blev tjekket %{date}
     media: Medier
     moved_html: "%{name} er flyttet til %{new_profile_link}:"
     network_hidden: Denne information er utilgængelig
-    never_active: Aldrig
     nothing_here: Der er intet hér!
     people_followed_by: Personer, som %{name} følger
     people_who_follow: Personer, som følger %{name}
     pin_errors:
-      following: Du skal allerede følge den person, du ønsker at støtte
+      following: Man skal allerede følge den person, man ønsker at støtte
     posts:
-      one: Trut
-      other: Trut
-    posts_tab_heading: Trut
-    posts_with_replies: Trut og svar
+      one: Indlæg
+      other: Indlæg
+    posts_tab_heading: Indlæg
+    posts_with_replies: Indlæg og svar
     roles:
       admin: Admin
       bot: Bot
@@ -92,13 +94,13 @@ da:
       action: Udfør handling
       title: Udfør moderatorhandling på %{acct}
     account_moderation_notes:
-      create: Læg en note
+      create: Skriv notat
       created_msg: Moderatornotat oprettet!
       destroyed_msg: Moderatornotat destrueret!
     accounts:
       add_email_domain_block: Blokér e-maildomæne
       approve: Godkend
-      approved_msg: Tilmeldingsansøgning for %{username} blev godkendt
+      approved_msg: Tilmeldingsansøgning for %{username} godkendt
       are_you_sure: Sikker?
       avatar: Profilbillede
       by_domain: Domæne
@@ -116,7 +118,7 @@ da:
       delete: Slet data
       deleted: Slettet
       demote: Degradér
-      destroyed_msg: "%{username}s data er nu i kø til straks at blive slettet"
+      destroyed_msg: "%{username}s data er nu sat i kø mhp. snarlig sletning"
       disable: Frys
       disable_sign_in_token_auth: Deaktivér e-mailtokengodkendelse
       disable_two_factor_authentication: Deaktivér 2FA
@@ -127,7 +129,7 @@ da:
       email: E-mail
       email_status: E-mailstatus
       enable: Optø
-      enable_sign_in_token_auth: Aktivér e-mailtokengodkendelse
+      enable_sign_in_token_auth: Aktivér e-mailtoken godkendelse
       enabled: Aktiveret
       enabled_msg: "%{username}s konto er optøet"
       followers: Følgere
@@ -146,7 +148,7 @@ da:
       login_status: Indlogningsstatus
       media_attachments: Medievedhæftninger
       memorialize: Omdan til mindekonto
-      memorialized: Minde gjort
+      memorialized: Memorialiseret
       memorialized_msg: "%{username} gjort til mindekonto"
       moderation:
         active: Aktiv
@@ -162,20 +164,23 @@ da:
       not_subscribed: Abonnerer ikke
       pending: Afventende vurdering
       perform_full_suspension: Suspendér
+      previous_strikes: Tidligere anmeldelser (strikes)
       previous_strikes_description_html:
-        zero: Denne kontostatus er <strong>på god fod</strong>.
+        one: Denne konto har <strong>et</strong> anmeldelse.
+        other: Denne konto har <strong>%{count}</strong> anmeldelser.
+        zero: Denne konto er <strong>på god fod</strong>.
       promote: Forfrem
       protocol: Protokol
       public: Offentlig
       push_subscription_expires: PuSH-abonnement udløber
       redownload: Opfrisk profil
-      redownloaded_msg: Profil for %{username} opfriske fra oprindelsesserver
+      redownloaded_msg: "%{username}s profil opfrisket fra oprindelsesserver"
       reject: Afvis
-      rejected_msg: Tilmeldingsansøgning fra %{username} afvist
+      rejected_msg: "%{username}s tilmeldingsansøgning afvist"
       remove_avatar: Fjern profilbillede
       remove_header: Fjern overskrift
-      removed_avatar_msg: Profilbillede for %{username} fjernet
-      removed_header_msg: Overskriftsbillede for %{username} fjernet
+      removed_avatar_msg: "%{username}s profilbillede fjernet"
+      removed_header_msg: "%{username}s overskriftsbillede fjernet"
       resend_confirmation:
         already_confirmed: Denne bruger er allerede bekræftet
         send: Gensend bekræftelses e-mail
@@ -190,39 +195,39 @@ da:
         staff: Personale
         user: Bruger
       search: Søg
-      search_same_email_domain: Andre brugere med det samme e-maildomæne
-      search_same_ip: Andre brugere med den samme IP
+      search_same_email_domain: Øvrige brugere med samme e-maildomæne
+      search_same_ip: Øvrige brugere med identisk IP
       security_measures:
         only_password: Kun adgangskode
         password_and_2fa: Adgangskode og 2FA
         password_and_sign_in_token: Adgangskode og e-mailtoken
-      sensitive: Sensitivt
-      sensitized: markeret som sensitivt
+      sensitive: Gennemtving sensitiv
+      sensitized: Markeret som sensitiv
       shared_inbox_url: Delt indbakke-URL
       show:
         created_reports: Indsendte anmeldelser
         targeted_reports: Anmeldt af andre
-      silence: Tavsgør
-      silenced: Tavsgjort
-      statuses: Statusser
-      strikes: Tidligere striber
+      silence: Brgræns
+      silenced: Begrænset
+      statuses: Indlæg
+      strikes: Tidligere anmeldelser
       subscribe: Abonnér
       suspend: Suspendér
       suspended: Suspenderet
-      suspension_irreversible: Disse kontodata er blevet slettet permanent. Du kan afsuspendere kontoen for at gøre den brugbar, men dette gendanner ikke de tidligere kontodata.
+      suspension_irreversible: Denne kontos data er blevet slettet permanent. Kontoen kan genaktiveres for at gøre den brugbar, imidlertid gendanner dette ikke tidligere kontodata.
       suspension_reversible_hint_html: Kontoen er blevet suspenderet, og dens data fjernes helt d. %{date}. Indtil da kan kontoen genoprettes uden datatab mv. Ønsker alle kontodata fjernet straks, kan dette gøres nedenfor.
       title: Konti
       unblock_email: Afblokér e-mailadresse
       unblocked_email_msg: "%{username}s e-mail-adresse afblokeret"
-      unconfirmed_email: Ikke-bekræftet e-mail
-      undo_sensitized: Fortryd sensitiv
-      undo_silenced: Fortryd tavsgørelse
+      unconfirmed_email: Ubekræftet e-mail
+      undo_sensitized: Fortryd gennemtving sensitiv
+      undo_silenced: Fortryd begrænsning
       undo_suspension: Fortryd suspendering
-      unsilenced_msg: "%{username}s konto er optøet"
+      unsilenced_msg: "%{username}s kontobegrænsning er fjernet"
       unsubscribe: Opsig abonnement
       unsuspended_msg: "%{username}s konto er afsuspenderet"
       username: Brugernavn
-      view_domain: Vis resumé for domæne
+      view_domain: Vis domæneoversigt
       warn: Advar
       web: Web
       whitelisted: Tilladt for federering
@@ -241,7 +246,7 @@ da:
         create_email_domain_block: Opret e-maildomæneblokering
         create_ip_block: Opret IP-regel
         create_unavailable_domain: Opret Utilgængeligt Domæne
-        demote_user: Degradere bruger
+        demote_user: Degradér bruger
         destroy_announcement: Slet bekendtgørelse
         destroy_custom_emoji: Slet tilpasset emoji
         destroy_domain_allow: Slet domænetilladelse
@@ -249,50 +254,50 @@ da:
         destroy_email_domain_block: Slet e-maildomæneblokering
         destroy_instance: Udrens domæne
         destroy_ip_block: Slet IP-regel
-        destroy_status: Slet status
+        destroy_status: Slet indlæg
         destroy_unavailable_domain: Slet Utilgængeligt Domæne
         disable_2fa_user: Deaktivér 2FA
         disable_custom_emoji: Deaktivér tilpasset emoji
-        disable_sign_in_token_auth_user: Deaktivér e-mailtokengodkendelse for bruger
+        disable_sign_in_token_auth_user: Deaktivér e-mailtoken godkendelse for bruger
         disable_user: Deaktivér bruger
         enable_custom_emoji: Aktivér tilpasset emoji
-        enable_sign_in_token_auth_user: Aktivér e-mailtokengodkendelse for bruger
-        enable_user: Aktivér brugeren
-        memorialize_account: Gør til mindekonto
-        promote_user: Promovér bruger
+        enable_sign_in_token_auth_user: Aktivér e-mailtoken godkendelse for bruger
+        enable_user: Aktivér bruger
+        memorialize_account: Memoralisér konto
+        promote_user: Forfrem bruger
         reject_appeal: Afvis appel
         reject_user: Afvis bruger
         remove_avatar_user: Fjern profilbillede
         reopen_report: Genåbn anmeldelse
         reset_password_user: Nulstil adgangskode
         resolve_report: Løs anmeldelse
-        sensitive_account: Markér medierne i din konto som sensitive
-        silence_account: Tavsgør konto
+        sensitive_account: Gennemtving sensitiv konto
+        silence_account: Begræns konto
         suspend_account: Suspendér konto
-        unassigned_report: Aftildel anmeldelse
-        unblock_email_account: Afblokér af e-mailadresse
-        unsensitive_account: Afmarkér medierne i din konto som sensitive
-        unsilence_account: Fjern kontotavsgørelse
+        unassigned_report: Fjer anmeldelsestildeling
+        unblock_email_account: Afblokér e-mailadresse
+        unsensitive_account: Fjern Gennemtving sensitiv konto
+        unsilence_account: Fjern kontobegrænselse
         unsuspend_account: Afsuspendér konto
         update_announcement: Opdatér bekendtgørelse
         update_custom_emoji: Opdatér tilpasset emoji
         update_domain_block: Opdatér domæneblokering
-        update_status: Opdatér status
+        update_status: Opdatér indlæg
       actions:
         approve_appeal_html: "%{name} godkendte moderationsafgørelsesappellen fra %{target}"
-        approve_user_html: "%{name} godkendte tilmelding fra %{target}"
+        approve_user_html: "%{name} godkendte tilmeldingen fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte sig selv anmeldelsen %{target}"
         change_email_user_html: "%{name} ændrede e-mailadressen for bruger %{target}"
         confirm_user_html: "%{name} bekræftede e-mailadressen for bruger %{target}"
         create_account_warning_html: "%{name} sendte en advarsel til %{target}"
         create_announcement_html: "%{name} oprettede den nye bekendtgørelse %{target}"
-        create_custom_emoji_html: "%{name} uploadede det nye emoji %{target}"
+        create_custom_emoji_html: "%{name} uploadede den nye emoji %{target}"
         create_domain_allow_html: "%{name} tillod federering med domænet %{target}"
         create_domain_block_html: "%{name} blokerede domænet %{target}"
         create_email_domain_block_html: "%{name} blokerede e-maildomænet %{target}"
         create_ip_block_html: "%{name} oprettede en regel for IP %{target}"
         create_unavailable_domain_html: "%{name} stoppede levering til domænet %{target}"
-        demote_user_html: "%{name} degraderede bruger %{target}"
+        demote_user_html: "%{name} degraderede brugeren %{target}"
         destroy_announcement_html: "%{name} slettede bekendtgørelsen %{target}"
         destroy_custom_emoji_html: "%{name} fjernede emojien %{target}"
         destroy_domain_allow_html: "%{name} fjernede federeringstilladelsen med domænet %{target}"
@@ -300,14 +305,14 @@ da:
         destroy_email_domain_block_html: "%{name} afblokerede e-maildomænet %{target}"
         destroy_instance_html: "%{name} udrensede domænet %{target}"
         destroy_ip_block_html: "%{name} slettede en regel for IP %{target}"
-        destroy_status_html: "%{name} fjernede statussen fra %{target}"
+        destroy_status_html: "%{name} fjernede indlægget fra %{target}"
         destroy_unavailable_domain_html: "%{name} genoptog levering til domænet %{target}"
         disable_2fa_user_html: "%{name} deaktiverede tofaktorkravet for brugeren %{target}"
-        disable_custom_emoji_html: "%{name} deaktiverede humørikonet %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} deaktiverede e-mailtokengodkendelse for %{target}"
+        disable_custom_emoji_html: "%{name} deaktiverede emojien %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} deaktiverede e-mailtoken godkendelsen for %{target}"
         disable_user_html: "%{name} deaktiverede indlogning for brugeren %{target}"
-        enable_custom_emoji_html: "%{name} aktiverede humørikonet %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverede e-mailtokengodkendelse for %{target}"
+        enable_custom_emoji_html: "%{name} aktiverede emojien %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverede e-mailtoken godkendelse for %{target}"
         enable_user_html: "%{name} aktiverede indlogning for brugeren %{target}"
         memorialize_account_html: "%{name} gjorde %{target}s konto til en mindeside"
         promote_user_html: "%{name} forfremmede brugeren %{target}"
@@ -318,24 +323,24 @@ da:
         reset_password_user_html: "%{name} nulstillede adgangskoden for brugeren %{target}"
         resolve_report_html: "%{name} løste anmeldelsen %{target}"
         sensitive_account_html: "%{name} markerede %{target}s medier som sensitive"
-        silence_account_html: "%{name} tavsgjorde %{target}s konto"
+        silence_account_html: "%{name} begrænsede %{target}s konto"
         suspend_account_html: "%{name} suspenderede %{target}s konto"
         unassigned_report_html: "%{name} fjernede tildelingen af rapporten %{target}"
         unblock_email_account_html: "%{name} afblokerede %{target}s e-mailadresse"
-        unsensitive_account_html: "%{name} afmarkerede %{target}s medier som sensitive"
-        unsilence_account_html: "%{name} fjernede tavsgøring af %{target}s konto"
+        unsensitive_account_html: "%{name} fjernede sensitivmarkeringen af %{target}s medier"
+        unsilence_account_html: "%{name} fjernede begrænsningen af %{target}s konto"
         unsuspend_account_html: "%{name} fjernede suspenderingen af %{target}s konto"
         update_announcement_html: "%{name} opdaterede bekendtgørelsen %{target}"
         update_custom_emoji_html: "%{name} opdaterede emoji %{target}"
         update_domain_block_html: "%{name} opdaterede domæneblokeringen for %{target}"
-        update_status_html: "%{name} opdaterede status for %{target}"
-      deleted_status: "(slettet status)"
+        update_status_html: "%{name} opdaterede indlægget fra %{target}"
+      deleted_status: "(slettet indlæg)"
       empty: Ingen logger fundet.
       filter_by_action: Filtrér efter handling
       filter_by_user: Filtrér efter bruger
       title: Revisionslog
     announcements:
-      destroyed_msg: Bekendtgørelsen blev slettet!
+      destroyed_msg: Bekendtgørelsen er slettet!
       edit:
         title: Redigér bekendtgørelse
       empty: Ingen bekendtgørelser fundet.
@@ -344,13 +349,13 @@ da:
         create: Opret bekendtgørelse
         title: Ny bekendtgørelse
       publish: Publicér
-      published_msg: Bekendtgørelsen blev publiceret!
+      published_msg: Bekendtgørelsen er publiceret!
       scheduled_for: Planlagt til %{time}
-      scheduled_msg: Bekendtgørelse planlagt til publicering!
+      scheduled_msg: Bekendtgørelse planlagt til udgivelse!
       title: Bekendtgørelser
       unpublish: Afpublicér
-      unpublished_msg: Bekendtgørelsen blev afpubliceret!
-      updated_msg: Bekendtgørelsen blev opdateret!
+      unpublished_msg: Bekendtgørelsen er afpubliceret!
+      updated_msg: Bekendtgørelsen er opdateret!
     custom_emojis:
       assign_category: Tildel kategori
       by_domain: Domæne
@@ -363,39 +368,39 @@ da:
       destroyed_msg: Emoji destrueret!
       disable: Deaktivér
       disabled: Deaktiveret
-      disabled_msg: Denne emoji blev deaktiveret
+      disabled_msg: Denne emoji er nu deaktiveret
       emoji: Emoji
       enable: Aktivér
       enabled: Aktiveret
-      enabled_msg: Denne emoji blev aktiveret
-      image_hint: PNG op til 50KB
+      enabled_msg: Denne emoji er nu aktiv
+      image_hint: PNG op til 50 kB
       list: Oplist
       listed: Oplistet
       new:
         title: Tilføj ny tilpasset emoji
-      not_permitted: Du har ikke tilladelse til at udføre denne handling
+      not_permitted: Ingen tilladelse til at udføre denne handling
       overwrite: Overskriv
       shortcode: Kortkode
-      shortcode_hint: Mindst 2 tegn, kun alfanumeriske tegn og understreger
+      shortcode_hint: Mindst 2 tegn, kun alfanumeriske og understregstegn
       title: Tilpassede emojier
       uncategorized: Ukategoriseret
       unlist: Fjern fra oplistning
       unlisted: Ikke oplistet
-      update_failed_msg: Kunne ikke opdatere den emoji
-      updated_msg: Emoji blev opdateret!
+      update_failed_msg: Kunne ikke opdatere denne emoji
+      updated_msg: Emoji er opdateret!
       upload: Upload
     dashboard:
       active_users: aktive brugere
       interactions: interaktioner
       media_storage: Medielagerplads
       new_users: nye brugere
-      opened_reports: rapporter åbnet
+      opened_reports: anmeldelser åbnet
       pending_appeals_html:
-        one: "<strong>%{count}</strong> afventende appel"
-        other: "<strong>%{count}</strong> afventende appeller"
+        one: "<strong>%{count}</strong> verserende anke"
+        other: "<strong>%{count}</strong> verserende anker"
       pending_reports_html:
-        one: "<strong>%{count}</strong> afventende anmeldelse"
-        other: "<strong>%{count}</strong> afventende anmeldelser"
+        one: "<strong>%{count}</strong> verserende anmeldelse"
+        other: "<strong>%{count}</strong> verserende anmeldelser"
       pending_tags_html:
         one: "<strong>%{count}</strong> afventende hashtag"
         other: "<strong>%{count}</strong> afventende hashtags"
@@ -412,12 +417,12 @@ da:
       website: Websted
     disputes:
       appeals:
-        empty: Ingen appeller fundet.
-        title: Appeller
+        empty: Ingen anker fundet.
+        title: Anker
     domain_allows:
       add_new: Tillade federering med domæne
-      created_msg: Domæne er blevet tilladt federering
-      destroyed_msg: Domæne er blevet forbudt federering
+      created_msg: Domæne er blevet tilladt for federering
+      destroyed_msg: Domæne er blevet forbudt for federering
       undo: Forbyd federering med domæne
     domain_blocks:
       add_new: Tilføj ny domæneblokering
@@ -425,12 +430,12 @@ da:
       destroyed_msg: Domæneblokering er blevet fjernet
       domain: Domæne
       edit: Redigér domæneblokering
-      existing_domain_block_html: Du har allerede pålagt %{name} strengere grænser, du skal <a href="%{unblock_url}">afblokerere</a> det først.
+      existing_domain_block_html: Der har allerede pålagt %{name} strengere begrænsninger, så dette kræver først en <a href="%{unblock_url}">afblokering</a>.
       new:
         create: Opret blokering
-        hint: Domæneblokeringen vil ikke forhindre oprettelse af kontoposter i databasen, men vil retroaktivt og automatisk benytte specifikke moderationsmetoder på disse konti.
+        hint: Domæneblokeringen vil ikke forhindre oprettelse af kontoposter i databasen, men vil retroaktivt og automatisk føje særlige moderationsmetoder til disse konti.
         severity:
-          desc_html: "<strong>Tavsgjort</strong> vil gøre kontoens indlæg usynlige for alle, som ikke følger dem. <strong>Suspendering</strong> vil fjerne alt kontoindhold, medier og profildata. Brug <strong>Ingen</strong>, hvis mediefiler blot ønskes afvist."
+          desc_html: "<strong>Tavsgørelse</strong> gør kontoens indlæg usynlige for alle, som ikke følger dem. <strong>Suspendering</strong> fjerner alt kontoindhold, medier og profildata. Brug <strong>Ingen</strong>, hvis mediefiler blot ønskes afvist."
           noop: Ingen
           silence: Tavsgøre
           suspend: Suspendere
@@ -442,24 +447,9 @@ da:
       public_comment: Offentlig kommentar
       public_comment_hint: Kommentar om denne domænebegrænsning for den brede offentlighed, hvis annoncering af listen over domænebegrænsninger er aktiveret.
       reject_media: Afvis mediefiler
-      reject_media_hint: Fjerner lokalt lagrede mediefiler og afviser at download nogle fremadrettet. Irrelevant for suspenderinger
+      reject_media_hint: Fjerner lokalt lagrede mediefiler og afviser at download nogle fremadrettet. Irrelevant ifm. suspenderinger
       reject_reports: Afvis anmeldelser
-      reject_reports_hint: Ignorér alle anmeldelser fra dette domæne. Irrelevant for suspenderinger
-      rejecting_media: afviser mediefiler
-      rejecting_reports: afviser anmeldelser
-      severity:
-        silence: tavsgjort
-        suspend: suspenderet
-      show:
-        affected_accounts:
-          one: Én konto i databasen påvirket
-          other: "%{count} konti i databasen påvirket"
-          zero: Ingen konto i databasen påvirket
-        retroactive:
-          silence: Fjern tavsgøring for eksisterende, berørte konti fra dette domæne
-          suspend: Fjern suspendering for eksisterende, berørte konti fra dette domæne
-        title: Annullér domæneblokering for domænet %{domain}
-        undo: Annullér
+      reject_reports_hint: Ignorér alle anmeldelser fra dette domæne. Irrelevant ifm. suspenderinger
       undo: Annullér domæneblokering
       view: Vis domæneblokering
     email_domain_blocks:
@@ -476,41 +466,65 @@ da:
       new:
         create: Tilføj domæne
         resolve: Opløs domæne
-        title: Blokere nyt e-maildomæne
-      no_email_domain_block_selected: Ingen e-mailblokeringer ændret, da ingen var valgt
-      resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke ikke at blokere store e-mailudbydere.</strong>
+        title: Blokér nyt e-maildomæne
+      no_email_domain_block_selected: Ingen e-mailblokeringer ændret (ingen var valgt)
+      resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke ikke at blokere større e-mailudbydere.</strong>
       resolved_through_html: Opløst via %{domain}
       title: Blokerede e-maildomæner
     follow_recommendations:
-      description_html: "<strong>Følg-anbefalinger hjælpe nye brugere til hurtigt at finde interessant indhold</strong>. Når en bruger ikke har interageret nok med andre til at danne personlige følg-anbefalinger, anbefales disse konti i stedet. De genberegnes dagligt baseret på en blanding af konti med de fleste nylige engagementer og fleste lokale følger-antal for et givet sprog."
+      description_html: "<strong>Følg-anbefalinger hjælpe nye brugere til hurtigt at finde interessant indhold</strong>. Når en bruger ikke har interageret nok med andre til at generere personlige følg-anbefalinger, anbefales disse konti i stedet. De revurderes dagligt baseret på en blanding af konti med de flest nylige engagementer og fleste lokale følger-antal for et givet sprog."
       language: For sprog
       status: Status
       suppress: Undertryk følg-anbefaling
       suppressed: Undertrykt
       title: Følg-anbefalinger
-      unsuppress: Genetablér følg-anbefaling
+      unsuppress: Genopret følg-anbefaling
     instances:
+      availability:
+        description_html:
+          one: Lykkes det ikke at levere til domænet i løbet af <strong>%{count} dag</strong>, foretages ingen yderligere leveringsforsøg, medmindre en levering <em>fra</em> domænet modtages.
+          other: Lykkes det ikke at levere til domænet i <strong>%{count} dage</strong>, foretages ingen yderligere leveringsforsøg, medmindre en levering <em>fra</em> domænet modtages.
+        failure_threshold_reached: Fejlgrænse nået pr. %{date}.
+        failures_recorded:
+          one: Mislykket forsøg %{count} dag.
+          other: Mislykkede forsøg på %{count} forskellige dage.
+        no_failures_recorded: Ingen fejl noteret.
+        title: Tilgængelighed
       back_to_all: Alle
       back_to_limited: Begrænset
       back_to_warning: Advarsel
       by_domain: Domæne
       confirm_purge: Sikker på, at data skal slettes fra dette domæne permanent?
+      content_policies:
+        comment: Internt notat
+        description_html: Der kan defineres indholdspolitikker, som anvendes på alle konti fra dette domæne samt alle dets underdomæner.
+        policies:
+          reject_media: Afvis medier
+          reject_reports: Afvis anmeldelser
+          silence: Begræns
+          suspend: Suspendér
+        policy: Politik
+        reason: Offentlig årsag
+        title: Indholdspolitikker
+      dashboard:
+        instance_accounts_dimension: Mest fulgte konti
+        instance_accounts_measure: gemte konti
+        instance_followers_measure: vores følgere dér
+        instance_follows_measure: deres følgere dér
+        instance_languages_dimension: Topsprog
+        instance_media_attachments_measure: gemte medievedhæftninger
+        instance_reports_measure: anmeldelser af dem
+        instance_statuses_measure: gemte indlæg
       delivery:
         all: Alle
         clear: Ryd leveringsfejl
         restart: Genstart levering
         stop: Stop levering
-        title: Levering
         unavailable: Utilgængelig
-        unavailable_message: Levering utilgængelig
-        warning: Advarsel
-        warning_message:
-          one: Leveringsfejl %{count} dag
-          other: Leveringsfejl %{count} dage
       delivery_available: Levering er tilgængelig
       delivery_error_days: Leveringsfejldage
       delivery_error_hint: Er levering ikke mulig i %{count} dage, markeres den automatisk som ikke-leverbar.
-      destroyed_msg: Data fra %{domain} er nu sat i kø til snarlig sletning.
+      destroyed_msg: Data fra %{domain} er nu sat i kø mhp. snarlig sletning.
       empty: Ingen domæner fundet.
       known_accounts:
         one: "%{count} kendt konto"
@@ -523,12 +537,14 @@ da:
       private_comment: Privat kommentar
       public_comment: Offentlig kommentar
       purge: Udrens
+      purge_description_html: Mener man, at dette domæne er offline permanent, kan alle kontooptegnelser og tilknyttede data fra dette domæne slettes fra ens lagerplads. Dette kan tage et stykke tid.
       title: Federation
       total_blocked_by_us: Blokeret af os
       total_followed_by_them: Følges af dem
       total_followed_by_us: Følges af os
       total_reported: Anmeldelser om dem
       total_storage: Medievedhæftninger
+      totals_time_period_hint_html: Nedenfor viste totaler omfatter data for alle tidsperioder.
     invites:
       deactivate_all: Deaktivér alle
       filter:
@@ -757,7 +773,7 @@ da:
         action: Håndtér serverregler
         message_html: Ingen serverregler defineret.
       sidekiq_process_check:
-        message_html: Ingen Sidekiq-proces kører for %{value}-kø(er). Gennemgå din Sidekiq-opsætning
+        message_html: Ingen Sidekiq-proces kører for %{value}-kø(er). Gennemgå Sidekiq-opsætningen
     tags:
       review: Gennemsynsstatus
       updated_msg: Hashtag-indstillinger opdateret
@@ -769,6 +785,7 @@ da:
       links:
         allow: Tillad link
         allow_provider: Tillad udgiver
+        description_html: Disse er links, som pt. deles meget af konti, som dine server ser indlæg fra. Det kan hjælpe dine brugere med at finde ud af, hvad der sker i verden. Ingen links vises offentligt, før du godkender udgiveren. Du kan også tillade/afvise individuelle links.
         disallow: Tillad ikke link
         disallow_provider: Tillad ikke udgiver
         shared_by_over_week:
@@ -780,14 +797,17 @@ da:
       pending_review: Afventende vurdering
       preview_card_providers:
         allowed: Links fra denne udgiver kan trende
+        description_html: Disse er domæner, hvorfra links ofte deles på din server. Links vil ikke trende offentligt, medmindre domænet for linket er godkendt. Din godkendelse/afvisning indbefatter underdomæner.
         rejected: Links fra denne udgiver vil ikke trende
         title: Udgivere
       rejected: Afvist
       statuses:
         allow: Tillad indlæg
         allow_account: Tillad forfatter
+        description_html: Disse er indlæg, kendt af din server nu, som pt. deles og favoriseres meget. Det kan hjælpe dine nye og tilbagevendende brugere til at finde flere personer at følge. Ingen indlæg vises offentligt, før du godkender forfatteren, og denne tillader sin konto at blive foreslået til andre. Du kan også tillade/afvise individuelle indlæg.
         disallow: Forbyd indlæg
         disallow_account: Forbyd forfatter
+        not_discoverable: Forfatteren har ikke valgt at kunne findes
         shared_by:
           one: Delt eller favoriseret én gang
           other: Delt eller favoriseret %{friendly_count} gange
@@ -800,6 +820,7 @@ da:
           tag_servers_dimension: Topservere
           tag_servers_measure: forskellige servere
           tag_uses_measure: brugere i alt
+        description_html: Disse er hashtags, som pt. vises i en masse indlæg, som din server ser. Det kan hjælpe dine brugere til at finde ud af, hvad folk taler mest om pt. Ingen hashtags vises offentligt, før du godkender dem.
         listable: Kan foreslås
         not_listable: Foreslås ikke
         not_trendable: Vises ikke under tendenser
@@ -928,8 +949,10 @@ da:
     status:
       account_status: Kontostatus
       confirming: Afventer færdiggørelse af e-mailbekræftelse.
+      functional: Din konto er fuldt funktionel.
       pending: Din ansøgning afventer gennemgang af vores medarbejdere. Dette kan tage noget tid. Du modtager en e-mail, hvis din ansøgning godkendes.
       redirecting_to: Din konto er inaktiv, da den pt. er omdirigerer til %{acct}.
+      view_strikes: Se tidligere anmeldelser af din konto
     too_fast: Formularen indsendt for hurtigt, forsøg igen.
     trouble_logging_in: Indlogningsproblemer?
     use_security_key: Brug sikkerhedsnøgle
@@ -1004,6 +1027,7 @@ da:
         submit: Indgiv appel
       associated_report: Tilknyttet anmeldelse
       created_at: Dateret
+      description_html: Disse er implementerede handlinger for din konto, samt advarsler tilsendt dig af %{instance}-personalet.
       recipient: Adresseret til
       status: 'Indlæg #%{id}'
       status_removed: Indlæg allerede fjernet fra system
@@ -1012,7 +1036,6 @@ da:
         delete_statuses: Indlægsfjernelse
         disable: Kontofrysning
         none: Advarsel
-        sensitive: Markering som sensitiv konto
         silence: Kontobegrænsning
         suspend: Kontosuspendering
       your_appeal_approved: Din appel er godkendt
@@ -1384,6 +1407,7 @@ da:
     profile: Profil
     relationships: Følger og følgere
     statuses_cleanup: Automatiseret indlægssletning
+    strikes: Moderationsadvarsler
     two_factor_authentication: Tofaktorgodkendelse
     webauthn_authentication: Sikkerhedsnøgler
   statuses:
@@ -1463,6 +1487,7 @@ da:
       '2629746': 1 måned
       '31556952': 1 år
       '5259492': 2 måneder
+      '604800': 1 week
       '63113904': 2 år
       '7889238': 3 måneder
     min_age_label: Alderstærskel
@@ -1528,26 +1553,21 @@ da:
         spam: Spam
         violation: Indhold overtræder flg. fællesskabsretningslinjer
       explanation:
-        delete_statuses: Nogle af dine indlæg har vist sig at være i strid med en eller flere fællesskabsretningslinjer og er som konsekvens fjernet af moderatorerne på %{instance}. Fremtidige overtrædelser kan resultere i hårdere kontosanktioner.
         disable: Din konto kan ikke længere bruges, men profilen og andre data er intakte. Du kan anmode om en sikkerhedskopi af dine data, ændre kontoindstillinger eller slette kontoen.
         sensitive: Fra nu af vil alle dine uploadede mediefiler blive markeret som sensitive og skjult bag en klik-igennem advarsel.
         silence: Din konto kan stadig bruges, men dine indlæg vil kunne ses af personer, som allerede følger dig på denne server, og du kan blive udelukket fra forskellige opdagelsesfunktioner. Personer vil stadig kunne følge dig manuelt.
         suspend: Din konto kan ikke længere bruges, og hverken profil eller øvrige data kan tilgås. Du kan stadig logge ind for at anmode om en sikkerhedskopi af dine data, indtil disse om ca. 30 er helt slettet. Visse data bevares dog mhp. at forhindre dig i at omgå udelukkelsen.
-      get_in_touch: Anses dette som en fejl, kan denne e-mail besvares for at komme i kontakt med personalet på %{instance}.
       reason: 'Årsag:'
-      statuses: 'Indlæg fundet i krænkelse:'
       subject:
         delete_statuses: Dine indlæg på %{acct} er blevet fjernet
         disable: Din konto %{acct} er blevet frosset
         none: Advarsel for %{acct}
-        sensitive: Dine mediefiler på %{acct} markeres fra nu af som sensitive
         silence: Din konto %{acct} er blevet begrænset
         suspend: Din konto %{acct} er blevet suspenderet
       title:
         delete_statuses: Indlæg fjernet
         disable: Konto frosset
         none: Advarsel
-        sensitive: Medier skjult
         silence: Konto begrænset
         suspend: Konto suspenderet
     welcome:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 33e2e648b..333a44851 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -16,6 +16,7 @@ de:
     contact: Kontakt
     contact_missing: Nicht angegeben
     contact_unavailable: Nicht verfügbar
+    continue_to_web: Weiter zur Web App
     discover_users: Benutzer entdecken
     documentation: Dokumentation
     federation_hint_html: Mit einem Account auf %{instance} wirst du in der Lage sein Nutzern auf irgendeinem Mastodon-Server und darüber hinaus zu folgen.
@@ -25,6 +26,8 @@ de:
       Dieses Konto ist ein virtueller Akteur, der den Server selbst und nicht einen einzelnen Benutzer repräsentiert.
       Dieser wird für Föderationszwecke verwendet und sollte nicht blockiert werden, es sei denn du möchtest die gesamte Instanz blockieren.
     learn_more: Mehr erfahren
+    logged_in_as_html: Du bist derzeit als %{username} eingeloggt.
+    logout_before_registering: Du bist bereits angemeldet.
     privacy_policy: Datenschutzerklärung
     rules: Server-Regeln
     rules_html: 'Unten ist eine Zusammenfassung der Regeln, denen du folgen musst, wenn du ein Konto auf diesem Mastodon-Server haben möchtest:'
@@ -69,7 +72,6 @@ de:
     media: Medien
     moved_html: "%{name} ist auf %{new_profile_link} umgezogen:"
     network_hidden: Diese Informationen sind nicht verfügbar
-    never_active: Nie
     nothing_here: Hier gibt es nichts!
     people_followed_by: Profile, denen %{name} folgt
     people_who_follow: Profile, die %{name} folgen
@@ -448,21 +450,6 @@ de:
       reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
       reject_reports: Meldungen ablehnen
       reject_reports_hint: Ignoriere alle Meldungen von dieser Domain. Irrelevant für Sperrungen
-      rejecting_media: Mediendateien werden nicht gespeichert
-      rejecting_reports: Meldungen werden ignoriert
-      severity:
-        silence: stummgeschaltet
-        suspend: gesperrt
-      show:
-        affected_accounts:
-          one: Ein Konto in der Datenbank betroffen
-          other: "%{count} Konten in der Datenbank betroffen"
-          zero: Kein Konto in der Datenbank ist betroffen
-        retroactive:
-          silence: Alle existierenden Konten dieser Domain nicht mehr stummschalten
-          suspend: Alle existierenden Konten dieser Domain entsperren
-        title: Domain-Blockade für %{domain} zurücknehmen
-        undo: Zurücknehmen
       undo: Domainblockade zurücknehmen
       view: Zeige Domain-Blockade
     email_domain_blocks:
@@ -493,23 +480,47 @@ de:
       title: Folgeempfehlungen
       unsuppress: Nicht mehr unterdrücken
     instances:
+      availability:
+        description_html:
+          one: Wenn die Auslieferung an die Domain seit <strong>%{count} Tag</strong> ohne Erfolg ist, werden keine weiteren Versandversuche unternommen, es sei denn, es ist eine Lieferung <em>von</em> der Domain.
+          other: Wenn die Auslieferung an die Domain seit <strong>%{count} Tagen</strong> ohne Erfolg ist, werden keine weiteren Versandversuche unternommen, es sei denn, es ist eine Lieferung <em>von</em> der Domain.
+        failure_threshold_reached: Fehlschlag-Schwelle am %{date} erreicht.
+        failures_recorded:
+          one: Fehlgeschlagener Versuch am %{count}. Tag.
+          other: Fehlgeschlagener Versuch am %{count}. Tag.
+        no_failures_recorded: Keine Fehler bei der Aufzeichnung.
+        title: Verfügbarkeit
       back_to_all: Alle
       back_to_limited: Beschränkt
       back_to_warning: Warnung
       by_domain: Domain
       confirm_purge: Bist du dir sicher, dass du die Daten für diese Domain für immer löschen möchtest?
+      content_policies:
+        comment: Interne Notiz
+        description_html: Du kannst Inhaltsrichtlinien definieren, die auf alle Konten dieser Domain und einer ihrer Subdomains angewendet werden.
+        policies:
+          reject_media: Medien ablehnen
+          reject_reports: Meldungen ablehnen
+          silence: Stummschalten
+          suspend: Verbannen
+        policy: Richtlinie
+        reason: Öffentlicher Grund
+        title: Inhaltsrichtlinien
+      dashboard:
+        instance_accounts_dimension: Meiste gefolgte Konten
+        instance_accounts_measure: gespeicherte Konten
+        instance_followers_measure: unsere Follower dort
+        instance_follows_measure: ihre Follower hier
+        instance_languages_dimension: Top Sprachen
+        instance_media_attachments_measure: gespeicherte Medienanhänge
+        instance_reports_measure: über sie berichtet
+        instance_statuses_measure: gespeicherte Beiträge
       delivery:
         all: Alle
         clear: Zustellfehler löschen
         restart: Lieferung neu starten
         stop: Lieferung stoppen
-        title: Zustellung
         unavailable: Nicht verfügbar
-        unavailable_message: Zustellung funktioniert nicht
-        warning: Warnung
-        warning_message:
-          one: Zustellfehler seit %{count} Tag
-          other: Zustellfehler seit %{count} Tagen
       delivery_available: Zustellung funktioniert
       delivery_error_days: Tage seitdem die Zustellung nicht funktioniert
       delivery_error_hint: Wenn eine Lieferung für %{count} Tage nicht möglich ist, wird sie automatisch als nicht lieferbar markiert.
@@ -526,12 +537,14 @@ de:
       private_comment: Privater Kommentar
       public_comment: Öffentlicher Kommentar
       purge: Löschen
+      purge_description_html: Wenn du glaubst, dass diese Domain endgültig offline ist, kannst du alle Account-Datensätze und zugehörigen Daten aus dieser Domain löschen. Das kann eine Weile dauern.
       title: Föderation
       total_blocked_by_us: Von uns blockiert
       total_followed_by_them: Gefolgt von denen
       total_followed_by_us: Gefolgt von uns
       total_reported: Beschwerden über sie
       total_storage: Medienanhänge
+      totals_time_period_hint_html: Die unten angezeigten Summen enthalten Daten für alle Zeiten.
     invites:
       deactivate_all: Alle deaktivieren
       filter:
@@ -586,6 +599,7 @@ de:
       action_taken_by: Maßnahme ergriffen durch
       actions:
         delete_description_html: Der gemeldete Beitrag wird gelöscht und ein Strike wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Accounts zu helfen.
+        mark_as_sensitive_description_html: Der gemeldete Beitrag wird als NSFW markiert und ein Strike wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Accounts zu helfen.
         other_description_html: Weitere Optionen zur Kontrolle des Kontoverhaltens und zur Anpassung der Kommunikation an das gemeldete Konto.
         resolve_description_html: Es wird keine Maßnahme gegen den gemeldeten Account ergriffen, es wird kein Strike verzeichnet und die Meldung wird geschlossen.
         silence_description_html: Das Profil wird nur für diejenigen sichtbar sein, die es bereits verfolgen oder manuell nachschlagen und die Reichweite wird stark begrenzt. Kann immer rückgängig gemacht werden.
@@ -606,6 +620,7 @@ de:
       forwarded: Weitergeleitet
       forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als gelöst markieren
+      mark_as_sensitive: Als NSFW markieren
       mark_as_unresolved: Als ungelöst markieren
       no_one_assigned: Niemand
       notes:
@@ -749,6 +764,7 @@ de:
       actions:
         delete_statuses: "%{name} hat die Beiträge von %{target} entfernt"
         disable: "%{name} hat das Konto von %{target} eingefroren"
+        mark_statuses_as_sensitive: "%{name} markierte %{target}'s Beiträge als NSFW"
         none: "%{name} hat eine Warnung an %{target} gesendet"
         sensitive: "%{name} markierte %{target}'s Konto als NSFW"
         silence: "%{name} hat das Konto von %{target} eingeschränkt"
@@ -774,6 +790,7 @@ de:
       links:
         allow: Erlaube Link
         allow_provider: Erlaube Herausgeber
+        description_html: Dies sind Links, die derzeit von Konten geteilt werden, von denen dein Server Beiträge sieht. Es kann deinen Benutzern helfen, herauszufinden, was in der Welt vor sich geht. Es werden keine Links öffentlich angezeigt, bis du den Publisher genehmigst. Du kannst auch einzelne Links zulassen oder ablehnen.
         disallow: Verbiete Link
         disallow_provider: Verbiete Herausgeber
         shared_by_over_week:
@@ -785,14 +802,17 @@ de:
       pending_review: Überprüfung ausstehend
       preview_card_providers:
         allowed: Links von diesem Herausgeber können angesagt sein
+        description_html: Dies sind Domains, von denen Links oft auf deinem Server geteilt werden. Links werden sich nicht öffentlich trenden, es sei denn, die Domain des Links wird genehmigt. Deine Zustimmung (oder Ablehnung) erstreckt sich auf Subdomains.
         rejected: Links von diesem Herausgeber können nicht angesagt sein
         title: Herausgeber
       rejected: Abgelehnt
       statuses:
         allow: Beitrag erlauben
         allow_account: Autor erlauben
+        description_html: Dies sind Beiträge, von denen dein Server weiß, dass sie derzeit viel geteilt und favorisiert werden. Es kann deinen neuen und wiederkehrenden Benutzern helfen, weitere Personen zu finden. Es werden keine Beiträge öffentlich angezeigt, bis du den Autor genehmigst und der Autor es zulässt deren Konto anderen Benutzern zu zeigen. Du kannst auch einzelne Beiträge zulassen oder ablehnen.
         disallow: Beitrag verbieten
         disallow_account: Autor verbieten
+        not_discoverable: Der Autor hat sich nicht dafür entschieden, entdeckt zu werden
         shared_by:
           one: Einmal geteilt oder favorisiert
           other: "%{friendly_count} mal geteilt oder favorisiert"
@@ -805,6 +825,7 @@ de:
           tag_servers_dimension: Top Server
           tag_servers_measure: verschiedene Server
           tag_uses_measure: Gesamtnutzungen
+        description_html: Dies sind Hashtags, die derzeit in vielen Beiträgen erscheinen, die dein Server sieht. Es kann deinen Benutzern helfen, herauszufinden, worüber die Menschen im Moment am meisten reden. Es werden keine Hashtags öffentlich angezeigt, bis du sie genehmigst.
         listable: Kann vorgeschlagen werden
         not_listable: Wird nicht vorgeschlagen
         not_trendable: Wird nicht unter Trends angezeigt
@@ -831,6 +852,7 @@ de:
       actions:
         delete_statuses: deren Beiträge zu löschen
         disable: deren Konto einzufrieren
+        mark_statuses_as_sensitive: um ihre Beiträge als NSFW zu markieren
         none: eine Warnung
         sensitive: deren Konto als NSFW zu markieren
         silence: deren Konto zu beschränken
@@ -933,8 +955,10 @@ de:
     status:
       account_status: Kontostatus
       confirming: Warte auf die Bestätigung der E-Mail.
+      functional: Dein Konto ist voll funktionsfähig.
       pending: Deine Bewerbung wird von unseren Mitarbeitern noch überprüft. Dies kann einige Zeit dauern. Du erhältst eine E-Mail, wenn deine Bewerbung genehmigt wurde.
       redirecting_to: Dein Konto ist inaktiv, da es derzeit zu %{acct} umgeleitet wird.
+      view_strikes: Zeige frühere Streiks gegen dein Konto
     too_fast: Formular zu schnell gesendet, versuchen Sie es erneut.
     trouble_logging_in: Schwierigkeiten beim Anmelden?
     use_security_key: Sicherheitsschlüssel verwenden
@@ -1010,6 +1034,7 @@ de:
         submit: Einspruch erheben
       associated_report: Zugehöriger Bericht
       created_at: Datum
+      description_html: Dies sind Aktionen gegen dein Konto und Warnungen, die von den Mitarbeitern von %{instance} an dich gesendet wurden.
       recipient: Adressiert an
       status: 'Beitrag #%{id}'
       status_removed: Beitrag bereits vom System entfernt
@@ -1017,8 +1042,9 @@ de:
       title_actions:
         delete_statuses: Post-Entfernung
         disable: Einfrieren des Kontos
+        mark_statuses_as_sensitive: Das Markieren der Beiträge als NSFW
         none: Warnung
-        sensitive: Als NSFW markieren
+        sensitive: Das Markieren des Kontos als NSFW
         silence: Kontobeschränkung
         suspend: Kontosperre
       your_appeal_approved: Dein Einspruch wurde angenommen
@@ -1390,6 +1416,7 @@ de:
     profile: Profil
     relationships: Folgende und Gefolgte
     statuses_cleanup: Automatische Löschung
+    strikes: Strikes
     two_factor_authentication: Zwei-Faktor-Auth
     webauthn_authentication: Sicherheitsschlüssel
   statuses:
@@ -1469,6 +1496,7 @@ de:
       '2629746': 1 Monat
       '31556952': 1 Jahr
       '5259492': 2 Monate
+      '604800': 1 Woche
       '63113904': 2 Jahre
       '7889238': 3 Monate
     min_age_label: Altersgrenze
@@ -1618,26 +1646,28 @@ de:
         spam: Spam
         violation: Inhalt verletzt die folgenden Community-Richtlinien
       explanation:
-        delete_statuses: Einige deiner Beiträge wurden aufgrund eines Verstoßes gegen eine oder mehrere Community-Richtlinien entfernt und von den Moderatoren auf %{instance} entfernt. Künftige Verstöße können zu härteren Strafmaßnahmen gegen dein Konto führen.
+        delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Communityrichtlinien erkannt und von den Moderatoren von %{instance} entfernt.
         disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und andere Daten bleiben unversehrt. Du kannst ein Backup deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen.
+        mark_statuses_as_sensitive: Einige deiner Beiträge wurden von den Moderatoren von %{instance} als NSFW markiert. Das bedeutet, dass die Nutzer die Medien in den Beiträgen antippen müssen, bevor eine Vorschau angezeigt wird. Du kannst Medien in Zukunft als NSFW markieren, wenn du Beiträge verfasst.
         sensitive: Von nun an werden alle deine hochgeladenen Mediendateien als sensibel markiert und hinter einer Warnung versteckt.
         silence: Solange dein Konto limitiert ist, können nur die Leute, die dir bereits folgen, deine Beiträge auf dem Server sehen und es könnte sein, dass du von verschiedenen öffentlichen Listungen ausgeschlossen wirst. Andererseits können andere dir manuell folgen.
         suspend: Du kannst dein Konto nicht mehr verwenden und dein Profil und andere Daten sind nicht mehr verfügbar. Du kannst dich immer noch anmelden, um ein Backup deiner Daten anzufordern, bis die Daten innerhalb von 30 Tagen vollständig gelöscht wurden. Allerdings werden wir einige Daten speichern, um zu verhindern, dass du die Sperrung umgehst.
-      get_in_touch: Wenn du glaubst, dass dies ein Fehler ist, kannst auf diese E-Mail antworten, um mit den Mitarbeitern von %{instance} in Kontakt zu treten.
       reason: 'Grund:'
-      statuses: 'Beiträge, die in Verletzung gefunden wurden:'
+      statuses: 'Zitierte Beiträge:'
       subject:
         delete_statuses: Deine Beiträge auf %{acct} wurden entfernt
         disable: Dein Konto %{acct} wurde eingefroren
+        mark_statuses_as_sensitive: Deine Beiträge auf %{acct} wurden als NSFW markiert
         none: Warnung für %{acct}
-        sensitive: Deine Mediendateien auf %{acct} werden von nun an als sensibel markiert
+        sensitive: Deine Beiträge auf %{acct} werden von nun an als NSFW markiert
         silence: Dein Konto %{acct} wurde limitiert
         suspend: Dein Konto %{acct} wurde gesperrt
       title:
         delete_statuses: Beiträge entfernt
         disable: Konto eingefroren
+        mark_statuses_as_sensitive: Als NSFW markierte Beiträge
         none: Warnung
-        sensitive: Medien versteckt
+        sensitive: Als NSFW markiertes Konto
         silence: Konto limitiert
         suspend: Konto gesperrt
     welcome:
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index eaeb425f3..687c8e7b2 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -13,6 +13,7 @@ ast:
       pending: La cuenta ta entá en revisión.
       timeout: La sesión caducó. Volvi aniciar sesión pa siguir.
       unauthenticated: Precises aniciar sesión o rexistrate enantes de siguir.
+      unconfirmed: Tienes de confirmar la direición de corréu electrónicu enantes de siguir.
     mailer:
       confirmation_instructions:
         explanation: Creesti una cuenta en %{host} con esta direición de corréu. Tas a un calcu d'activala. Si nun fuisti tu, inora esti corréu.
@@ -42,6 +43,8 @@ ast:
       updated_not_active: La contraseña camudó con correutamente.
     registrations:
       signed_up: "¡Afáyate! Rexistréstite correutamente."
+      signed_up_but_inactive: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la to cuenta entá nun s'activó.
+      signed_up_but_locked: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la to cuenta ta bloquiada.
       signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la direición de corréu. Sigui l'enllaz p'activar la cuenta. Comprueba la carpeta Puxarra si nun recibiesti esti corréu.
       updated: La cuenta anovóse correutamente.
     sessions:
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 7b6f6783b..1b7fbd198 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -6,7 +6,7 @@ eo:
       send_instructions: Vi ricevos retmesaĝon kun instrukcioj por konfirmi vian retadreson ene de kelkaj minutoj. Bonvolu kontroli vian spamujon se vi ne ricevis ĉi tiun retmesaĝon.
       send_paranoid_instructions: Se via retadreso ekzistas en nia datumbazo, vi ricevos retmesaĝon kun instrukcioj por konfirmi vian retadreson ene de kelkaj minutoj. Bonvolu kontroli vian spamujon se vi ne ricevis ĉi tiun retmesaĝon.
     failure:
-      already_authenticated: Vi jam ensalutis.
+      already_authenticated: Vi jam salutis.
       inactive: Via konto ankoraŭ ne estas konfirmita.
       invalid: Nevalida %{authentication_keys} aŭ pasvorto.
       last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
@@ -96,16 +96,16 @@ eo:
       update_needs_confirmation: Vi sukcese ĝisdatigis vian konton, sed ni bezonas kontroli vian novan retadreson. Bonvolu kontroli viajn retmesaĝojn kaj sekvi la konfirman ligilon por konfirmi vian novan retadreson. Bonvolu kontroli vian spamujon, se vi ne ricevis ĉi tiun retmesaĝon.
       updated: Via konto estis sukcese ĝisdatigita.
     sessions:
-      already_signed_out: Sukcese elsalutis.
-      signed_in: Sukcese ensalutis.
-      signed_out: Sukcese elsalutis.
+      already_signed_out: Sukcese adiaŭis.
+      signed_in: Sukcese salutis.
+      signed_out: Sukcese adiaŭis.
     unlocks:
       send_instructions: Vi ricevos retmesaĝon kun instrukcioj por malŝlosi vian konton ene de kelkaj minutoj. Bonvolu kontroli vian spamujon, se vi ne ricevis ĉi tiun retmesaĝon.
       send_paranoid_instructions: Se via konto ekzistas, vi ricevos retmesaĝon kun instrukcioj por malŝlosi ĝin ene de kelkaj minutoj. Bonvolu kontroli vian spamujon se vi ne ricevis ĉi tiun retmesaĝon.
       unlocked: Via konto estis sukcese malŝlosita. Bonvolu ensaluti por daŭrigi.
   errors:
     messages:
-      already_confirmed: jam estis konfirmita, bonvolu provi ensaluti
+      already_confirmed: jam estis konfirmita, bonvolu provi saluti
       confirmation_period_expired: devas esti konfirmita ene de %{period}, bonvolu peti denove
       expired: eksvalidiĝis, bonvolu peti denove
       not_found: ne estis trovita
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 03863a338..d35253c3c 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -60,8 +60,6 @@ ar:
       error:
         title: حدث هناك خطأ
       new:
-        able_to: يُخوَّل لهذا التطبيق القيام بـ
-        prompt: طلبَ تطبيق %{client_name} تصريحا لاستعمال حسابك
         title: إذن بالتصريح
       show:
         title: قم بنسخ رمز المصادقة و إلصاقه على التطبيق.
@@ -71,10 +69,10 @@ ar:
       confirmations:
         revoke: متأكد ؟
       index:
-        application: التطبيق
-        created_at: صُرّح له في
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: المجالات
+        last_used_at: آخر استخدام في %{date}
+        never_used: لم يُستخدَم قط
+        scopes: الصلاحيات
+        superapp: داخلي
         title: تطبيقاتك المرخص لها
     errors:
       messages:
@@ -110,6 +108,17 @@ ar:
       authorized_applications:
         destroy:
           notice: تم إبطال التصريح المخول للتطبيق.
+    grouped_scopes:
+      access:
+        read: وصول للقراءة فقط
+        read/write: وصول للقراءة والكتابة
+        write: وصول للكتابة فقط
+      title:
+        accounts: الحسابات
+        admin/accounts: إدارة الحسابات
+        admin/all: جميع المهام الإدارية
+        admin/reports: إدارة التقارير
+        all: كل شيء
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
index 6d12751d7..45eb623ec 100644
--- a/config/locales/doorkeeper.ast.yml
+++ b/config/locales/doorkeeper.ast.yml
@@ -46,9 +46,6 @@ ast:
         deny: Negar
       error:
         title: Asocedió un fallu
-      new:
-        able_to: Va ser a
-        prompt: L'aplicación %{client_name} solicitó l'accesu a la to cuenta
       show:
         title: Copia esti códigu d'autorización y apiégalu na aplicación.
     authorized_applications:
@@ -57,10 +54,7 @@ ast:
       confirmations:
         revoke: "¿De xuru?"
       index:
-        application: Aplicación
-        created_at: Data d'autorización
-        date_format: "%H:%M:%S %d-%m-%Y"
-        scopes: Ámbitos
+        scopes: Permisos
         title: Les aplicaciones qu'autoricesti
     errors:
       messages:
@@ -73,6 +67,9 @@ ast:
         temporarily_unavailable: Anguaño'l sirvidor d'autorizaciones nun ye a remanar la solicitú pola mor d'una sobrecarga temporal o caltenimientu del sirvidor.
         unauthorized_client: El veceru nun ta autorizáu pa facer esta solicitú usando esti métodu.
         unsupported_response_type: El sirvidor d'autorización nun sofita esta triba de rempuesta.
+    grouped_scopes:
+      title:
+        notifications: Avisos
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 083d19bb2..7bfcec48a 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -60,8 +60,6 @@ bg:
       error:
         title: Възникна грешка
       new:
-        able_to: Ще е възможно
-        prompt: Приложението %{client_name} заявява достъп до твоя акаунт
         title: Изисква се упълномощаване
       show:
         title: Копирайте този код за удостоверяване и го поставете в приложението.
@@ -71,10 +69,6 @@ bg:
       confirmations:
         revoke: Потвърждаваш ли отмяната?
       index:
-        application: Приложение
-        created_at: Създадено на
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Диапазони
         title: Твоите упълномощени приложения
     errors:
       messages:
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index dfcdb984d..810e96d8b 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -53,8 +53,6 @@ br:
       error:
         title: Ur fazi a zo degouezhet
       new:
-        able_to: Gallout a raio
-        prompt: Arload %{client_name} a reket moned d'ho kont
         title: Aotre rekis
       show:
         title: Eilennit kod aotre-se ha pegit en arload.
@@ -64,9 +62,6 @@ br:
       confirmations:
         revoke: Ha sur oc'h ?
       index:
-        application: Arload
-        created_at: Aotreet
-        date_format: "%d-%m-%Y %H:%M:%S"
         title: Hoc'h arloadoù aotreet
     errors:
       messages:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 9b0961433..a4d37f417 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -60,8 +60,8 @@ ca:
       error:
         title: S'a produit un error
       new:
-        able_to: Serà capaç de
-        prompt: L'aplicació %{client_name} sol⋅licita tenir accés al teu compte
+        prompt_html: "%{client_name} voldria permís per a accedir el teu compte. És una aplicació de tercers. <strong>Si no hi confies no hauries d'autoritzar-la.</strong>"
+        review_permissions: Revisa els permisos
         title: Cal autorizació
       show:
         title: Copia aquest codi d'autorització i enganxa'l en l'aplicació.
@@ -71,10 +71,12 @@ ca:
       confirmations:
         revoke: N'estàs segur?
       index:
-        application: Aplicació
-        created_at: Creat el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Àmbits
+        authorized_at: Autoritzada el %{date}
+        description_html: Aquestes son les aplicacions que poden accedir al teu compte usant l'API. Si aquí hi ha aplicacions que no reconeixes o una aplicació es comporta malament, pots revocar el seu accés.
+        last_used_at: Darrera utilització el %{date}
+        never_used: Mai usat
+        scopes: Permisos
+        superapp: Interna
         title: Les teves aplicacions autoritzades
     errors:
       messages:
@@ -110,6 +112,33 @@ ca:
       authorized_applications:
         destroy:
           notice: Aplicació revocada.
+    grouped_scopes:
+      access:
+        read: Accés només de lectura
+        read/write: Accés de lectura i escriptura
+        write: Accés de només escriptura
+      title:
+        accounts: Comptes
+        admin/accounts: Administració dels comptes
+        admin/all: Totes les funcions administratives
+        admin/reports: Administració dels informes
+        all: Tot
+        blocks: Bloquejos
+        bookmarks: Marcadors
+        conversations: Converses
+        crypto: Xifrat d'extrem a extrem
+        favourites: Favorits
+        filters: Filtres
+        follow: Relacions
+        follows: Seguits
+        lists: Llistes
+        media: Adjunts multimèdia
+        mutes: Silenciats
+        notifications: Notificacions
+        push: Notificacions push
+        reports: Informes
+        search: Cerca
+        statuses: Publicacions
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ ca:
       admin:write: modificar totes les dades en el servidor
       admin:write:accounts: fer l'acció de moderació en els comptes
       admin:write:reports: fer l'acció de moderació en els informes
+      crypto: usa xifrat d'extrem a extrem
       follow: seguir, blocar, desblocar i deixar de seguir comptes
       push: rebre notificacions push del teu compte
       read: llegir les dades del teu compte
@@ -143,6 +173,7 @@ ca:
       write:accounts: modifica el teu perfil
       write:blocks: bloqueja comptes i dominis
       write:bookmarks: publicacions a marcadors
+      write:conversations: silencia i esborra converses
       write:favourites: afavoreix tuts
       write:filters: crear filtres
       write:follows: seguir usuaris
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 6819d8fc6..78c86d0db 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -60,8 +60,6 @@ co:
       error:
         title: C’hè statu un prublemu
       new:
-        able_to: St’applicazione puderà
-        prompt: L’applicazione %{client_name} hà dumandatu d’avè accessu à u vostru contu
         title: Permessu richiestu
       show:
         title: Codice d’auturizazione da cupià indè l’applicazione.
@@ -71,10 +69,6 @@ co:
       confirmations:
         revoke: Site sicuru·a?
       index:
-        application: Applicazione
-        created_at: Auturizata u
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Scopi
         title: E vostre applicazione auturizate
     errors:
       messages:
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 120a21b65..d47e1afac 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -60,8 +60,6 @@ cs:
       error:
         title: Vyskytla se chyba
       new:
-        able_to: Bude moci
-        prompt: Aplikace %{client_name} vyžaduje přístup k vašemu účtu
         title: Je vyžadována autorizace
       show:
         title: Zkopírujte tento autorizační kód a vložte ho do aplikace.
@@ -71,10 +69,6 @@ cs:
       confirmations:
         revoke: Opravdu?
       index:
-        application: Aplikace
-        created_at: Autorizováno
-        date_format: "%d. %m. %Y %H:%M:%S"
-        scopes: Rozsahy
         title: Vaše autorizované aplikace
     errors:
       messages:
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 93c618da9..4dc4b5e0a 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -60,8 +60,6 @@ cy:
       error:
         title: Mae rhywbeth wedi mynd o'i le
       new:
-        able_to: Mi fydd a'r gallu i
-        prompt: Mae'r ap %{client_name} yn gofyn caniatad i gal mynediad i'ch cyfrif
         title: Angen awdurdodi
       show:
         title: Copiwch y côd awdurdodi a gludiwch i'r rhaglen.
@@ -71,10 +69,6 @@ cy:
       confirmations:
         revoke: Ydych chi'n sicr?
       index:
-        application: Rhaglen
-        created_at: Awdurdodedig
-        date_format: "%Y-%m-%d% %H:%M:%S"
-        scopes: Rhinweddau
         title: Eich rhaglenni awdurdodedig
     errors:
       messages:
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 05fac0036..30e94f4da 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -60,8 +60,8 @@ da:
       error:
         title: En fejl opstod
       new:
-        able_to: Den vil være i stand til
-        prompt: Applikationen %{client_name} anmoder om adgang til din konto
+        prompt_html: "%{client_name} ønsker tilladelse til at tilgå din konto. Den er en tredjepartsapplikation. <strong>Er der ikke tillid til den, bør den ikke godkendes.</strong>"
+        review_permissions: Gennemgå tilladelser
         title: Godkendelse krævet
       show:
         title: Kopiér og indsæt denne godkendelseskode i applikationen.
@@ -71,10 +71,12 @@ da:
       confirmations:
         revoke: Sikker?
       index:
-        application: Applikation
-        created_at: Godkendt
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfang
+        authorized_at: Godkendt pr. %{date}
+        description_html: Disse er applikationer, som kan tilgå din konto vha. API'en. Er der applikationer her, som ikke genkendes eller udviser mærkelig adfærd, kan deres adgang tilbagekaldes.
+        last_used_at: Senest brugt pr. %{date}
+        never_used: Aldrig brugt
+        scopes: Tilladelser
+        superapp: Intern
         title: Dine godkendte applikationer
     errors:
       messages:
@@ -110,6 +112,33 @@ da:
       authorized_applications:
         destroy:
           notice: Applikation tilbagekaldt.
+    grouped_scopes:
+      access:
+        read: Skrivebeskyttet adgang
+        read/write: Læse- og skriveadgang
+        write: Kun skriveadgang
+      title:
+        accounts: Konti
+        admin/accounts: Kontihåndtering
+        admin/all: Alle håndteringsfunktioner
+        admin/reports: Rapporthåndteringer
+        all: Alt
+        blocks: Blokeringer
+        bookmarks: Bogmærker
+        conversations: Konversationer
+        crypto: Ende-til-ende kryptering
+        favourites: Favoritter
+        filters: Filtre
+        follow: Relationer
+        follows: Følger
+        lists: Lister
+        media: Medievedhæftninger
+        mutes: Tavsgjorte
+        notifications: Notifikationer
+        push: Push-notifikationer
+        reports: Anmeldelser
+        search: Søgning
+        statuses: Indlæg
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ da:
       admin:write: redigér al data på serveren
       admin:write:accounts: udfør modereringshandlinger på konti
       admin:write:reports: udfør modereringshandlinger på anmeldelser
+      crypto: benyt ende-til-ende kryptering
       follow: ændre kontorelationer
       push: modtage dine push-notifikationer
       read: læse alle dine kontodata
@@ -143,6 +173,7 @@ da:
       write:accounts: ændre din profil
       write:blocks: blokere konti og domæner
       write:bookmarks: bogmærke statusser
+      write:conversations: tavsgør og slet konversationer
       write:favourites: favorisere statusser
       write:filters: oprette filtre
       write:follows: følge personer
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 032a3dbce..3f7e1b2d7 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -60,8 +60,8 @@ de:
       error:
         title: Ein Fehler ist aufgetreten
       new:
-        able_to: 'Es wird folgende Befugnisse haben:'
-        prompt: Die Anwendung %{client_name} verlangt Zugriff auf dein Konto
+        prompt_html: "%{client_name} möchte auf dein Konto zugreifen. Es ist eine Anwendung von Drittanbietern. <strong>Wenn du ihr nicht vertraust, dann solltest du sie nicht autorisieren.</strong>"
+        review_permissions: Rechte überprüfen
         title: Autorisierung erforderlich
       show:
         title: Kopiere diesen Autorisierungs-Code und füge ihn in die Anwendung ein.
@@ -71,10 +71,12 @@ de:
       confirmations:
         revoke: Bist du sicher?
       index:
-        application: Anwendung
-        created_at: Autorisiert am
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Befugnisse
+        authorized_at: Autorisiert am %{date}
+        description_html: Dies sind Anwendungen, die über die Programmierschnittstelle auf dein Konto zugreifen können. Wenn es Anwendungen gibt, die du hier nicht erkennst oder eine Anwendung sich falsch verhält, kannst du den Zugriff widerrufen.
+        last_used_at: Zuletzt verwendet am %{date}
+        never_used: Nie verwendet
+        scopes: Berechtigungen
+        superapp: Intern
         title: Deine autorisierten Anwendungen
     errors:
       messages:
@@ -110,6 +112,33 @@ de:
       authorized_applications:
         destroy:
           notice: Anwendung widerrufen.
+    grouped_scopes:
+      access:
+        read: Nur-Lese-Zugriff
+        read/write: Lese- und Schreibzugriff
+        write: Schreibzugriff
+      title:
+        accounts: Konten
+        admin/accounts: Verwaltung der Konten
+        admin/all: Alle administrativen Funktionen
+        admin/reports: Verwaltung der Berichte
+        all: Alles
+        blocks: Blocks
+        bookmarks: Lesezeichen
+        conversations: Konversationen
+        crypto: Ende-zu-Ende-Verschlüsselung
+        favourites: Favoriten
+        filters: Filter
+        follow: Beziehungen
+        follows: Folgt
+        lists: Listen
+        media: Medienanhänge
+        mutes: Stummschaltungen
+        notifications: Benachrichtigungen
+        push: Push-Benachrichtigungen
+        reports: Meldungen
+        search: Suche
+        statuses: Beiträge
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ de:
       admin:write: alle Daten auf dem Server ändern
       admin:write:accounts: Moderationsaktionen auf Konten ausführen
       admin:write:reports: Moderationsaktionen auf Meldungen ausführen
+      crypto: Ende-zu-Ende-Verschlüsselung verwenden
       follow: Kontenbeziehungen verändern
       push: deine Push-Benachrichtigungen erhalten
       read: all deine Daten lesen
@@ -143,6 +173,7 @@ de:
       write:accounts: dein Profil bearbeiten
       write:blocks: Domains und Konten blockieren
       write:bookmarks: Lesezeichen hinzufügen
+      write:conversations: Unterhaltungen stummschalten und löschen
       write:favourites: Beiträge favorisieren
       write:filters: Filter erstellen
       write:follows: Leuten folgen
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 29db6d883..8c75eb854 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -60,8 +60,6 @@ el:
       error:
         title: Εμφανίστηκε σφάλμα
       new:
-        able_to: Θα μπορεί να
-        prompt: Η εφαρμογή %{client_name} ζητάει πρόσβαση στο λογαριασμό σου
         title: Απαιτείται έγκριση
       show:
         title: Αντέγραψε αυτό τον κωδικό έγκρισης στην εφαρμογή.
@@ -71,10 +69,8 @@ el:
       confirmations:
         revoke: Σίγουρα;
       index:
-        application: Εφαρμογή
-        created_at: Εγκεκριμένη
-        date_format: "%H:%M:%S, %d/%m/%Y"
-        scopes: Εύρος εφαρμογής
+        never_used: Ποτέ σε χρήση
+        scopes: Δικαιώματα
         title: Οι εφαρμογές που έχεις εγκρίνει
     errors:
       messages:
@@ -110,6 +106,29 @@ el:
       authorized_applications:
         destroy:
           notice: Η εφαρμογή ανακλήθηκε.
+    grouped_scopes:
+      access:
+        read: Πρόσβαση μόνο για ανάγνωση
+        read/write: Πρόσβαση ανάγνωσης και εγγραφής
+        write: Πρόσβαση μόνο για εγγραφή
+      title:
+        admin/accounts: Διαχείριση λογαριασμών
+        admin/all: Όλες οι λειτουργίες διαχείρησης
+        admin/reports: Διαχείριση αναφορών
+        bookmarks: Σελιδοδείκτες
+        conversations: Συνομιλίες
+        crypto: Κρυπτογράφηση από άκρο σε άκρο
+        favourites: Αγαπημένα
+        filters: Φίλτρα
+        follow: Σχέσεις
+        lists: Λίστες
+        media: Συνημμένα πολυμέσα
+        mutes: Αποσιωπήσεις
+        notifications: Ειδοποιήσεις
+        push: Άμεσες ειδοποιήσεις
+        reports: Αναφορές
+        search: Αναζήτηση
+        statuses: Αναρτήσεις
     layouts:
       admin:
         nav:
@@ -124,6 +143,7 @@ el:
       admin:write: αλλαγή δεδομένων στον διακομιστή
       admin:write:accounts: εκτέλεση διαχειριστικών ενεργειών σε λογαριασμούς
       admin:write:reports: εκτέλεση διαχειριστικών ενεργειών σε καταγγελίες
+      crypto: χρήση κρυπτογράφησης από άκρο σε άκρο
       follow: να αλλάζει τις σχέσεις με λογαριασμούς
       push: να λαμβάνει τις ειδοποιήσεις σου
       read: να διαβάζει όλα τα στοιχεία του λογαριασμού σου
@@ -143,6 +163,7 @@ el:
       write:accounts: να αλλάζει το προφίλ σου
       write:blocks: να μπλοκάρει λογαριασμούς και τομείς
       write:bookmarks: προσθήκη σελιδοδεικτών
+      write:conversations: σίγαση και διαγραφή συνομιλιών
       write:favourites: να σημειώνει δημοσιεύσεις ως αγαπημένες
       write:filters: να δημιουργεί φίλτρα
       write:follows: να ακολουθεί ανθρώπους
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index c590fbde0..ba4c43122 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -60,8 +60,6 @@ eo:
       error:
         title: Eraro okazis
       new:
-        able_to: Ĝi povos
-        prompt: La aplikaĵo %{client_name} petas aliron al via konto
         title: Rajtigo bezonata
       show:
         title: Kopiu ĉi tiun rajtigan kodon kaj gluu ĝin al la aplikaĵo.
@@ -71,10 +69,6 @@ eo:
       confirmations:
         revoke: Ĉu vi certas?
       index:
-        application: Aplikaĵo
-        created_at: Rajtigita
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Ampleksoj
         title: Viaj rajtigitaj aplikaĵoj
     errors:
       messages:
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index f914a62ff..4a874a366 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -60,8 +60,8 @@ es-AR:
       error:
         title: Ocurrió un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita acceso a tu cuenta
+        prompt_html: "%{client_name} solicitaa permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confiás en ella, no deberías autorizarla.</strong>"
+        review_permissions: Revisar permisos
         title: Autorización requerida
       show:
         title: Copiá este código de autorización y pegalo en la aplicación.
@@ -71,10 +71,12 @@ es-AR:
       confirmations:
         revoke: "¿Estás seguro?"
       index:
-        application: Aplicación
-        created_at: Autorizada
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta usando la API. Si hay aplicaciones que no reconocés acá, o que funcionan de forma sospechosa, podés revocar su acceso.
+        last_used_at: Último uso el %{date}
+        never_used: Nunca usada
+        scopes: Permisos
+        superapp: Interno
         title: Tus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es-AR:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de sólo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de denuncias
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguimientos
+        lists: Listas
+        media: Adjuntos de medios
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Denuncias
+        search: Buscar
+        statuses: Mensajes
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ es-AR:
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: ejecutar acciones de moderación en cuentas
       admin:write:reports: ejecutar acciones de moderación en denuncias
+      crypto: usar cifrado de extremo a extremo
       follow: modificar relaciones de cuenta
       push: recibir tus notificaciones push
       read: leer todos los datos de tu cuenta
@@ -143,6 +173,7 @@ es-AR:
       write:accounts: modificar tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: marcar mensajes
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: marcar mensajes como favoritos
       write:filters: crear filtros
       write:follows: seguir cuentas
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index df12ceb79..58017d83a 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -60,8 +60,8 @@ es-MX:
       error:
         title: Ha ocurrido un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita tener acceso a su cuenta
+        prompt_html: "%{client_name} Requiere permisos para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confías en ella, no deberías darle autorización.</strong>"
+        review_permissions: Revisar permisos
         title: Se requiere autorización
       show:
         title: Copia este código de autorización y pégalo en la aplicación.
@@ -71,10 +71,12 @@ es-MX:
       confirmations:
         revoke: "¿Está seguro?"
       index:
-        application: Aplicación
-        created_at: Creado el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta utilizando la API. Si hay alguna aplicación que no reconozcas aquí, o una aplicación esta teniendo comportamientos extraños, puedes revocar el acceso.
+        last_used_at: Usado por ultima vez el %{date}
+        never_used: Nunca usado
+        scopes: Permisos
+        superapp: Interno
         title: Sus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es-MX:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de solo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de reportes
+        all: Todo
+        blocks: Bloques
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguidos
+        lists: Listas
+        media: Archivos adjuntos
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Reportes
+        search: Busqueda
+        statuses: Publicaciones
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ es-MX:
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: realizar acciones de moderación en cuentas
       admin:write:reports: realizar acciones de moderación en informes
+      crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
@@ -143,6 +173,7 @@ es-MX:
       write:accounts: modifica tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar estados como marcadores
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: toots favoritos
       write:filters: crear filtros
       write:follows: seguir usuarios
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index e3bb4d91f..9b2eee652 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -60,8 +60,8 @@ es:
       error:
         title: Ha ocurrido un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita tener acceso a su cuenta
+        prompt_html: "%{client_name} desea permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confías en ella, no deberías autorizarla.</strong>"
+        review_permissions: Revisar permisos
         title: Se requiere autorización
       show:
         title: Copia este código de autorización y pégalo en la aplicación.
@@ -71,10 +71,12 @@ es:
       confirmations:
         revoke: "¿Está seguro?"
       index:
-        application: Aplicación
-        created_at: Creado el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta usando la API. Si hay aplicaciones que no se reconocen aquí, o una aplicación no funciona correctamente, puedes revocar su acceso.
+        last_used_at: Último uso el %{date}
+        never_used: Nunca usado
+        scopes: Permisos
+        superapp: Interno
         title: Sus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de solo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de informes
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguidos
+        lists: Listas
+        media: Adjuntos multimedia
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Informes
+        search: Buscar
+        statuses: Publicaciones
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ es:
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: realizar acciones de moderación en cuentas
       admin:write:reports: realizar acciones de moderación en informes
+      crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
@@ -143,6 +173,7 @@ es:
       write:accounts: modifica tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar estados como marcadores
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: publicaciones favoritas
       write:filters: crear filtros
       write:follows: seguir usuarios
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index 6f038c365..a04a5dde3 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -60,8 +60,6 @@ et:
       error:
         title: Ilmnes viga
       new:
-        able_to: Sellel on võimalik
-        prompt: Rakendus %{client_name} soovib ligipääsu Teie kontole
         title: Autoriseerimine vajalik
       show:
         title: Kopeeri see autoriseerimisvõti ja kleebi see rakendusse.
@@ -71,9 +69,6 @@ et:
       confirmations:
         revoke: Olete kindel?
       index:
-        application: Rakendus
-        created_at: Autoriseeritud
-        scopes: Ulatused
         title: Autoriseeritud rakendused
     errors:
       messages:
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 576ece002..2e3a7b042 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -60,8 +60,6 @@ eu:
       error:
         title: Errore bat gertatu da
       new:
-        able_to: Egin ahal izango du
-        prompt: "%{client_name} aplikazioak zure kontua atzitzea eskatu du"
         title: Baimena behar da
       show:
         title: Kopiatu baimen kode hau eta itsatsi aplikazioan.
@@ -71,10 +69,6 @@ eu:
       confirmations:
         revoke: Ziur zaude?
       index:
-        application: Aplikazioa
-        created_at: Baimenduta
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Irismena
         title: Zuk baimendutako aplikazioak
     errors:
       messages:
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index d977c0afb..cc479fbc1 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -60,8 +60,6 @@ fa:
       error:
         title: خطایی رخ داد
       new:
-        able_to: اجازه خواهد داشت
-        prompt: برنامهٔ %{client_name} می‌خواهد به حساب شما دسترسی داشته باشد
         title: نیاز به اجازه دادن
       show:
         title: این کد مجوز را کپی کرده و در برنامه وارد کنید.
@@ -71,10 +69,6 @@ fa:
       confirmations:
         revoke: آیا مطمئن هستید؟
       index:
-        application: برنامه
-        created_at: مجازشده از
-        date_format: "%Y-%m-%d%H:%M:%S"
-        scopes: اجازه‌ها
         title: برنامه‌های مجاز
     errors:
       messages:
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index d095b0f93..db7c4d01a 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -60,8 +60,7 @@ fi:
       error:
         title: Tapahtui virhe
       new:
-        able_to: Se voi
-        prompt: Sovellus %{client_name} pyytää lupaa käyttää tiliäsi
+        review_permissions: Tarkista käyttöoikeudet
         title: Valtuutus vaaditaan
       show:
         title: Kopioi tämä valtuutuskoodi ja liitä se sovellukseen.
@@ -71,10 +70,10 @@ fi:
       confirmations:
         revoke: Oletko varma?
       index:
-        application: Sovellus
-        created_at: Valtuutettu
-        date_format: "%d/%m/%Y %H:%M:%S"
+        last_used_at: Viimeksi käytetty %{date}
+        never_used: Ei käytetty
         scopes: Oikeudet
+        superapp: Sisäinen
         title: Valtuutetut sovellukset
     errors:
       messages:
@@ -110,6 +109,30 @@ fi:
       authorized_applications:
         destroy:
           notice: Sovellus peruttu.
+    grouped_scopes:
+      access:
+        read: Vain luku
+        read/write: Luku- ja kirjoitusoikeudet
+        write: Vain kirjoitus
+      title:
+        accounts: Tilit
+        all: Kaikki
+        blocks: Torjutut
+        bookmarks: Kirjanmerkit
+        conversations: Keskustelut
+        crypto: Päästä päähän -salaus
+        favourites: Suosikit
+        filters: Suodattimet
+        follow: Liitokset
+        follows: Seuraa
+        lists: Listat
+        media: Medialiitteet
+        mutes: Mykistykset
+        notifications: Ilmoitukset
+        push: Push-ilmoitukset
+        reports: Raportit
+        search: Hae
+        statuses: Viestit
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index fde6c1a2e..7e890f3d6 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -60,8 +60,8 @@ fr:
       error:
         title: Une erreur est survenue
       new:
-        able_to: Cette application pourra
-        prompt: Autoriser %{client_name} à utiliser votre compte ?
+        prompt_html: "%{client_name} souhaite accéder à votre compte. Il s'agit d'une application tierce. <strong>Vous ne devriez pas l'y autoriser si vous ne lui faites pas confiance.</strong>"
+        review_permissions: Examiner les autorisations
         title: Autorisation requise
       show:
         title: Copiez ce code d’autorisation et collez-le dans l’application.
@@ -71,10 +71,12 @@ fr:
       confirmations:
         revoke: Voulez-vous vraiment faire ça ?
       index:
-        application: Application
-        created_at: Créé le
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Permissions
+        authorized_at: Autorisée le %{date}
+        description_html: Ces applications peuvent accéder à votre compte via l'API. Si vous voyez ici des applications que vous ne reconnaissez pas ou qui ne fonctionnent pas normalement, vous pouvez en révoquer les accès.
+        last_used_at: Dernière utilisation le %{date}
+        never_used: Jamais utilisée
+        scopes: Autorisations
+        superapp: Interne
         title: Vos applications autorisées
     errors:
       messages:
@@ -85,7 +87,7 @@ fr:
         invalid_redirect_uri: L’URL de redirection n’est pas valide.
         invalid_request:
           missing_param: 'Parramètre requis manquant: %{value}.'
-          request_not_authorized: La requête doit être autorisée. Le paramètre requis pour la requête d'autorisation est manquant ou non valide.
+          request_not_authorized: La requête doit être autorisée. Le paramètre requis pour l'autorisation de la requête est manquant ou non valide.
           unknown: La requête omet un paramètre requis, inclut une valeur de paramètre non prise en charge ou est autrement mal formée.
         invalid_resource_owner: Les identifiants fournis par le propriétaire de la ressource ne sont pas valides ou le propriétaire de la ressource ne peut être trouvé
         invalid_scope: La permission demandée est invalide, inconnue ou mal formée.
@@ -110,6 +112,33 @@ fr:
       authorized_applications:
         destroy:
           notice: Application révoquée.
+    grouped_scopes:
+      access:
+        read: Accès en lecture seule
+        read/write: Accès en lecture et écriture
+        write: Accès en écriture seule
+      title:
+        accounts: Comptes
+        admin/accounts: Gestion des comptes
+        admin/all: Toutes les fonctionnalités d'administration
+        admin/reports: Gestion des rapports
+        all: Tout
+        blocks: Bloqués
+        bookmarks: Marque-pages
+        conversations: Conversations
+        crypto: Chiffrement de bout-en-bout
+        favourites: Favoris
+        filters: Filtres
+        follow: Relations
+        follows: Abonnements
+        lists: Listes
+        media: Fichiers médias
+        mutes: Masqués
+        notifications: Notifications
+        push: Notifications push
+        reports: Signalements
+        search: Recherche
+        statuses: Messages
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ fr:
       admin:write: modifier toutes les données sur le serveur
       admin:write:accounts: effectuer des actions de modération sur les comptes
       admin:write:reports: effectuer des actions de modération sur les signalements
+      crypto: utiliser le chiffrement de bout-en-bout
       follow: modifier les relations du compte
       push: recevoir vos notifications poussées
       read: lire toutes les données de votre compte
@@ -143,6 +173,7 @@ fr:
       write:accounts: modifier votre profil
       write:blocks: bloquer des comptes et des domaines
       write:bookmarks: mettre des messages en marque-pages
+      write:conversations: masquer et effacer les conversations
       write:favourites: mettre des messages en favori
       write:filters: créer des filtres
       write:follows: suivre des personnes
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml
index 0ca8dfa23..217dca738 100644
--- a/config/locales/doorkeeper.gd.yml
+++ b/config/locales/doorkeeper.gd.yml
@@ -60,8 +60,6 @@ gd:
       error:
         title: Thachair mearachd
       new:
-        able_to: 'Seo na comasan a bhios air:'
-        prompt: Tha aplacaid %{client_name} ag iarraidh inntrigeadh dhan chunntas agad
         title: Tha feum air ùghdarrachadh
       show:
         title: Dèan lethbhreac dhen chòd ùghdarrachaidh seo ’s cuir san aplacaid e.
@@ -71,10 +69,6 @@ gd:
       confirmations:
         revoke: A bheil thu cinnteach?
       index:
-        application: Aplacaid
-        created_at: Ceadaichte
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Sgòpaichean
         title: Na h-aplacaidean ùghdarraichte agad
     errors:
       messages:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 365eebb6e..d61928030 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -60,8 +60,8 @@ gl:
       error:
         title: Algo fallou
       new:
-        able_to: Poderá
-        prompt: A aplicación %{client_name} solicita acceso a túa conta
+        prompt_html: "%{client_name} solicita permiso para acceder á túa conta. É unha aplicación de terceiros. <strong>Se non confías nela, non deberías autorizala.</strong>"
+        review_permissions: Revisar permisos
         title: Autorización necesaria
       show:
         title: Copia este código de autorización e pégao na aplicación.
@@ -71,10 +71,12 @@ gl:
       confirmations:
         revoke: Estás segura?
       index:
-        application: Aplicación
-        created_at: Autorizado
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizada o %{date}
+        description_html: Estas aplicacións poden acceder á túa conta usando a API. Se ves publicacións que non recoñeces, ou hai comportamentos non consentidos dalgunha delas, podes revogar o acceso.
+        last_used_at: Último acceso o %{date}
+        never_used: Nunca utilizado
+        scopes: Permisos
+        superapp: Interno
         title: As túas aplicacións autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ gl:
       authorized_applications:
         destroy:
           notice: Aplicación revogada.
+    grouped_scopes:
+      access:
+        read: Acceso de só-lectura
+        read/write: Acceso de lectura e escritura
+        write: Acceso de só-escritura
+      title:
+        accounts: Contas
+        admin/accounts: Administración das contas
+        admin/all: Tódas funcións administrativas
+        admin/reports: Administración das denuncias
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversas
+        crypto: Cifrado E2E
+        favourites: Favoritas
+        filters: Filtros
+        follow: Relacións
+        follows: Seguimentos
+        lists: Listas
+        media: Anexos multimedia
+        mutes: Silenciamentos
+        notifications: Notificacións
+        push: Notificacións Push
+        reports: Denuncias
+        search: Busca
+        statuses: Publicacións
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ gl:
       admin:write: modificar todos os datos no servidor
       admin:write:accounts: executar accións de moderación nas contas
       admin:write:reports: executar accións de moderación nas denuncias
+      crypto: usar cifrado extremo-a-extremo
       follow: modificar as relacións da conta
       push: recibir notificacións push
       read: ler todos os datos da tua conta
@@ -143,6 +173,7 @@ gl:
       write:accounts: modificar o teu perfil
       write:blocks: bloquear contas e dominios
       write:bookmarks: marcar publicacións
+      write:conversations: acalar e eliminar conversas
       write:favourites: publicacións favoritas
       write:filters: crear filtros
       write:follows: seguir usuarias
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 987ce2200..cbbef63b1 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -59,8 +59,6 @@ he:
       error:
         title: התרחשה שגיאה
       new:
-        able_to: יוכל
-        prompt: ישום %{client_name} מבקש גישה לחשבונך
         title: נדרשת הרשאה
       show:
         title: יש להעתיק את קוד ההרשאה הזה ולהדביקו ביישום שביקש אותו.
@@ -70,9 +68,6 @@ he:
       confirmations:
         revoke: בטוח?
       index:
-        application: ישום
-        created_at: מאושר
-        scopes: תחומים
         title: ישומיך המאושרים
     errors:
       messages:
diff --git a/config/locales/doorkeeper.hr.yml b/config/locales/doorkeeper.hr.yml
index 915a16008..cb48de313 100644
--- a/config/locales/doorkeeper.hr.yml
+++ b/config/locales/doorkeeper.hr.yml
@@ -53,8 +53,6 @@ hr:
       error:
         title: Došlo je do greške
       new:
-        able_to: Moći će
-        prompt: Aplikacija %{client_name} zatražila je pristup Vašem računu
         title: Potrebna je autorizacija
     authorized_applications:
       buttons:
@@ -62,8 +60,6 @@ hr:
       confirmations:
         revoke: Jeste li sigurni?
       index:
-        application: Aplikacija
-        created_at: Ovlašeno
         title: Vaše autorizirane aplikacije
     errors:
       messages:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 644f71c57..d8959bfa2 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -60,8 +60,8 @@ hu:
       error:
         title: Hiba történt
       new:
-        able_to: Képes lesz
-        prompt: "%{client_name} nevű alkalmazás engedélyt kér a fiókodhoz való hozzáféréshez."
+        prompt_html: "%{client_name} szeretné elérni a fiókodat. Ez egy harmadik féltől származó alkalmazás. <strong>Ha nem bízol meg benne, ne addj felhatalmazást neki.</strong>"
+        review_permissions: Engedélyek áttekintése
         title: Engedély szükséges
       show:
         title: Másold le ezt az engedélyező kódot és írd be az alkalmazásba.
@@ -71,10 +71,12 @@ hu:
       confirmations:
         revoke: Biztos vagy benne?
       index:
-        application: Alkalmazás
-        created_at: Felhatalmazva
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Hatáskör
+        authorized_at: 'Felhatalmazva ekkor: %{date}'
+        description_html: Ezek olyan alkalmazások, melyek API-n keresztül érhetik el a fiókodat. Ha vannak itt olyanok, melyeket nem ismersz fel, vagy valamelyik alkalmazás rosszul működik, visszavonhatod az engedélyét.
+        last_used_at: 'Utoljára ekkor használva: %{date}'
+        never_used: Soha sem volt használva
+        scopes: Engedélyek
+        superapp: Belső
         title: Engedélyezett alkalmazásaid
     errors:
       messages:
@@ -110,6 +112,33 @@ hu:
       authorized_applications:
         destroy:
           notice: Alkalmazás visszavonva.
+    grouped_scopes:
+      access:
+        read: Csak olvasási elérés
+        read/write: Olvasási és írási elérés
+        write: Csak írási elérés
+      title:
+        accounts: Fiókok
+        admin/accounts: Fiókok adminisztrációja
+        admin/all: Minden adminisztratív funkció
+        admin/reports: Bejelentések adminisztrációja
+        all: Minden
+        blocks: Letiltások
+        bookmarks: Könyvjelzők
+        conversations: Beszélgetések
+        crypto: Végpontok közti titkosítás
+        favourites: Kedvencek
+        filters: Szűrők
+        follow: Kapcsolatok
+        follows: Követések
+        lists: Listák
+        media: Médiamellékletek
+        mutes: Némítások
+        notifications: Értesítések
+        push: Push értesítések
+        reports: Bejelentések
+        search: Keresés
+        statuses: Bejegyzések
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ hu:
       admin:write: szerver minden adatának változtatása
       admin:write:accounts: moderációs műveletek végzése fiókokon
       admin:write:reports: moderációs műveletek végzése bejelentéseken
+      crypto: végpontok közti titkosítás használata
       follow: fiókok követése, letiltása, tiltás feloldása és követés abbahagyása
       push: push értesítések fogadása
       read: fiókod adatainak olvasása
@@ -143,6 +173,7 @@ hu:
       write:accounts: profilod megváltoztatása
       write:blocks: fiókok és domainek letiltása
       write:bookmarks: bejegyzések könyvjelzőzése
+      write:conversations: beszélgetések némítása és törlése
       write:favourites: bejegyzések kedvencnek jelölése
       write:filters: szűrők létrehozása
       write:follows: mások követése
diff --git a/config/locales/doorkeeper.hy.yml b/config/locales/doorkeeper.hy.yml
index ec7b6e5f5..f9e1e22bd 100644
--- a/config/locales/doorkeeper.hy.yml
+++ b/config/locales/doorkeeper.hy.yml
@@ -60,8 +60,6 @@ hy:
       error:
         title: Առաջացել է սխալ։
       new:
-        able_to: Նա կարողանալու է
-        prompt: "%{client_name} յաւելուածը խնդրում է հասանելիութիւն քո հաշուին"
         title: Անհրաժեշտ է նոյնականացում
       show:
         title: Պատճէնիր այս նոյնականացման կոդը եւ փակցրու յաւելուածում։
@@ -71,10 +69,6 @@ hy:
       confirmations:
         revoke: Վստա՞հ ես
       index:
-        application: Յաւելուած
-        created_at: Նոյնականացրած
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Դաշտեր
         title: Քո նոյնականացրած ծրագրերը
     errors:
       messages:
diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml
index 066d85e73..f3f72f83c 100644
--- a/config/locales/doorkeeper.id.yml
+++ b/config/locales/doorkeeper.id.yml
@@ -60,8 +60,6 @@ id:
       error:
         title: Ada yang error
       new:
-        able_to: Mempunyai akses untuk
-        prompt: Aplikasi %{client_name} meminta akses pada akun anda
         title: Izin diperlukan
       show:
         title: Salin kode autorisasi dan tempelkan pada aplikasi.
@@ -71,10 +69,6 @@ id:
       confirmations:
         revoke: Anda yakin?
       index:
-        application: Aplikasi
-        created_at: Diizinkan pada
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Scope
         title: Aplikasi yang anda izinkan
     errors:
       messages:
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index c5071f425..e607901f7 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -60,8 +60,8 @@ is:
       error:
         title: Villa kom upp
       new:
-        able_to: Það mun geta
-        prompt: Forritið %{client_name} biður um aðgang að notandaaðgangnum þínum
+        prompt_html: "%{client_name} biður um heimild til að fara inn á notandaaðganginn þinn. Þetta er utanaðkomandi hugbúnaður. <strong>Ef þú treystir ekki viðkomandi, þá ættir þú ekki að heimila þetta.</strong>"
+        review_permissions: Yfirfara heimildir
         title: Auðkenning er nauðsynleg
       show:
         title: Afritaðu þennan auðkenningarkóða og límdu hann inn hjá forritinu.
@@ -71,10 +71,12 @@ is:
       confirmations:
         revoke: Ertu viss?
       index:
-        application: Forrit
-        created_at: Heimilað
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Gildissvið
+        authorized_at: Heimilað þann %{date}
+        description_html: Þetta eru forrit sem hafa aðgang að notandaaðgangnum þínum í gegnum API-forritsviðmótið. Ef hér eru forrit sem þú kannast ekki við, eða ef eitthvað forrit er til vandræða, skaltu afturkalla himildir þess.
+        last_used_at: Síðast notað þann %{date}
+        never_used: Aldrei notað
+        scopes: Heimildir
+        superapp: Innri
         title: Heimiluðu forritin þín
     errors:
       messages:
@@ -110,6 +112,33 @@ is:
       authorized_applications:
         destroy:
           notice: Forrit afturkallað.
+    grouped_scopes:
+      access:
+        read: Einungis lesaðgangur
+        read/write: Heimilt að lesa og skrifa
+        write: Einungis skrifaðgangur
+      title:
+        accounts: Notandaaðgangar
+        admin/accounts: Stjórnun aðganga
+        admin/all: Allar stjórnunaraðgerðir
+        admin/reports: Stjórnun kæra
+        all: Allt
+        blocks: Útilokanir
+        bookmarks: Bókamerki
+        conversations: Samtöl
+        crypto: Enda-í-enda dulritun
+        favourites: Eftirlæti
+        filters: Síur
+        follow: Vensl
+        follows: Fylgist með
+        lists: Listar
+        media: Myndefnisviðhengi
+        mutes: Þagganir
+        notifications: Tilkynningar
+        push: Ýti-tilkynningar
+        reports: Kærur
+        search: Leita
+        statuses: Færslur
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ is:
       admin:write: breyta öllum gögnum á netþjóninum
       admin:write:accounts: framkvæma umsjónaraðgerðir á notendaaðganga
       admin:write:reports: framkvæma umsjónaraðgerðir á kærur
+      crypto: nota enda-í-enda dulritun
       follow: breyta venslum aðgangs
       push: taka á móti ýti-tilkynningum til þín
       read: lesa öll gögn á notandaaðgangnum þínum
@@ -143,6 +173,7 @@ is:
       write:accounts: breyta notandasniðinu þínu
       write:blocks: útiloka notandaaðganga og lén
       write:bookmarks: bókamerkja færslur
+      write:conversations: þagga og eyða samtölum
       write:favourites: setja færslur í eftirlæti
       write:filters: útbúa síur
       write:follows: fylgjast með fólki
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 43053c73d..15b1744d7 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -60,8 +60,8 @@ it:
       error:
         title: Si è verificato un errore
       new:
-        able_to: Non sarà in grado di
-        prompt: L'applicazione %{client_name} richiede l'accesso al tuo account
+        prompt_html: "%{client_name} vorrebbe l'autorizzazione ad accedere al tuo profilo. È un'applicazione di terze parti. <strong>Se non ti fidi, non dovresti autorizzarlo.</strong>"
+        review_permissions: Esamina le autorizzazioni
         title: Autorizzazione richiesta
       show:
         title: Copia questo codice di autorizzazione e incollalo nell'applicazione.
@@ -71,10 +71,12 @@ it:
       confirmations:
         revoke: Sei sicuro/a?
       index:
-        application: Applicazione
-        created_at: Autorizzato
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Scopi
+        authorized_at: Autorizzato il %{date}
+        description_html: Queste sono le applicazioni che possono accedere al tuo profilo usando l'API. Se qui ci sono delle applicazioni che non riconosci, o un'applicazione si sta comportando erroneamente, puoi revocarne l'accesso.
+        last_used_at: Ultimo uso il %{date}
+        never_used: Mai usato
+        scopes: Autorizzazioni
+        superapp: Interno
         title: Applicazioni autorizzate
     errors:
       messages:
@@ -110,6 +112,33 @@ it:
       authorized_applications:
         destroy:
           notice: Applicazione disabilitata.
+    grouped_scopes:
+      access:
+        read: Accesso di sola lettura
+        read/write: Accesso di lettura e scrittura
+        write: Accesso di sola scrittura
+      title:
+        accounts: Profili
+        admin/accounts: Amministrazione dei profili
+        admin/all: Tutte le funzioni amministrative
+        admin/reports: Amministrazione dei rapporti
+        all: Tutto
+        blocks: Blocchi
+        bookmarks: Segnalibri
+        conversations: Conversazioni
+        crypto: Crittografia end-to-end
+        favourites: Preferiti
+        filters: Filtri
+        follow: Relazioni
+        follows: Segue
+        lists: Elenchi
+        media: Allegati multimediali
+        mutes: Silenziati
+        notifications: Notifiche
+        push: Notifiche push
+        reports: Rapporti
+        search: Cerca
+        statuses: Post
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ it:
       admin:write: modificare tutti i dati sul server
       admin:write:accounts: eseguire azioni di moderazione sugli account
       admin:write:reports: eseguire azioni di moderazione sulle segnalazioni
+      crypto: usa la crittografia end-to-end
       follow: modificare relazioni tra account
       push: ricevere le tue notifiche push
       read: leggere tutte le informazioni del tuo account
@@ -143,6 +173,7 @@ it:
       write:accounts: modificare il tuo profilo
       write:blocks: bloccare account e domini
       write:bookmarks: aggiungere post ai preferiti
+      write:conversations: silenzia ed elimina le conversazioni
       write:favourites: apprezzare post
       write:filters: creare filtri
       write:follows: seguire persone
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 1bc8dc684..fb807d7e5 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -60,8 +60,6 @@ ja:
       error:
         title: エラーが発生しました
       new:
-        able_to: このアプリは以下のことができます
-        prompt: アプリ %{client_name} があなたのアカウントへのアクセスを要求しています
         title: 認証が必要です
       show:
         title: 認証コードをコピーしてアプリに貼り付けて下さい。
@@ -71,10 +69,10 @@ ja:
       confirmations:
         revoke: 本当に取り消しますか?
       index:
-        application: アプリ名
-        created_at: 許可した日時
-        date_format: "%Y年%m月%d日 %H時%M分%S秒"
-        scopes: アクセス権
+        authorized_at: "%{date} に承認されました"
+        last_used_at: 最終使用日 %{date}
+        never_used: 使用されていない
+        scopes: 権限
         title: 認証済みアプリ
     errors:
       messages:
@@ -110,6 +108,25 @@ ja:
       authorized_applications:
         destroy:
           notice: アプリが取り消されました。
+    grouped_scopes:
+      access:
+        read: 読み取り専用アクセス
+        read/write: 読み取りおよび書き込みアクセス
+        write: 書き込み専用アクセス
+      title:
+        accounts: アカウント
+        blocks: ブロック
+        bookmarks: ブックマーク
+        crypto: エンドツーエンド暗号化
+        favourites: お気に入り
+        filters: フィルター
+        lists: リスオ
+        mutes: ミュート
+        notifications: 通知
+        push: プッシュ通知
+        reports: 通報
+        search: 検索
+        statuses: 投稿
     layouts:
       admin:
         nav:
@@ -124,6 +141,7 @@ ja:
       admin:write: サーバーのすべてのデータの変更
       admin:write:accounts: アカウントに対するアクションの実行
       admin:write:reports: 通報に対するアクションの実行
+      crypto: エンドツーエンド暗号化の使用
       follow: アカウントのつながりを変更
       push: プッシュ通知の受信
       read: アカウントのすべてのデータの読み取り
diff --git a/config/locales/doorkeeper.ka.yml b/config/locales/doorkeeper.ka.yml
index 5a9ec3610..36df811f1 100644
--- a/config/locales/doorkeeper.ka.yml
+++ b/config/locales/doorkeeper.ka.yml
@@ -59,8 +59,6 @@ ka:
       error:
         title: წარმოიშვა შეცდომა
       new:
-        able_to: ის შეძლებს
-        prompt: აპლიკაცია %{client_name} ითხოვს წვდომას თქვენს ანგარიშზე
         title: საჭიროა ავტორიზაცია
       show:
         title: დააკოპირეთ ეს ავტორიზაციის კოდი და ჩასვით აპლიკაციაში.
@@ -70,9 +68,6 @@ ka:
       confirmations:
         revoke: დარწმუნებული ხართ?
       index:
-        application: აპლიკაცია
-        created_at: ავტორიზებული
-        scopes: ფარგლები
         title: თქვენი ავტორიზებული აპლიკაციები
     errors:
       messages:
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index c8171fb83..d17979302 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -55,8 +55,6 @@ kab:
       error:
         title: Tella-d tuccḍa
       new:
-        able_to: Asnas-agi yezmer ad
-        prompt: Yessutred wesnan n %{client_name} akečum γer umiḍan-ik
         title: Tlaq tsiregt
       show:
         title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
@@ -66,9 +64,6 @@ kab:
       confirmations:
         revoke: Tetḥeqqeḍ?
       index:
-        application: Asnas
-        created_at: Yettussireg
-        date_format: "%d-%m-%Y %H:%M:%S"
         title: Isnasen-ik·im yettusirgen
     errors:
       messages:
diff --git a/config/locales/doorkeeper.kk.yml b/config/locales/doorkeeper.kk.yml
index 15a1dbff7..daaa3a9eb 100644
--- a/config/locales/doorkeeper.kk.yml
+++ b/config/locales/doorkeeper.kk.yml
@@ -60,8 +60,6 @@ kk:
       error:
         title: Қате пайда болды
       new:
-        able_to: It will be аble to
-        prompt: Application %{client_name} rеquests access to your account
         title: Authorization rеquired
       show:
         title: Copy this authorization cоde and paste it to the application.
@@ -71,9 +69,6 @@ kk:
       confirmations:
         revoke: Шынымен бе?
       index:
-        application: Қосымша
-        created_at: Авторизацияланды
-        scopes: Scopеs
         title: Your authorized applicаtions
     errors:
       messages:
diff --git a/config/locales/doorkeeper.kmr.yml b/config/locales/doorkeeper.kmr.yml
index 6a8b65d91..281de3bbd 100644
--- a/config/locales/doorkeeper.kmr.yml
+++ b/config/locales/doorkeeper.kmr.yml
@@ -60,8 +60,8 @@ kmr:
       error:
         title: Xeletîyek çêbû
       new:
-        able_to: Ew ê bikaribe
-        prompt: Sepanê %{client_name} dixwaze bigihîje ajimêrê te
+        prompt_html: "%{client_name} mafê dixwaze ku bigihîje ajimêrê te. Ew sepanek aliyê sêyemîn e. <strong>Ku tu pê bawer nakî, wê demê divê tu mafê gihiştinê nedî. </strong>"
+        review_permissions: Gihiştinan binirxînin
         title: Destûr kirin pêwîst e
       show:
         title: Destûr hildana vê kodê jê bigire û ji sepanê re pêve bike.
@@ -71,10 +71,12 @@ kmr:
       confirmations:
         revoke: Ma tu bawerî?
       index:
-        application: Sepan
-        created_at: Destûrmend
-        date_format: "%Y-%m-%d%H:%M:%S"
-        scopes: Berfirehî
+        authorized_at: Maf hate dayîn di %{date} de
+        description_html: Ev sepan in ku dikarin bi riya karanîna API ve bigihîjin ajimêrê te. Ku sepanên tu li vir nas nakî hene, an sepanek çewt tevdigere, tu dikarî gihîştina wê têk bibî.
+        last_used_at: Herî dawî di %{date} de hate bikaranîn
+        never_used: Tu car nehatiye bikaranîn
+        scopes: Maf
+        superapp: Hundirin
         title: Sepanên destûrmendê te
     errors:
       messages:
@@ -110,6 +112,33 @@ kmr:
       authorized_applications:
         destroy:
           notice: Sepan hate dûrxisitn.
+    grouped_scopes:
+      access:
+        read: Gihîştina tenê xwendin
+        read/write: Gihîştina xwendin û nivîsandin
+        write: Gihîştina tenê nivîsandin
+      title:
+        accounts: Ajimêr
+        admin/accounts: Rêveberiya ajimêran
+        admin/all: Hemû fonksiyonên reveberî
+        admin/reports: Rêveberiya ragihandinan
+        all: Her tişt
+        blocks: Astengkirin
+        bookmarks: Şûnpel
+        conversations: Axaftin
+        crypto: Dawî bi dawî şifrekirî
+        favourites: Bijarte
+        filters: Parzûn
+        follow: Pêwendî
+        follows: Şopîner
+        lists: Rêzok
+        media: Pêvekên medya
+        mutes: Bêdengkirin
+        notifications: Agahdarî
+        push: Agahdariyên Push
+        reports: Ragihandin
+        search: Lêgerîn
+        statuses: Şandî
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ kmr:
       admin:write: hemû daneyên li ser rajekar biguherîne
       admin:write:accounts: di ajimêrê de çalakiyên li hev kirî pêk bîne
       admin:write:reports: di ragihandinê de çalakiyên li hev kirî pêk bîne
+      crypto: dawî bi dawî şifrekirî bi kar bîne
       follow: têkiliyên ajimêrê biguherîne
       push: agahdariyên xwe bistîne
       read: hemû daneyên ajimêra xwe bixwîne
@@ -143,6 +173,7 @@ kmr:
       write:accounts: profîla xwe biguherîne
       write:blocks: hemû ajimêr û navperan asteng bike
       write:bookmarks: şandiyan di şûnpelê de tomar bike
+      write:conversations: bêdengkirin û jêbirina axaftinan
       write:favourites: şandiyên bijarte
       write:filters: parzûnan çê bike
       write:follows: kesan bişopîne
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index edc89a3e2..37e0ab840 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -60,22 +60,24 @@ ko:
       error:
         title: 에러가 발생하였습니다
       new:
-        able_to: 다음과 같은 행동들이 가능합니다
-        prompt: "%{client_name}이 당신의 계정에 접근 권한을 요청합니다"
+        prompt_html: "%{client_name}이 당신의 계정에 대한 접근 권한을 요청합니다. 이것은 제3자의 응용프로그램입니다. <strong>이것을 신뢰하지 않는다면, 권한을 승인하지 말아야 합니다.</strong>"
+        review_permissions: 권한 검토
         title: 승인 필요
       show:
         title: 이 승인 코드를 복사하여 애플리케이션에 붙여넣으세요
     authorized_applications:
       buttons:
-        revoke: 취소
+        revoke: 삭제
       confirmations:
         revoke: 확실합니까?
       index:
-        application: 애플리케이션
-        created_at: 승인 됨
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: 범위
-        title: 당신의 승인 된 애플리케이션들
+        authorized_at: "%{date}에 승인됨"
+        description_html: 당신의 계정에 API를 통해 접근 가능한 응용프로그램의 목록입니다. 알 수 없는 응용프로그램, 혹은 잘못된 행동을 하고 있는 응용프로그램이 있다면, 권한을 취소할 수 있습니다.
+        last_used_at: "%{date}에 마지막으로 사용됨"
+        never_used: 사용되지 않음
+        scopes: 권한
+        superapp: 내부
+        title: 당신의 승인된 애플리케이션들
     errors:
       messages:
         access_denied: 리소스 소유자 또는 권한 부여 서버가 요청을 거부했습니다.
@@ -91,7 +93,7 @@ ko:
         invalid_scope: 요청한 범위가 올바르지 않거나, 알 수 없거나, 잘못 된 형식입니다.
         invalid_token:
           expired: 액세스 토큰이 만료되었습니다.
-          revoked: 액세스 토큰이 취소되었습니다.
+          revoked: 액세스 토큰이 삭제되었습니다.
           unknown: 액세스 토큰이 잘못되었습니다.
         resource_owner_authenticator_not_configured: Doorkeeper.configure.resource_owner_authenticator가 설정되지 않아 리소스 소유자 찾기가 실패하였습니다.
         server_error: 권한 부여 서버에 예기치 않은 상태가 발생하여, 요청을 수행할 수 없습니다.
@@ -109,7 +111,34 @@ ko:
           notice: 애플리케이션이 갱신 되었습니다.
       authorized_applications:
         destroy:
-          notice: 애플리케이션이 취소 되었습니다.
+          notice: 애플리케이션이 삭제되었습니다.
+    grouped_scopes:
+      access:
+        read: 읽기 전용 권한
+        read/write: 읽기/쓰기 권한
+        write: 쓰기 전용 권한
+      title:
+        accounts: 계정
+        admin/accounts: 계정 관리
+        admin/all: 모든 관리자 기능
+        admin/reports: 신고 관리
+        all: 전체
+        blocks: 차단
+        bookmarks: 북마크
+        conversations: 대화
+        crypto: 종단간 암호화
+        favourites: 즐겨찾기
+        filters: 필터
+        follow: 관계
+        follows: 팔로우
+        lists: 리스트
+        media: 첨부된 미디어
+        mutes: 뮤트
+        notifications: 알림
+        push: 푸시 알림
+        reports: 신고
+        search: 검색
+        statuses: 게시물
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ ko:
       admin:write: 서버의 모든 데이터 수정
       admin:write:accounts: 계정에 모더레이션 조치 취하기
       admin:write:reports: 신고에 모더레이션 조치 취하기
+      crypto: 종단간 암호화 사용
       follow: 계정의 관계를 수정
       push: 푸시 알림을 받기
       read: 계정의 모든 데이터를 읽기
@@ -143,6 +173,7 @@ ko:
       write:accounts: 프로필 수정
       write:blocks: 계정이나 도메인 차단
       write:bookmarks: 게시글을 보관함에 넣기
+      write:conversations: 뮤트와 대화 삭제
       write:favourites: 관심글 지정
       write:filters: 필터 만들기
       write:follows: 사람을 팔로우
diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml
index db2f0b713..e55e8bc2c 100644
--- a/config/locales/doorkeeper.ku.yml
+++ b/config/locales/doorkeeper.ku.yml
@@ -60,8 +60,6 @@ ku:
       error:
         title: هەڵەیەک ڕوویدا
       new:
-        able_to: دەتوانێت
-        prompt: بەکارهێنانی %{client_name} داوای چوونە ژوورەوە بۆ هەژمارەکەت دەکات
         title: ڕێپێدان پێویستە
       show:
         title: کۆپیکردنی کۆدی ئەم رێپێدانە و لکاندنی بە بەرنامەکە.
@@ -71,9 +69,6 @@ ku:
       confirmations:
         revoke: ئایا دڵنیایت?
       index:
-        application: نەرمەکال
-        created_at: ده‌سه‌ڵاتپێدراو
-        scopes: بوارەکان
         title: بەرنامە ڕێگەپێدراوەکانت
     errors:
       messages:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 547facc8e..940d6f5ef 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -60,8 +60,8 @@ lv:
       error:
         title: Radās kļūda
       new:
-        able_to: Tā varēs
-        prompt: Lietotne %{client_name} prasa piekļuvi tavam kontam
+        prompt_html: "%{client_name} vēlas saņemt atļauju piekļūt tavam kontam. Tā ir trešās puses lietojumprogramma. <strong>Ja tu tam neuzticies, tad nevajadzētu to autorizēt.</strong>"
+        review_permissions: Pārskatīt atļaujas
         title: Nepieciešama autorizācija
       show:
         title: Nokopē šo autorizācijas kodu un ielīmē to lietotnē.
@@ -71,10 +71,12 @@ lv:
       confirmations:
         revoke: Vai esi pārliecināts?
       index:
-        application: Lietotne
-        created_at: Autorizēts
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Darbības sfēras
+        authorized_at: Autorizētas %{date}
+        description_html: Šīs ir lietojumprogrammas, kas var piekļūt tavam kontam, izmantojot API. Ja ir lietojumprogrammas, kuras šeit neatpazīsti, vai lietojumprogramma nedarbojas pareizi, vari atsaukt tām piekļuvi.
+        last_used_at: Pēdējo reizi lietotas %{date}
+        never_used: Nekad nav lietotas
+        scopes: Atļaujas
+        superapp: Iekšējs
         title: Tevis autorizētās lietotnes
     errors:
       messages:
@@ -110,6 +112,33 @@ lv:
       authorized_applications:
         destroy:
           notice: Lietotne atsaukta.
+    grouped_scopes:
+      access:
+        read: Tikai lasīšanas piekļuve
+        read/write: Lasīšanas un rakstīšanas piekļuve
+        write: Tikai rakstīšanas piekļuve
+      title:
+        accounts: Konti
+        admin/accounts: Kontu administrēšana
+        admin/all: Visas administrēšanas funkcijas
+        admin/reports: Ziņojumu administrēšana
+        all: Visi
+        blocks: Bloķētie
+        bookmarks: Grāmatzīmes
+        conversations: Sarunas
+        crypto: Pilnīga šifrēšana
+        favourites: Izlases
+        filters: Filtri
+        follow: Attiecības
+        follows: Seko
+        lists: Saraksti
+        media: Mediju pielikumi
+        mutes: Apklusinātie
+        notifications: Paziņojumi
+        push: Uznirstošie paziņojumi
+        reports: Ziņojumi
+        search: Meklēt
+        statuses: Ziņas
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ lv:
       admin:write: modificēt visus datus uz servera
       admin:write:accounts: veikt moderācijas darbības kontos
       admin:write:reports: veikt moderācijas darbības pārskatos
+      crypto: lieto pilnīgu šifrēšanu
       follow: mainīt konta attiecības
       push: saņemt savus push paziņojumus
       read: lasīt visus sava konta datus
@@ -143,6 +173,7 @@ lv:
       write:accounts: labot manu profilu
       write:blocks: bloķēt kontus un domēnus
       write:bookmarks: pievienotās grāmatzīmes
+      write:conversations: apklusināt un dzēst sarunas
       write:favourites: iecienītākās ziņas
       write:filters: izveidot filtrus
       write:follows: seko cilvēkiem
diff --git a/config/locales/doorkeeper.ml.yml b/config/locales/doorkeeper.ml.yml
index 83a37b1cd..8d65fce7d 100644
--- a/config/locales/doorkeeper.ml.yml
+++ b/config/locales/doorkeeper.ml.yml
@@ -59,9 +59,6 @@ ml:
       confirmations:
         revoke: നിങ്ങൾക്ക് ഉറപ്പാണോ?
       index:
-        application: അപ്ലിക്കേഷന്‍
-        created_at: അംഗീകാരപ്പെടുത്തിയത്
-        date_format: "%Y-%m-%d %H:%M:%S"
         title: നിങ്ങളുടെ അംഗീകൃത അപ്ലിക്കേഷനുകൾ
     errors:
       messages:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 786a0fcb8..cb0c70aab 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -60,8 +60,6 @@ nl:
       error:
         title: Er is een fout opgetreden
       new:
-        able_to: Deze toepassing zal in staat zijn om
-        prompt: "%{client_name} autoriseren om jouw account te gebruiken"
         title: Autorisatie vereist
       show:
         title: Kopieer deze autorisatiecode en plak het in de toepassing.
@@ -71,10 +69,6 @@ nl:
       confirmations:
         revoke: Weet je het zeker?
       index:
-        application: Toepassing
-        created_at: Aangemaakt op
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Toestemmingen
         title: Jouw geautoriseerde toepassingen
     errors:
       messages:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 72727d64c..789b50f61 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -60,8 +60,6 @@ nn:
       error:
         title: Ein feil har oppstått
       new:
-        able_to: Applikasjonen vil kunne
-        prompt: Applikasjonen %{client_name} spør om tilgang til kontoen din
         title: Autorisasjon nødvendig
       show:
         title: Kopier denne autorisasjonskoden og lim den inn i applikasjonen.
@@ -71,10 +69,6 @@ nn:
       confirmations:
         revoke: Er du sikker?
       index:
-        application: Applikasjon
-        created_at: Autorisert
-        date_format: "%d. %m %Y kl. %H.%M.%S"
-        scopes: Skop
         title: Dine autoriserte applikasjonar
     errors:
       messages:
diff --git a/config/locales/doorkeeper.no.yml b/config/locales/doorkeeper.no.yml
index eeddcfa36..40eff8bb1 100644
--- a/config/locales/doorkeeper.no.yml
+++ b/config/locales/doorkeeper.no.yml
@@ -60,8 +60,6 @@
       error:
         title: En feil oppstod
       new:
-        able_to: Den vil ha mulighet til
-        prompt: Applikasjon %{client_name} spør om tilgang til din konto
         title: Autorisasjon påkrevd
       show:
         title: Kopier denne koden og lim den inn i programmet.
@@ -71,10 +69,6 @@
       confirmations:
         revoke: Opphev?
       index:
-        application: Applikasjon
-        created_at: Autorisert
-        date_format: "%d. %m %Y kl. %H.%M.%S"
-        scopes: Omfang
         title: Dine autoriserte applikasjoner
     errors:
       messages:
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index 471ed1c8c..7160ee5ac 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -60,8 +60,6 @@ oc:
       error:
         title: I a agut un error
       new:
-        able_to: Aquesta aplicacion poirà
-        prompt: L’aplicacion %{client_name} demanda l’accès al vòstre compte
         title: Cal l’autorizacion
       show:
         title: Copiatz lo còdi d’autorizacion e pegatz-lo dins l’aplicacion.
@@ -71,10 +69,6 @@ oc:
       confirmations:
         revoke: Ne sètz segur ?
       index:
-        application: Aplicacion
-        created_at: Creacion
-        date_format: "%-d %b. de %Y %Ho%M %S"
-        scopes: Encastres
         title: Las vòstras aplicacions autorizadas
     errors:
       messages:
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 2954fad8f..13ac6b7ff 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -60,8 +60,6 @@ pl:
       error:
         title: Wystapił błąd
       new:
-        able_to: Uzyska
-        prompt: Aplikacja %{client_name} prosi o dostęp do Twojego konta
         title: Wymagana jest autoryzacja
       show:
         title: Skopiuj kod uwierzytelniający i wklej go w aplikacji.
@@ -71,10 +69,6 @@ pl:
       confirmations:
         revoke: Czy na pewno?
       index:
-        application: Aplikacja
-        created_at: Autoryzowana
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Zakresy
         title: Twoje autoryzowane aplikacje
     errors:
       messages:
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 822159c10..8232ce540 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -60,8 +60,6 @@ pt-BR:
       error:
         title: Ocorreu um erro
       new:
-        able_to: Poderá
-        prompt: O aplicativo %{client_name} solicita acesso à sua conta
         title: Autorização necessária
       show:
         title: Copie este código de autorização e cole no aplicativo.
@@ -71,10 +69,6 @@ pt-BR:
       confirmations:
         revoke: Você tem certeza?
       index:
-        application: Aplicativos
-        created_at: Autorizados
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Autorizações
         title: Aplicativos autorizados
     errors:
       messages:
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index d2c768a70..4336362ff 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -60,8 +60,8 @@ pt-PT:
       error:
         title: Ocorreu um erro
       new:
-        able_to: Vai poder
-        prompt: Aplicação %{client_name} pede acesso à tua conta
+        prompt_html: "%{client_name} pretende ter permissão para aceder à sua conta. É uma aplicação de terceiros. <strong>Se não confia nesta aplicação, então não deve autorizá-la.</strong>"
+        review_permissions: Rever permissões
         title: Autorização é necessária
       show:
         title: Copiar o código desta autorização e colar na aplicação.
@@ -71,10 +71,12 @@ pt-PT:
       confirmations:
         revoke: Tens a certeza?
       index:
-        application: Aplicação
-        created_at: Criada em
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Autorizações
+        authorized_at: Autorizado em %{date}
+        description_html: Estas são aplicações que podem aceder à sua conta utilizando a API. Se encontrar aqui aplicativos que não reconhece, ou um aplicativo está com mau funcionamento, pode revogar o seu acesso.
+        last_used_at: Última utilização em %{date}
+        never_used: Nunca utilizado
+        scopes: Permissões
+        superapp: Interna
         title: As tuas aplicações autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ pt-PT:
       authorized_applications:
         destroy:
           notice: Aplicação revogada.
+    grouped_scopes:
+      access:
+        read: Acesso só de leitura
+        read/write: Acesso de leitura e escrita
+        write: Acesso só de escrita
+      title:
+        accounts: Contas
+        admin/accounts: Administração de contas
+        admin/all: Todas as funções administrativas
+        admin/reports: Administração de denúncias
+        all: Tudo
+        blocks: Bloqueios
+        bookmarks: Itens Salvos
+        conversations: Conversas
+        crypto: Encriptação ponta-a-ponta
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relações
+        follows: Seguidores
+        lists: Listas
+        media: Anexos de media
+        mutes: Silenciados
+        notifications: Notificações
+        push: Notificações push
+        reports: Denúncias
+        search: Pesquisa
+        statuses: Publicações
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ pt-PT:
       admin:write: modificar todos os dados no servidor
       admin:write:accounts: executar ações de moderação em contas
       admin:write:reports: executar ações de moderação em denúncias
+      crypto: usa encriptação ponta-a-ponta
       follow: siga, bloqueie, desbloqueie, e deixa de seguir contas
       push: receber as suas notificações push
       read: tenha acesso aos dados da tua conta
@@ -143,6 +173,7 @@ pt-PT:
       write:accounts: modificar o seu perfil
       write:blocks: bloquear contas e domínios
       write:bookmarks: estado dos favoritos
+      write:conversations: silenciar e eliminar conversas
       write:favourites: estado dos favoritos
       write:filters: criar filtros
       write:follows: seguir pessoas
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index c09fb9e3d..3f94848fc 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -60,8 +60,6 @@ ro:
       error:
         title: A apărut o eroare
       new:
-        able_to: Acesta va putea să
-        prompt: Aplicația %{client_name} cere acces la contul dvs
         title: Autorizare necesară
       show:
         title: Copiați acest cod de autorizare și lipiți-l în aplicație.
@@ -71,10 +69,6 @@ ro:
       confirmations:
         revoke: Ești sigur?
       index:
-        application: Aplicație
-        created_at: Autorizat
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Domenii
         title: Aplicațiile dvs autorizate
     errors:
       messages:
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index df36db865..1d56ee6aa 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -60,8 +60,8 @@ ru:
       error:
         title: Произошла ошибка
       new:
-        able_to: Оно сможет
-        prompt: Приложение %{client_name} запрашивает доступ к Вашей учётной записи
+        prompt_html: "%{client_name} хочет получить доступ к вашему аккаунту. Это стороннее приложение. <strong>Если вы ему не доверяете, не разрешайте доступ.</strong>"
+        review_permissions: Просмотр разрешений
         title: Требуется авторизация
       show:
         title: Скопируйте этот код авторизации и вставьте его в приложении.
@@ -71,9 +71,9 @@ ru:
       confirmations:
         revoke: Вы уверены?
       index:
-        application: Приложение
-        created_at: Авторизовано
-        date_format: "%d.%m.%Y %H:%M:%S"
+        authorized_at: Доступ получен %{date}
+        last_used_at: Последнее использование %{date}
+        never_used: Не использовалось
         scopes: Разрешения
         title: Ваши авторизованные приложения
     errors:
@@ -110,6 +110,31 @@ ru:
       authorized_applications:
         destroy:
           notice: Авторизация приложения отозвана.
+    grouped_scopes:
+      access:
+        read: Доступ только для чтения
+        read/write: Доступ на чтение и запись
+        write: Доступ только для записи
+      title:
+        accounts: Учётные записи
+        admin/all: Все административные функции
+        all: Все
+        blocks: Блокировки
+        bookmarks: Закладки
+        conversations: Диалоги
+        crypto: Сквозное шифрование
+        favourites: Избранное
+        filters: Фильтры
+        follow: Взаимосвязи
+        follows: Подписки
+        lists: Списки
+        media: Медиафайлы
+        mutes: Без звука
+        notifications: Уведомления
+        push: Push-уведомления
+        reports: Обращения
+        search: Поиск
+        statuses: Посты
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml
index db857affd..7631d2cc1 100644
--- a/config/locales/doorkeeper.sc.yml
+++ b/config/locales/doorkeeper.sc.yml
@@ -60,8 +60,6 @@ sc:
       error:
         title: Faddina
       new:
-        able_to: At a pòdere
-        prompt: S'aplicatzione %{client_name} est preguntende atzessu a su contu tuo
         title: Autorizatzione rechesta
       show:
         title: Còpia custu còdighe de autorizatzione e incolla·ddu a s'aplicatzione.
@@ -71,10 +69,6 @@ sc:
       confirmations:
         revoke: Seguru?
       index:
-        application: Aplicatzione
-        created_at: Autorizada
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Àmbitos
         title: Is aplicatziones autorizadas tuas
     errors:
       messages:
diff --git a/config/locales/doorkeeper.si.yml b/config/locales/doorkeeper.si.yml
index 5a97eb41f..6416fd082 100644
--- a/config/locales/doorkeeper.si.yml
+++ b/config/locales/doorkeeper.si.yml
@@ -15,7 +15,7 @@ si:
       confirmations:
         destroy: ඔබට විශ්වාසද?
       edit:
-        title: යෙදුම සංස්කරණය කරන්න
+        title: යෙදුම සංස්කරණය
       index:
         application: යෙදුම
         empty: ඔබට කිසිම යෙදුමක් නැත.
@@ -36,9 +36,6 @@ si:
     authorized_applications:
       confirmations:
         revoke: ඔබට විශ්වාසද?
-      index:
-        application: යෙදුම
-        date_format: "%Y-%m-%d %H:%M:%S"
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index bd039024d..3f92a67ae 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -59,8 +59,6 @@ sk:
       error:
         title: Nastala chyba
       new:
-        able_to: Bude môcť
-        prompt: Aplikácia %{client_name} vyžaduje prístup k tvojmu účtu
         title: Je potrebná autorizácia
       show:
         title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
@@ -70,9 +68,6 @@ sk:
       confirmations:
         revoke: Si si istý?
       index:
-        application: Aplikácia
-        created_at: Autorizované
-        scopes: Oprávnenia
         title: Tvoje povolené aplikácie
     errors:
       messages:
@@ -104,6 +99,9 @@ sk:
       authorized_applications:
         destroy:
           notice: Oprávnenia aplikácie zrušené.
+    grouped_scopes:
+      title:
+        mutes: Nevšímané
     layouts:
       admin:
         nav:
@@ -137,6 +135,7 @@ sk:
       write:accounts: uprav svoj profil
       write:blocks: blokuj účty a domény
       write:bookmarks: pridaj si príspevky k záložkám
+      write:conversations: stíš a vymaž konverzácie
       write:favourites: obľúbené príspevky
       write:filters: vytvor roztriedenie
       write:follows: následuj ľudí
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index d8e1ef43a..8be46bad3 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -60,8 +60,8 @@ sl:
       error:
         title: Prišlo je do napake
       new:
-        able_to: To bo lahko
-        prompt: Program %{client_name} zahteva dostop do vašega računa
+        prompt_html: "%{client_name} želi dovoljenje za dostop do vašega računa. Gre za zunanji program. <strong>Če mu ne zaupate, mu ne dodelite teh pravic.</strong>"
+        review_permissions: Preglej pravice
         title: Potrebna je pooblastitev
       show:
         title: Kopirajte to pooblastilno kodo in jo prilepite v program.
@@ -71,10 +71,11 @@ sl:
       confirmations:
         revoke: Ali ste prepričani?
       index:
-        application: Program
-        created_at: Odobreno
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Obsegi
+        description_html: To so programi, ki lahko dostopajo do vašega računa prek vmesnika API. Če so na seznamu programi, ki jih ne prepoznate ali pa se čudno vedejo, lahko prekličete njihovo pravico do dostopa.
+        last_used_at: Zadnjič uporabljeno %{date}
+        never_used: Nikoli uporabljeno
+        scopes: Dovoljenja
+        superapp: Interno
         title: Vaši odobreni programi
     errors:
       messages:
@@ -110,6 +111,30 @@ sl:
       authorized_applications:
         destroy:
           notice: Program je preklican.
+    grouped_scopes:
+      access:
+        read: Dostop samo za branje
+        read/write: Dostop za branje in pisanje
+        write: Dostop samo za pisanje
+      title:
+        accounts: Računi
+        admin/accounts: Upravljanje računov
+        admin/all: Vse skrbniške funkcije
+        admin/reports: Upravljanje poročil
+        all: Vse
+        bookmarks: Zaznamki
+        conversations: Pogovori
+        favourites: Priljubljeni
+        filters: Filtri
+        follows: Sledi
+        lists: Seznami
+        media: Predstavnostne priloge
+        mutes: Utišani
+        notifications: Obvestila
+        push: Potisna obvestila
+        reports: Poročila
+        search: Iskanje
+        statuses: Objave
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index 1b83bbc7c..7b346efc9 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -60,8 +60,8 @@ sq:
       error:
         title: Ndodhi një gabim
       new:
-        able_to: Do të jetë në gjendje të
-        prompt: Aplikacioni %{client_name} kërkon hyrje në llogarinë tuaj
+        prompt_html: "%{client_name} do të donte leje të hyjë në llogarinë tuaj. Është një aplikacion palësh të treta. <strong>Nëse s’i zini besë, atëherë s’duhet ta autorizoni.</strong>"
+        review_permissions: Shqyrtoni leje
         title: Lypset autorizim
       show:
         title: Kopjojeni këtë kod autorizimi dhe ngjiteni te aplikacioni.
@@ -71,10 +71,12 @@ sq:
       confirmations:
         revoke: A jeni i sigurt?
       index:
-        application: Aplikacion
-        created_at: I autorizuar
-        date_format: "%d.%m.%Y, %H:%M:%S"
-        scopes: Fushëveprime
+        authorized_at: Autorizuar më %{date}
+        description_html: Këto janë aplikacione që mund të hyjnë në llogarinë tuaj duke përdorur API-n. Nëse këtu ka aplikacione që nuk i njihni, ose një aplikacion po sillet ndryshe nga sa pritet, mund t’i shfuqiozoni hyrjen.
+        last_used_at: Përdorur së fundi më %{date}
+        never_used: I papërdorur ndonjëherë
+        scopes: Leje
+        superapp: I brendshëm
         title: Aplikacionet tuaja të autorizuar
     errors:
       messages:
@@ -110,6 +112,33 @@ sq:
       authorized_applications:
         destroy:
           notice: Aplikacioni u shfuqizua.
+    grouped_scopes:
+      access:
+        read: Hyrje vetëm për lexim
+        read/write: Hyrje për lexim dhe shkrim
+        write: Hyrje vetëm për shkrim
+      title:
+        accounts: Llogari
+        admin/accounts: Administrim llogarish
+        admin/all: Krejt funksionet administrative
+        admin/reports: Administrim i raporteve
+        all: Gjithçka
+        blocks: Blloqe
+        bookmarks: Faqerojtës
+        conversations: Biseda
+        crypto: Fshehtëzim skaj-më-skaj
+        favourites: Të parapëlqyer
+        filters: Filtra
+        follow: Marrëdhënie
+        follows: Ndjekje
+        lists: Lista
+        media: Bashkëngjitje media
+        mutes: Heshtime
+        notifications: Njoftime
+        push: Njoftime Push
+        reports: Raportime
+        search: Kërkim
+        statuses: Postime
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ sq:
       admin:write: të përpunojë krejt të dhënat në shërbyes
       admin:write:accounts: të kryejë veprime moderimi në llogaritë
       admin:write:reports: të kryejë veprime moderimi në raportime
+      crypto: përdor fshehtëzim skaj-më-skaj
       follow: të ndryshojë marrëdhënie llogarish
       push: të marrë njoftime push për ju
       read: të lexojë krejt të dhënat e llogarisë tuaj
@@ -143,6 +173,7 @@ sq:
       write:accounts: të ndryshojë profilin tuaj
       write:blocks: të bllokojë llogari dhe përkatësi
       write:bookmarks: të faqeruajë gjendje
+      write:conversations: heshtoni dhe fshini biseda
       write:favourites: të parapëlqejë gjendje
       write:filters: të krijojë filtra
       write:follows: të ndjekë persona
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index c1d7c6e5e..f30e2a6ca 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -59,8 +59,6 @@ sr-Latn:
       error:
         title: Dogodila se greška
       new:
-        able_to: Biće u mogućnosti da
-        prompt: Aplikacija %{client_name} zahteva pristup Vašem nalogu
         title: Potrebna autorizacija
       show:
         title: Kopirajte ovaj autorizacioni kod i nalepite ga u aplikaciju.
@@ -70,10 +68,6 @@ sr-Latn:
       confirmations:
         revoke: Da li ste sigurni?
       index:
-        application: Aplikacija
-        created_at: Autorizovana
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Opsezi važenja
         title: Vaše autorizovane aplikacije
     errors:
       messages:
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index 1d92cf2f0..74c79227b 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -59,8 +59,6 @@ sr:
       error:
         title: Догодила се грешка
       new:
-        able_to: Биће у могућности да
-        prompt: Апликација %{client_name} захтева приступ Вашем налогу
         title: Потребна ауторизација
       show:
         title: Копирајте овај ауторизациони код и налепите га у апликацију.
@@ -70,10 +68,6 @@ sr:
       confirmations:
         revoke: Да ли сте сигурни?
       index:
-        application: Апликација
-        created_at: Ауторизована
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Опсези важења
         title: Ваше ауторизоване апликације
     errors:
       messages:
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index d7d28bae0..6e0efd6d1 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -60,8 +60,7 @@ sv:
       error:
         title: Ett fel har uppstått
       new:
-        able_to: Det kommer att kunna
-        prompt: Applikation %{client_name} begär tillgång till ditt konto
+        review_permissions: Förhandsgranska behörigheter
         title: Godkännande krävs
       show:
         title: Kopiera denna behörighetskod och klistra in den i programmet.
@@ -71,10 +70,11 @@ sv:
       confirmations:
         revoke: Är du säker?
       index:
-        application: Applikation
-        created_at: Auktoriserad
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfattning
+        authorized_at: Auktoriserades %{date}
+        last_used_at: Användes senast %{date}
+        never_used: Aldrig använd
+        scopes: Behörigheter
+        superapp: Internt
         title: Dina behöriga ansökningar
     errors:
       messages:
@@ -110,6 +110,26 @@ sv:
       authorized_applications:
         destroy:
           notice: Applikation återkallas.
+    grouped_scopes:
+      title:
+        accounts: Konton
+        admin/accounts: Administrering av konton
+        admin/all: Alla administrativa funktioner
+        admin/reports: Administrering av rapporter
+        all: Allting
+        blocks: Blockeringar
+        bookmarks: Bokmärken
+        conversations: Konversationer
+        crypto: Ände-till-ände-kryptering
+        favourites: Favoriter
+        follow: Relationer
+        follows: Följer
+        lists: Listor
+        notifications: Aviseringar
+        push: Push-aviseringar
+        reports: Rapporter
+        search: Sök
+        statuses: Inlägg
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.ta.yml b/config/locales/doorkeeper.ta.yml
index 879b6ab21..3cba7d9d4 100644
--- a/config/locales/doorkeeper.ta.yml
+++ b/config/locales/doorkeeper.ta.yml
@@ -23,5 +23,4 @@ ta:
       confirmations:
         revoke: உறுதியாகவா?
       index:
-        application: பயன்பாடு
         title: அனுமதியளிக்கப்பட்டுள்ள பயன்பாடுகள்/செயலிகள்
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index f95276383..b608be384 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -60,8 +60,8 @@ th:
       error:
         title: เกิดข้อผิดพลาด
       new:
-        able_to: แอปจะสามารถ
-        prompt: แอปพลิเคชัน %{client_name} ขอเข้าถึงบัญชีของคุณ
+        prompt_html: "%{client_name} ต้องการสิทธิอนุญาตเพื่อเข้าถึงบัญชีของคุณ แอปพลิเคชันเป็นแอปพลิเคชันจากบุคคลที่สาม <strong>หากคุณไม่เชื่อถือแอปพลิเคชัน คุณไม่ควรอนุญาตแอปพลิเคชัน</strong>"
+        review_permissions: ตรวจทานสิทธิอนุญาต
         title: ต้องมีการอนุญาต
       show:
         title: คัดลอกรหัสการอนุญาตนี้แล้ววางลงในแอปพลิเคชัน
@@ -71,10 +71,12 @@ th:
       confirmations:
         revoke: คุณแน่ใจหรือไม่?
       index:
-        application: แอปพลิเคชัน
-        created_at: อนุญาตเมื่อ
-        date_format: "%d/%m/%Y %H:%M:%S"
-        scopes: ขอบเขต
+        authorized_at: อนุญาตเมื่อ %{date}
+        description_html: นี่คือแอปพลิเคชันที่สามารถเข้าถึงบัญชีของคุณโดยใช้ API หากมีแอปพลิเคชันที่คุณไม่รู้จักที่นี่ หรือแอปพลิเคชันทำงานผิดปกติ คุณสามารถเพิกถอนการเข้าถึงของแอปพลิเคชัน
+        last_used_at: ใช้ล่าสุดเมื่อ %{date}
+        never_used: ไม่เคยใช้
+        scopes: สิทธิอนุญาต
+        superapp: ภายใน
         title: แอปพลิเคชันที่ได้รับอนุญาตของคุณ
     errors:
       messages:
@@ -100,6 +102,33 @@ th:
       authorized_applications:
         destroy:
           notice: เพิกถอนแอปพลิเคชันแล้ว
+    grouped_scopes:
+      access:
+        read: การเข้าถึงแบบอ่านเท่านั้น
+        read/write: การเข้าถึงแบบอ่านและเขียน
+        write: การเข้าถึงแบบเขียนเท่านั้น
+      title:
+        accounts: บัญชี
+        admin/accounts: การดูแลบัญชี
+        admin/all: ฟังก์ชันการดูแลทั้งหมด
+        admin/reports: การดูแลรายงาน
+        all: ทุกอย่าง
+        blocks: การปิดกั้น
+        bookmarks: ที่คั่นหน้า
+        conversations: การสนทนา
+        crypto: การเข้ารหัสแบบต้นทางถึงปลายทาง
+        favourites: รายการโปรด
+        filters: ตัวกรอง
+        follow: ความสัมพันธ์
+        follows: การติดตาม
+        lists: รายการ
+        media: ไฟล์แนบสื่อ
+        mutes: การซ่อน
+        notifications: การแจ้งเตือน
+        push: การแจ้งเตือนแบบผลัก
+        reports: การรายงาน
+        search: ค้นหา
+        statuses: โพสต์
     layouts:
       admin:
         nav:
@@ -114,6 +143,7 @@ th:
       admin:write: ปรับเปลี่ยนข้อมูลทั้งหมดในเซิร์ฟเวอร์
       admin:write:accounts: ทำการกระทำการควบคุมบัญชี
       admin:write:reports: ทำการกระทำการควบคุมรายงาน
+      crypto: ใช้การเข้ารหัสแบบต้นทางถึงปลายทาง
       follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
       push: รับการแจ้งเตือนแบบผลักของคุณ
       read: อ่านข้อมูลบัญชีทั้งหมดของคุณ
@@ -133,6 +163,7 @@ th:
       write:accounts: ปรับเปลี่ยนโปรไฟล์ของคุณ
       write:blocks: ปิดกั้นบัญชีและโดเมน
       write:bookmarks: เพิ่มที่คั่นหน้าโพสต์
+      write:conversations: ซ่อนและลบการสนทนา
       write:favourites: ชื่นชอบโพสต์
       write:filters: สร้างตัวกรอง
       write:follows: ติดตามผู้คน
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 8019b421a..351d271d0 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -60,8 +60,8 @@ tr:
       error:
         title: Bir hata oluştu
       new:
-        able_to: 'Şunları yapabilecek:'
-        prompt: "%{client_name} uygulaması hesabınıza erişim istiyor"
+        prompt_html: "%{client_name} hesabınıza erişme izni istiyor. Bu üçüncü taraf bir uygulamadır. <strong>Eğer güvenmiyorsanız, izin vermemelisiniz.</strong>"
+        review_permissions: İzinleri incele
         title: İzin gerekli
       show:
         title: Bu yetkilendirme kodunu kopyalayın ve uygulamaya yapıştırın.
@@ -71,10 +71,12 @@ tr:
       confirmations:
         revoke: Emin misiniz?
       index:
-        application: Uygulama
-        created_at: Yetkili
-        date_format: "%m-%d-%Y %H:%M:%S"
-        scopes: Kapsamlar
+        authorized_at: "%{date} tarihinde onaylandı"
+        description_html: Bunlar, API aracılığıyla hesabınıza erişebilen uygulamalardır. Eğer burada tanımadığınız uygulamalar veya kötü davranan bir uygulama var, erişimini kaldırabilirsiniz.
+        last_used_at: En son %{date} tarihinde kullanıldı
+        never_used: Hiç kullanılmadı
+        scopes: İzinler
+        superapp: Dahili
         title: Yetkili uygulamalarınız
     errors:
       messages:
@@ -110,6 +112,33 @@ tr:
       authorized_applications:
         destroy:
           notice: Uygulama iptal edildi.
+    grouped_scopes:
+      access:
+        read: Sadece okuma erişimi
+        read/write: Okuma ve yazma erişimi
+        write: Sadece yazma erişimi
+      title:
+        accounts: Hesaplar
+        admin/accounts: Hesapların yönetimi
+        admin/all: Tüm yönetsel işlevler
+        admin/reports: Şikayetlerin yönetimi
+        all: Her şey
+        blocks: Engeller
+        bookmarks: Yer imleri
+        conversations: Sohbetler
+        crypto: Uçtan uca şifreleme
+        favourites: Beğeniler
+        filters: Filtreler
+        follow: İlişkiler
+        follows: Takip edilenler
+        lists: Listeler
+        media: Medya ekleri
+        mutes: Sessize alınanlar
+        notifications: Bildirimler
+        push: Anlık bildirimler
+        reports: Şikayetler
+        search: Arama
+        statuses: Gönderiler
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ tr:
       admin:write: sunucudaki tüm verileri değiştirin
       admin:write:accounts: hesaplarda denetleme eylemleri gerçekleştirin
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
+      crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
       push: anlık bildirimlerizi alın
       read: hesabınızın tüm verilerini okuyun
@@ -143,6 +173,7 @@ tr:
       write:accounts: profilinizi değiştirin
       write:blocks: hesapları ve alan adlarını engelleyin
       write:bookmarks: durumları yer imleyin
+      write:conversations: sessize al ve sohbetleri sil
       write:favourites: durumları beğenin
       write:filters: filtreler oluşturun
       write:follows: insanları takip edin
diff --git a/config/locales/doorkeeper.tt.yml b/config/locales/doorkeeper.tt.yml
index af6e8f180..41af088bf 100644
--- a/config/locales/doorkeeper.tt.yml
+++ b/config/locales/doorkeeper.tt.yml
@@ -10,6 +10,3 @@ tt:
         delete: Бетерү
         name: Исем
         show: Күрсәтү
-    authorized_applications:
-      index:
-        date_format: "%Y-%m-%d %H:%M:%S"
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 8d0d8e770..58da91bf1 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -60,8 +60,6 @@ uk:
       error:
         title: Сталася помилка
       new:
-        able_to: Він зможе
-        prompt: Додаток %{client_name} запитує доступ до вашого облікового запису
         title: Необхідна авторизація
       show:
         title: Скопіюйте цей код авторизації та вставте його у додаток.
@@ -71,10 +69,6 @@ uk:
       confirmations:
         revoke: Ви впевнені?
       index:
-        application: Додаток
-        created_at: Авторизовано
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Дозволи
         title: Ваші авторизовані додатки
     errors:
       messages:
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 585d7ce07..8b4007f5c 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -60,8 +60,8 @@ vi:
       error:
         title: Một lỗi đã xảy ra
       new:
-        able_to: Nó sẽ có thể
-        prompt: Ứng dụng %{client_name} yêu cầu quyền truy cập vào tài khoản của bạn
+        prompt_html: "%{client_name} yêu cầu truy cập tài khoản của bạn. Đây là ứng dụng của bên thứ ba. <strong>Nếu không tin tưởng, đừng cho phép nó.</strong>"
+        review_permissions: Xem lại quyền cho phép
         title: Yêu cầu truy cập
       show:
         title: Sao chép mã này và dán nó vào ứng dụng.
@@ -71,10 +71,12 @@ vi:
       confirmations:
         revoke: Bạn có chắc không?
       index:
-        application: Ứng dụng
-        created_at: Đã cho phép
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Quyền hạn
+        authorized_at: Cấp quyền vào %{date}
+        description_html: Đây là những ứng dụng có thể truy cập tài khoản của bạn bằng API. Nếu có ứng dụng bạn không nhận ra ở đây hoặc ứng dụng hoạt động sai, bạn có thể thu hồi quyền truy cập của ứng dụng đó.
+        last_used_at: Dùng gần nhất vào %{date}
+        never_used: Chưa dùng bao giờ
+        scopes: Quyền cho phép
+        superapp: Nội bộ
         title: Các ứng dụng đang cho phép
     errors:
       messages:
@@ -110,6 +112,33 @@ vi:
       authorized_applications:
         destroy:
           notice: Đã gỡ bỏ ứng dụng.
+    grouped_scopes:
+      access:
+        read: Chỉ đọc
+        read/write: Đọc và ghi
+        write: Chỉ ghi
+      title:
+        accounts: Tài khoản
+        admin/accounts: Quản trị tài khoản
+        admin/all: Mọi chức năng quản trị
+        admin/reports: Quản trị báo cáo
+        all: Tất cả
+        blocks: Chặn
+        bookmarks: Tút đã lưu
+        conversations: Thảo luận
+        crypto: Mã hóa đầu cuối
+        favourites: Lượt thích
+        filters: Bộ lọc
+        follow: Mối quan hệ
+        follows: Đang theo dõi
+        lists: Danh sách
+        media: Tập tin đính kèm
+        mutes: Đã ẩn
+        notifications: Thông báo
+        push: Thông báo đẩy
+        reports: Báo cáo
+        search: Tìm kiếm
+        statuses: Tút
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ vi:
       admin:write: sửa đổi tất cả dữ liệu trên máy chủ
       admin:write:accounts: áp đặt hành động kiểm duyệt trên tài khoản
       admin:write:reports: áp đặt kiểm duyệt với các báo cáo
+      crypto: dùng mã hóa đầu cuối
       follow: sửa đổi các mối quan hệ tài khoản
       push: nhận thông báo đẩy của bạn
       read: đọc tất cả dữ liệu tài khoản của bạn
@@ -143,6 +173,7 @@ vi:
       write:accounts: sửa đổi trang cá nhân của bạn
       write:blocks: chặn người dùng và máy chủ
       write:bookmarks: sửa đổi những thứ bạn lưu
+      write:conversations: ẩn và xóa thảo luận
       write:favourites: lượt thích
       write:filters: tạo bộ lọc
       write:follows: theo dõi ai đó
diff --git a/config/locales/doorkeeper.zgh.yml b/config/locales/doorkeeper.zgh.yml
index d34b8109c..53c5181d4 100644
--- a/config/locales/doorkeeper.zgh.yml
+++ b/config/locales/doorkeeper.zgh.yml
@@ -37,15 +37,10 @@ zgh:
       buttons:
         authorize: ⵙⵙⵓⵔⴳ
         deny: ⴰⴳⵢ
-      new:
-        prompt: ⵜⵙⵙⵓⵜⵓⵔ ⵜⵙⵏⵙⵉ %{client_name} ⴰⵙⴰⴷⴼ ⵖⵔ ⵓⵎⵉⴹⴰⵏ ⵏⵏⴽ
     authorized_applications:
       confirmations:
         revoke: ⵉⵙ ⵏⵉⵜ?
       index:
-        application: ⵜⵉⵙⵏⵙⵉ
-        created_at: ⵜⴻⵜⵜⵓⵙⵓⵔⴳ
-        date_format: "%d-%m-%Y %H:%M:%S"
         title: ⵜⵉⵙⵏⵙⵉⵡⵉⵏ ⵏⵏⴽ ⵉⵜⵜⵓⵙⵓⵔⴷⵏ
     flash:
       applications:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 4a2c97e34..11067df73 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -60,8 +60,8 @@ zh-CN:
       error:
         title: 发生错误
       new:
-        able_to: 此应用将能够
-        prompt: "%{client_name} 应用想要授权访问你的账户"
+        prompt_html: "%{client_name} 希望得到访问你帐号的许可。这是一个第三方应用。<strong>如果你不信任它,那么你不应该授权它。</strong>"
+        review_permissions: 检查权限
         title: 需要授权
       show:
         title: 接下来请复制此处的授权代码并粘贴到应用中。
@@ -71,10 +71,12 @@ zh-CN:
       confirmations:
         revoke: 确定要撤销对此应用的授权吗?
       index:
-        application: 应用
-        created_at: 授权时间
-        date_format: "%Y 年 %m 月 %d 日 %H:%M:%S"
-        scopes: 权限范围
+        authorized_at: 授权于 %{date}
+        description_html: 这些是可以使用 API 访问你帐号的应用程序。如果这里有你不认识的应用程序,或者某个应用程序行为异常,你可以撤销其访问权限。
+        last_used_at: 最后一次使用 %{date}
+        never_used: 从未使用
+        scopes: 权限
+        superapp: 内部
         title: 已授权的应用列表
     errors:
       messages:
@@ -110,6 +112,33 @@ zh-CN:
       authorized_applications:
         destroy:
           notice: 已成功撤销对此应用的授权
+    grouped_scopes:
+      access:
+        read: 只读权限
+        read/write: 读写权限
+        write: 仅写入权限
+      title:
+        accounts: 帐号
+        admin/accounts: 管理员帐号
+        admin/all: 所有管理功能
+        admin/reports: 管理报表
+        all: 所有
+        blocks: 屏蔽
+        bookmarks: 收藏
+        conversations: 会话
+        crypto: 端到端加密
+        favourites: 喜欢
+        filters: 过滤器
+        follow: 关系
+        follows: 关注
+        lists: 列表
+        media: 媒体文件
+        mutes: 静音
+        notifications: 通知
+        push: 推送通知
+        reports: 报告
+        search: 搜索
+        statuses: 嘟文
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ zh-CN:
       admin:write: 修改服务器上的所有数据
       admin:write:accounts: 对帐号执行管理操作
       admin:write:reports: 对举报执行管理操作
+      crypto: 使用端到端加密
       follow: 关注或屏蔽用户
       push: 接收你的帐户的推送通知
       read: 读取你的帐户数据
@@ -143,6 +173,7 @@ zh-CN:
       write:accounts: 修改你的个人资料
       write:blocks: 屏蔽账号和域名
       write:bookmarks: 为嘟文添加书签
+      write:conversations: 静音并删除会话
       write:favourites: 喜欢的嘟文
       write:filters: 创建过滤器
       write:follows: 关注其他人
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 60c64cc31..30610ef09 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -60,8 +60,6 @@ zh-HK:
       error:
         title: 發生錯誤
       new:
-        able_to: 它將可以
-        prompt: 應用程式 %{client_name} 要求得到你用戶的部份權限
         title: 需要用戶授權
       show:
         title: 請把這個授權碼複製到應用程式中。
@@ -71,10 +69,6 @@ zh-HK:
       confirmations:
         revoke: 是否確定要取消授權?
       index:
-        application: 應用程式
-        created_at: 授權日期
-        date_format: "%Y年%m月%d日 %H:%M:%S"
-        scopes: 權限範圍 (Scopes)
         title: 已獲你授權的程用程式
     errors:
       messages:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 912924787..9a777c28b 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -60,8 +60,8 @@ zh-TW:
       error:
         title: 發生錯誤
       new:
-        able_to: 這將允許其作:
-        prompt: 應用程式 %{client_name} 要求取得您帳戶的存取權限
+        prompt_html: "%{client_name} 欲請求存取您帳號之權限。這是一個第三方應用程式。<strong>若您不信任該應用程式,請不要授權。</strong>"
+        review_permissions: 檢視權限
         title: 需要授權
       show:
         title: 複製此授權碼並貼上到應用程式中。
@@ -71,10 +71,12 @@ zh-TW:
       confirmations:
         revoke: 確定撤銷?
       index:
-        application: 應用程式
-        created_at: 授權於
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: 範圍
+        authorized_at: 於 %{date} 授權
+        description_html: 這些應用程式能透過 API 存取您的帳號。若有您不認得之應用程式,或應用程式行為異常,您可以於此註銷其存取權限。
+        last_used_at: 上次使用時間 %{date}
+        never_used: 從未使用
+        scopes: 權限
+        superapp: 內部
         title: 已授權的應用程式
     errors:
       messages:
@@ -110,6 +112,33 @@ zh-TW:
       authorized_applications:
         destroy:
           notice: 已撤銷應用程式。
+    grouped_scopes:
+      access:
+        read: 唯讀權限
+        read/write: 讀寫權限
+        write: 唯寫權限
+      title:
+        accounts: 帳號
+        admin/accounts: 帳號管理
+        admin/all: 所有管理功能
+        admin/reports: 檢舉報告管理
+        all: 全部
+        blocks: 封鎖
+        bookmarks: 書籤
+        conversations: 對話
+        crypto: 端到端加密
+        favourites: 最愛
+        filters: 過濾器
+        follow: 關係
+        follows: 跟隨的使用者
+        lists: 名單
+        media: 多媒體附加檔案
+        mutes: 靜音
+        notifications: 通知
+        push: 推播通知
+        reports: 檢舉報告
+        search: 搜尋
+        statuses: 嘟文
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ zh-TW:
       admin:write: 修改伺服器的所有資料
       admin:write:accounts: 對帳戶進行仲裁管理動作
       admin:write:reports: 對報告進行仲裁管理動作
+      crypto: 使用端到端加密
       follow: 修改帳戶關係
       push: 接收帳戶的推播通知
       read: 讀取您所有的帳戶資料
@@ -143,6 +173,7 @@ zh-TW:
       write:accounts: 修改您的個人檔案
       write:blocks: 封鎖帳戶及站台
       write:bookmarks: 書籤狀態
+      write:conversations: 靜音及刪除對話
       write:favourites: 收藏嘟文
       write:filters: 建立過濾條件
       write:follows: 關注其他人
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 328c28186..7bdeefc60 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -25,6 +25,7 @@ el:
       Αυτός ο λογαριασμός είναι εικονικός και απεικονίζει ολόκληρο τον κόμβο, όχι κάποιο συγκεκριμένο χρήστη.
       Χρησιμεύει στη λειτουργία της ομοσπονδίας και δε θα πρέπει να αποκλειστεί, εκτός κι αν είναι επιθυμητός ο αποκλεισμός ολόκληρου του κόμβου. Σε αυτή την περίπτωση θα πρέπει να χρησιμοποιηθεί η λειτουργία αποκλεισμού τομέα.
     learn_more: Μάθε περισσότερα
+    logout_before_registering: Είστε ήδη συνδεδεμένοι.
     privacy_policy: Πολιτική απορρήτου
     rules: Κανόνες διακομιστή
     rules_html: 'Παρακάτω είναι μια σύνοψη των κανόνων που πρέπει να ακολουθήσετε αν θέλετε να έχετε ένα λογαριασμό σε αυτόν τον διακομιστή Mastodon:'
@@ -68,7 +69,6 @@ el:
     media: Πολυμέσα
     moved_html: 'Ο/Η %{name} μετακόμισε στο %{new_profile_link}:'
     network_hidden: Αυτή η πληροφορία δεν είναι διαθέσιμη
-    never_active: Ποτέ
     nothing_here: Δεν υπάρχει τίποτα εδώ!
     people_followed_by: Χρήστες που ακολουθεί ο/η %{name}
     people_who_follow: Χρήστες που ακολουθούν τον/την %{name}
@@ -358,17 +358,6 @@ el:
       reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει τη λήψη άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές
       reject_reports: Απόρριψη καταγγελιών
       reject_reports_hint: Αγνόηση όσων καταγγελιών προέρχονται από αυτό τον τομέα. Δεν σχετίζεται με τις παύσεις
-      rejecting_media: απορρίπτουν αρχεία πολυμέσων
-      rejecting_reports: απορρίπτουν καταγγελίες
-      severity:
-        silence: αποσιωπημένοι
-        suspend: ανεσταλμένοι
-      show:
-        retroactive:
-          silence: Αναίρεση αποσιώπησης όλων των λογαριασμός του τομέα
-          suspend: Αναίρεση αναστολής όλων των λογαριασμών του τομέα
-        title: Αναίρεση αποκλεισμού για τον τομέα %{domain}
-        undo: Αναίρεση
       undo: Αναίρεση
       view: Εμφάνιση αποκλεισμού τομέα
     email_domain_blocks:
@@ -474,6 +463,7 @@ el:
       forwarded: Προωθημένα
       forwarded_to: Προώθημένα προς %{domain}
       mark_as_resolved: Σημειωμένο ως επιλυμένο
+      mark_as_sensitive: Σήμανση ως ευαίσθητο
       mark_as_unresolved: Σημειωμένο ως ανεπίλυτο
       no_one_assigned: Κανένας
       notes:
@@ -1134,6 +1124,16 @@ el:
       public_long: Βλέπει οποιοσδήποτε
       unlisted: Μη καταχωρημένο
       unlisted_long: Βλέπει οποιοσδήποτε, αλλά δεν καταχωρείται στις δημόσιες ροές
+  statuses_cleanup:
+    min_age:
+      '1209600': 2 weeks
+      '15778476': 6 months
+      '2629746': 1 month
+      '31556952': 1 year
+      '5259492': 2 months
+      '604800': 1 εβδομάδα
+      '63113904': 2 years
+      '7889238': 3 months
   stream_entries:
     pinned: Καρφιτσωμένο τουτ
     reblogged: προωθημένο
@@ -1265,7 +1265,6 @@ el:
       title:
         disable: Παγωμένος λογαριασμός
         none: Προειδοποίηση
-        sensitive: Κρυμμένο πολυμέσο
         silence: Περιορισμένος λογαριασμός
         suspend: Λογαριασμός σε αναστολή
     welcome:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 5a922e6a4..c70641ca3 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -25,6 +25,7 @@ eo:
       Ĉi tiu konto estas virtuala ulo uzata por reprezenti la servilon mem kaj ne iun apartan uzanton.
       Ĝi estas uzata por frataraj celoj kaj ĝi ne devus esti blokita krom se vi volas bloki la tutan servilon, tiuokaze vi devus uzi domajnan blokadon.
     learn_more: Lerni pli
+    logout_before_registering: Vi jam saluts.
     privacy_policy: Privateca politiko
     rules: Reguloj de la servilo
     see_whats_happening: Vidi kio okazas
@@ -61,7 +62,6 @@ eo:
     media: Aŭdovidaĵoj
     moved_html: "%{name} moviĝis al %{new_profile_link}:"
     network_hidden: Tiu informo ne estas disponebla
-    never_active: Neniam
     nothing_here: Estas nenio ĉi tie!
     people_followed_by: Sekvatoj de %{name}
     people_who_follow: Sekvantoj de %{name}
@@ -362,17 +362,6 @@ eo:
       reject_media_hint: Forigas aŭdovidaĵojn loke konservitajn kaj rifuzas alŝuti ajnan estonte. Ne koncernas haltigojn
       reject_reports: Malakcepti signalojn
       reject_reports_hint: Ignori ĉiujn signalojn el tiu domajno. Ne koncernas haltigojn
-      rejecting_media: aŭdovidaj dosieroj malakceptiĝas
-      rejecting_reports: malakceptas signalojn
-      severity:
-        silence: silentigita
-        suspend: haltigita
-      show:
-        retroactive:
-          silence: Malkaŝi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
-          suspend: Malhaltigi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
-        title: Malfari blokadon de domajno %{domain}
-        undo: Malfari
       undo: Malfari
       view: Vidi domajna blokado
     email_domain_blocks:
@@ -397,7 +386,6 @@ eo:
       by_domain: Domajno
       delivery:
         all: Ĉiuj
-        warning: Averto
       delivery_available: Liverado disponeblas
       empty: Neniuj domajnoj trovitaj.
       moderation:
@@ -511,7 +499,7 @@ eo:
         all: Al ciuj
         disabled: Al neniu
         title: Vidi domajna blokado
-        users: Al ensalutintaj lokaj uzantoj
+        users: Al salutintaj lokaj uzantoj
       domain_blocks_rationale:
         title: Montri la kialon
       hero:
@@ -656,8 +644,8 @@ eo:
     invalid_reset_password_token: Ĵetono por restarigi pasvorton nevalida aŭ eksvalida. Bonvolu peti novan.
     link_to_webauth: Uzi vian sekurecan ŝlosilon
     log_in_with: Ensaluti per
-    login: Ensaluti
-    logout: Elsaluti
+    login: Saluti
+    logout: Adiaŭi
     migrate_account: Movi al alia konto
     migrate_account_html: Se vi deziras alidirekti ĉi tiun konton al alia, vi povas <a href="%{path}">agordi ĝin ĉi tie</a>.
     or_log_in_with: Aŭ ensaluti per
@@ -1118,6 +1106,7 @@ eo:
       '2629746': 1 monato
       '31556952': 1 jaro
       '5259492': 2 monatoj
+      '604800': 1 week
       '63113904': 2 jaroj
       '7889238': 3 monatoj
   stream_entries:
@@ -1189,7 +1178,7 @@ eo:
     invalid_sign_in_token: Nevalida sekureca kodo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
-    signed_in_as: 'Ensalutinta kiel:'
+    signed_in_as: 'Salutinta kiel:'
   verification:
     explanation_html: 'Vi povas <strong>pruvi, ke vi estas la posedanto de la ligiloj en viaj profilaj metadatumoj</strong>. Por fari tion, la alligita retejo devas enhavi ligilon reen al via Mastodon-profilo. La religilo <strong>devas</strong> havi la atributon <code>rel="me"</code>. Ne gravas la teksta enhavo de la religilo. Jen ekzemplo:'
     verification: Kontrolo
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 8956f8dd7..b42798720 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -16,6 +16,7 @@ es-AR:
     contact: Contacto
     contact_missing: No establecido
     contact_unavailable: No disponible
+    continue_to_web: Continuar con la aplicación web
     discover_users: Descubrí usuarios
     documentation: Documentación
     federation_hint_html: Con una cuenta en %{instance} vas a poder seguir a cuentas de cualquier servidor de Mastodon y más allá.
@@ -25,6 +26,8 @@ es-AR:
       Esta cuenta es un actor virtual usado para representar al propio servidor y no a ningún usuario individual.
       Se usa para fines federativos y no debe ser bloqueado a menos que quieras bloquear toda la instancia, en cuyo caso deberías usar un bloqueo de dominio.
     learn_more: Aprendé más
+    logged_in_as_html: Actualmente iniciaste sesión como %{username}.
+    logout_before_registering: Ya iniciaste sesión.
     privacy_policy: Política de privacidad
     rules: Reglas del servidor
     rules_html: 'Abajo hay un resumen de las reglas que tenés que seguir si querés tener una cuenta en este servidor de Mastodon:'
@@ -69,7 +72,6 @@ es-AR:
     media: Medios
     moved_html: "%{name} se mudó a %{new_profile_link}:"
     network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada acá!"
     people_followed_by: "%{name} sigue a estas personas"
     people_who_follow: Estas personas siguen a %{name}
@@ -448,21 +450,6 @@ es-AR:
       reject_media_hint: Quita los archivos de medios almacenados e impide la descarga en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar denuncias
       reject_reports_hint: Ignora todas las denuncias que vengan de este dominio. Irrelevante para suspensiones
-      rejecting_media: rechazo de archivos de medios
-      rejecting_reports: rechazo de denuncias
-      severity:
-        silence: limitados
-        suspend: suspendidos
-      show:
-        affected_accounts:
-          one: Una cuenta en la base de datos afectada
-          other: "%{count} cuentas en la base de datos afectada"
-          zero: Ninguna cuenta en la base de datos está afectada
-        retroactive:
-          silence: Quitar límite de las cuentas existentes afectadas de este dominio
-          suspend: Quitar suspensión de las cuentas existentes afectadas de este dominio
-        title: Deshacer el bloqueo de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer bloqueo de dominio
       view: Ver bloqueo de dominio
     email_domain_blocks:
@@ -503,13 +490,7 @@ es-AR:
         clear: Limpiar errores de entrega
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Falla de entrega %{count} día
-          other: Falla de entrega %{count} días
       delivery_available: La entrega está disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible durante %{count} días, se marcará automáticamente como no entregable.
@@ -586,6 +567,7 @@ es-AR:
       action_taken_by: Acción tomada por
       actions:
         delete_description_html: Los mensajes denunciados serán eliminados y se registrará un incumplimiento para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos de medios en los mensajes denunciados se marcarán como sensibles y se registrará un incumplimiento para ayudarte a escalar las futuras acciones de la misma cuenta.
         other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta denunciada.
         resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará el incumplimiento, y se cerrará la denuncia.
         silence_description_html: El perfil será visible sólo para aquellos que ya sigan esta cuenta o que la busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
@@ -606,6 +588,7 @@ es-AR:
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelta
+      mark_as_sensitive: Marcado como sensible
       mark_as_unresolved: Marcar como no resuelta
       no_one_assigned: Nadie
       notes:
@@ -708,7 +691,7 @@ es-AR:
         desc_html: Párrafo introductorio en la API. Describe qué hace especial a este servidor de Mastodon y todo lo demás que sea importante. Podés usar etiquetas HTML, en particular <code>&lt;a&gt;</code> y <code>&lt;em&gt;</code>.
         title: Descripción del servidor
       site_description_extended:
-        desc_html: Un buen lugar para tu código de conducta, reglas, guías y otras cosas que definen tu servidor. Podés usar etiquets HTML
+        desc_html: Un buen lugar para tu código de conducta, reglas, directrices y otras cosas que definen tu servidor. Podés usar etiquets HTML
         title: Información extendida personalizada
       site_short_description:
         desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe qué es Mastodon y qué hace especial a este servidor en un solo párrafo.
@@ -749,6 +732,7 @@ es-AR:
       actions:
         delete_statuses: "%{name} eliminó los mensajes de %{target}"
         disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcó los mensajes de %{target} como sensibles"
         none: "%{name} envió una advertencia a %{target}"
         sensitive: "%{name} marcó los medios de %{target} como sensibles"
         silence: "%{name} limitó la cuenta de %{target}"
@@ -774,6 +758,7 @@ es-AR:
       links:
         allow: Permitir enlace
         allow_provider: Permitir medio
+        description_html: Estos son enlaces que actualmente están siendo muy compartidos por cuentas desde las que tu servidor ve los mensajes. Esto puede ayudar a tus usuarios a averiguar qué está pasando en el mundo. No hay enlaces que se muestren públicamente hasta que autoricés al publicador. También podés permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
         disallow_provider: Rechazar medio
         shared_by_over_week:
@@ -785,14 +770,17 @@ es-AR:
       pending_review: Revisión pendiente
       preview_card_providers:
         allowed: Los enlaces de este medio pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en tu servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Tu aprobación (o rechazo) se extiende a los subdominios.
         rejected: Los enlaces de este medio no serán tendencia
         title: Medios
       rejected: Rechazadas
       statuses:
         allow: Permitir mensaje
         allow_account: Permitir autor
+        description_html: Estos son mensajes que tu servidor detecta que están siendo compartidos y marcados como favoritos muchas veces en este momento. Esto puede ayudar a tus usuarios nuevos y retornantes a encontrar más cuentas para seguir. No hay mensajes que se muestren públicamente hasta que aprobés al autor, y el autor permita que su cuenta sea sugerida a otros. También podés permitir o rechazar mensajes individuales.
         disallow: Rechazar mensaje
         disallow_account: Rechazar autor
+        not_discoverable: El autor optó ser detectable
         shared_by:
           one: Compartido o marcado como favorito una vez
           other: Compartido y marcado como favorito %{friendly_count} veces
@@ -805,6 +793,7 @@ es-AR:
           tag_servers_dimension: Servidores principales
           tag_servers_measure: diferentes servidores
           tag_uses_measure: usos totales
+        description_html: Estas son etiquetas que están apareciendo en muchos mensajes que tu servidor ve. Esto puede ayudar a tus usuarios a averiguar de qué habla la gente en estos momentos. No hay etiquetas que se muestren públicamente hasta que las aprobés.
         listable: Pueden ser recomendadas
         not_listable: No serán recomendadas
         not_trendable: No aparecerán en tendencias
@@ -831,6 +820,7 @@ es-AR:
       actions:
         delete_statuses: para eliminar sus mensajes
         disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
         none: una advertencia
         sensitive: para marcar su cuenta como sensible
         silence: para limitar su cuenta
@@ -933,8 +923,10 @@ es-AR:
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
+      functional: Tu cuenta está totalmente operativa.
       pending: Tu solicitud está pendiente de revisión por nuestra administración. Eso puede tardar algún tiempo. Si se aprueba tu solicitud, vas a recibir un correo electrónico.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver incumplimientos pasados contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, probá de nuevo.
     trouble_logging_in: "¿Tenés problemas para iniciar sesión?"
     use_security_key: Usar la llave de seguridad
@@ -1010,6 +1002,7 @@ es-AR:
         submit: Enviar apelación
       associated_report: Denuncia asociada
       created_at: Con fecha
+      description_html: Estas son acciones tomadas contra tu cuenta y las advertencias que te han sido enviadas por el equipo de %{instance}.
       recipient: Dirigida a
       status: 'Mensaje #%{id}'
       status_removed: Mensaje ya eliminado del sistema
@@ -1017,6 +1010,7 @@ es-AR:
       title_actions:
         delete_statuses: Eliminación de mensaje
         disable: Congelación de cuenta
+        mark_statuses_as_sensitive: Marcado de mensajes como sensibles
         none: Advertencia
         sensitive: Marcado de cuenta como sensible
         silence: Limitación de cuenta
@@ -1390,6 +1384,7 @@ es-AR:
     profile: Perfil
     relationships: Seguimientos
     statuses_cleanup: Eliminación automática de mensajes
+    strikes: Moderación de incumplimientos
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Llaves de seguridad
   statuses:
@@ -1469,6 +1464,7 @@ es-AR:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de edad
@@ -1616,26 +1612,28 @@ es-AR:
         spam: Spam
         violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        delete_statuses: Algunos de tus mensajes violan una o más directrices de la comunidad y por consiguiente fueron eliminados por los moderadores de %{instance}. Futuras violaciones pueden resultar en acciones punitivas más severas contra tu cuenta.
+        delete_statuses: Algunos de tus mensajes se encontraron violando una o más directrices de la comunidad y fueron eliminados posteriormente por los moderadores de %{instance}.
         disable: Ya no podés usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Podés solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta, o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes fueron marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que hacer clic o darle un toque a los medios en los mensajes antes de que se muestre una vista previa. Podés marcar los medios como sensibles vos mismo cuando publiqués en el futuro.
         sensitive: A partir de ahora, todos tus archivos subidos serán marcados como sensibles y ocultos tras una advertencia en la que habrá que hacer clic.
         silence: Todavía podés usar tu cuenta, pero sólo las personas que te están siguiendo verán tus publicaciones en este servidor, y podrías ser excluido de varias funciones de descubrimiento. Sin embargo, otras cuentas podrán seguirte manualmente.
         suspend: Ya no podés usar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía podés iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquivés la suspensión.
-      get_in_touch: Si crees que esto es un error, podés responder a este correo electrónico para ponerte en contacto con el equipo de %{instance}.
       reason: 'Motivo:'
-      statuses: 'Mensajes que se encontraron en violación:'
+      statuses: 'Mensajes citados:'
       subject:
         delete_statuses: Se eliminaron tus mensajes en %{acct}
         disable: Tu cuenta %{acct} fue congelada
+        mark_statuses_as_sensitive: Tus mensajes en %{acct} fueron marcados como sensibles
         none: Advertencia para %{acct}
-        sensitive: Tus archivos en %{acct} se marcarán como sensibles a partir de ahora
+        sensitive: Tus mensajes en %{acct} se marcarán como sensibles a partir de ahora
         silence: Tu cuenta %{acct} fue limitada
         suspend: Tu cuenta %{acct} fue suspendida
       title:
         delete_statuses: Mensajes eliminados
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Mensajes marcados como sensibles
         none: Advertencia
-        sensitive: Medios ocultos
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 707e279c4..4a3979cb4 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -16,6 +16,7 @@ es-MX:
     contact: Contacto
     contact_missing: No especificado
     contact_unavailable: No disponible
+    continue_to_web: Continuar a la aplicación web
     discover_users: Descubrir usuarios
     documentation: Documentación
     federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
@@ -25,6 +26,8 @@ es-MX:
       Esta cuenta es un actor virtual usado para representar al servidor y no a ningún usuario individual.
       Se usa para fines federativos y no debe ser bloqueado a menos que usted quiera bloquear toda la instancia, en cuyo caso se debe utilizar un bloque de dominio.
     learn_more: Aprende más
+    logged_in_as_html: Actualmente estás conectado como %{username}.
+    logout_before_registering: Actualmente ya has iniciado sesión.
     privacy_policy: Política de privacidad
     rules: Normas del servidor
     rules_html: 'A continuación hay un resumen de las normas que debes seguir si quieres tener una cuenta en este servidor de Mastodon:'
@@ -69,7 +72,6 @@ es-MX:
     media: Multimedia
     moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
     network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada aquí!"
     people_followed_by: Usuarios a quien %{name} sigue
     people_who_follow: Usuarios que siguen a %{name}
@@ -127,7 +129,7 @@ es-MX:
       email: E-mail
       email_status: E-mail Status
       enable: Habilitar
-      enable_sign_in_token_auth: Habilitar la autenticación por token de correo electrónico
+      enable_sign_in_token_auth: Habilitar autenticación por token de correo electrónico
       enabled: Habilitada
       enabled_msg: Se ha descongelado correctamente la cuenta de %{username}
       followers: Seguidores
@@ -250,7 +252,7 @@ es-MX:
         destroy_domain_allow: Eliminar Permiso de Dominio
         destroy_domain_block: Eliminar Bloqueo de Dominio
         destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
-        destroy_instance: Purgar Dominio
+        destroy_instance: Purgar dominio
         destroy_ip_block: Eliminar regla IP
         destroy_status: Eliminar Estado
         destroy_unavailable_domain: Eliminar Dominio No Disponible
@@ -263,7 +265,7 @@ es-MX:
         enable_user: Habilitar Usuario
         memorialize_account: Transformar en Cuenta Conmemorativa
         promote_user: Promover Usuario
-        reject_appeal: Rechazar Apelación
+        reject_appeal: Rechazar apelación
         reject_user: Rechazar Usuario
         remove_avatar_user: Eliminar Avatar
         reopen_report: Reabrir Reporte
@@ -273,7 +275,7 @@ es-MX:
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
-        unblock_email_account: Desbloquear dirección de correo
+        unblock_email_account: Desblqouear dirección de correo
         unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
@@ -389,8 +391,8 @@ es-MX:
       upload: Subir
     dashboard:
       active_users: usuarios activos
-      interactions: interacciones
-      media_storage: Almacenamiento multimedia
+      interactions: interaccciones
+      media_storage: Almacenamiento
       new_users: nuevos usuarios
       opened_reports: informes abiertos
       pending_appeals_html:
@@ -448,28 +450,13 @@ es-MX:
       reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar informes
       reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
-      rejecting_media: rechazar archivos multimedia
-      rejecting_reports: rechazando informes
-      severity:
-        silence: silenciado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Una cuenta en la base de datos afectada
-          other: "%{count} cuentas en la base de datos afectada"
-          zero: Ninguna cuenta en la base de datos está afectada
-        retroactive:
-          silence: Des-silenciar todas las cuentas existentes de este dominio
-          suspend: Des-suspender todas las cuentas existentes de este dominio
-        title: Deshacer bloque de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer
       view: Ver dominio bloqueado
     email_domain_blocks:
       add_new: Añadir nuevo
       attempts_over_week:
-        one: "%{count} intento durante la última semana"
-        other: "%{count} intentos de registro durante la última semana"
+        one: "%{count} intentos durante la última semana"
+        other: "%{count} intentos de registro en la última semana"
       created_msg: Dominio de correo añadido a la lista negra con éxito
       delete: Borrar
       dns:
@@ -493,23 +480,47 @@ es-MX:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      availability:
+        description_html:
+          one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+          other: Si el envío al dominio falla <strong>%{count} días diferentes</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+        failure_threshold_reached: Límite de fallo alcanzado el %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días diferentes.
+        no_failures_recorded: No hay fallos en el registro.
+        title: Disponibilidad
       back_to_all: Todos
       back_to_limited: Limitados
       back_to_warning: Advertencia
       by_domain: Dominio
       confirm_purge: "¿Seguro que quieres eliminar permanentemente los datos de este dominio?"
+      content_policies:
+        comment: Nota interna
+        description_html: Puedes definir políticas de contenido que se aplicarán a todas las cuentas de este dominio y a cualquiera de sus subdominios.
+        policies:
+          reject_media: Rechazar multimedia
+          reject_reports: Rechazar informes
+          silence: Limitar
+          suspend: Suspender
+        policy: Política
+        reason: Razón pública
+        title: Políticas de contenido
+      dashboard:
+        instance_accounts_dimension: Cuentas más seguidas
+        instance_accounts_measure: cuentas almacenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: sus seguidores aquí
+        instance_languages_dimension: Idiomas principales
+        instance_media_attachments_measure: archivos adjuntos guardados
+        instance_reports_measure: informes sobre ellos
+        instance_statuses_measure: publicaciones almacenadas
       delivery:
         all: Todos
         clear: Limpiar errores de entrega
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Fallo de entrega %{count} día
-          other: Fallo de entrega %{count} días
       delivery_available: Entrega disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible a lo largo de %{count} días, se marcará automáticamente como no entregable.
@@ -526,12 +537,14 @@ es-MX:
       private_comment: Comentario privado
       public_comment: Comentario público
       purge: Purgar
+      purge_description_html: Si crees que este dominio está desconectado, puedes borrar todos los registros de cuentas y los datos asociados de este dominio de tu almacenamiento. Esto puede llevar un tiempo.
       title: Instancias conocidas
       total_blocked_by_us: Bloqueado por nosotros
       total_followed_by_them: Seguidos por ellos
       total_followed_by_us: Seguido por nosotros
       total_reported: Informes sobre ellas
       total_storage: Archivos multimedia
+      totals_time_period_hint_html: Los totales mostrados a continuación incluyen datos para todo el tiempo.
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -586,6 +599,7 @@ es-MX:
       action_taken_by: Acción tomada por
       actions:
         delete_description_html: Los mensajes denunciados serán eliminados y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos multimedia en los mensajes informados se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar futuras acciones sobre la misma cuenta.
         other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada.
         resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe.
         silence_description_html: El perfil será visible solo para aquellos que ya lo sigan o lo busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
@@ -606,6 +620,7 @@ es-MX:
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelto
       no_one_assigned: Nadie
       notes:
@@ -627,7 +642,7 @@ es-MX:
       skip_to_actions: Ir directamente a las acciones
       status: Estado
       statuses: Contenido reportado
-      statuses_description_html: El contenido ofensivo se citará en la comunicación con la cuenta reportada
+      statuses_description_html: El contenido ofensivo se citará en comunicación con la cuenta reportada
       target_origin: Origen de la cuenta reportada
       title: Reportes
       unassign: Desasignar
@@ -735,10 +750,10 @@ es-MX:
       destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     statuses:
       back_to_account: Volver a la cuenta
-      back_to_report: Volver a la página del reporte
+      back_to_report: Volver a la página de reporte
       batch:
         remove_from_report: Eliminar del reporte
-        report: Reporte
+        report: Reportar
       deleted: Eliminado
       media:
         title: Multimedia
@@ -747,12 +762,13 @@ es-MX:
       with_media: Con multimedia
     strikes:
       actions:
-        delete_statuses: "%{name} eliminó las publicaciones de %{target}"
+        delete_statuses: "%{name} ha eliminado las publicaciones de %{target}'s"
         disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcó las publicaciones de %{target} como sensibles"
         none: "%{name} envió una advertencia a %{target}"
-        sensitive: "%{name} marcó la cuenta de %{target} como sensible"
-        silence: "%{name} limitó la cuenta de %{target}"
-        suspend: "%{name} suspendió la cuenta de %{target}"
+        sensitive: "%{name} ha marcado la cuenta de %{target}'s como sensible"
+        silence: "%{name} limito la cuenta de %{target}"
+        suspend: "%{name} suspendio la cuenta de %{target}"
       appeal_approved: Apelado
       appeal_pending: Apelación pendiente
     system_checks:
@@ -769,33 +785,37 @@ es-MX:
     title: Administración
     trends:
       allow: Permitir
-      approved: Aprobadas
-      disallow: No permitir
+      approved: Aprobado
+      disallow: Rechazar
       links:
         allow: Permitir enlace
-        allow_provider: Permitir medio
+        allow_provider: Permitir editor
+        description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
-        disallow_provider: Rechazar medio
+        disallow_provider: Rechazar editor
         shared_by_over_week:
           one: Compartido por una persona en la última semana
           other: Compartido por %{count} personas durante la última semana
           zero: Compartido por nadie en la última semana
         title: Enlaces en tendencia
-        usage_comparison: Compartido %{today} veces hoy, comparado con %{yesterday} ayer
+        usage_comparison: Compartido %{today} veces hoy, comparado a %{yesterday} ayer
       pending_review: Revisión pendiente
       preview_card_providers:
-        allowed: Los enlaces de este medio pueden ser tendencia
-        rejected: Los enlaces de este medio no pueden ser tendencia
-        title: Medios
-      rejected: Rechazadas
+        allowed: Los enlaces de este editor pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en su servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Su aprobación (o rechazo) se extiende a los subdominios.
+        rejected: Los enlaces del editor no pueden ser tendencia
+        title: Editores
+      rejected: Rechazado
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autor
-        disallow: No permitir publicación
+        description_html: Estos son publicaciones que su servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más gente a la que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
+        disallow: Rechazar publicación
         disallow_account: No permitir autor
+        not_discoverable: El autor no ha optado por ser detectable
         shared_by:
           one: Compartido o marcado como favorito una vez
-          other: Compatido o marcado como favorito %{friendly_count} veces
+          other: Compartido o marcado como favorito %{friendly_count} veces
         title: Publicaciones destacadas
       tags:
         current_score: Puntuación actual %{score}
@@ -804,7 +824,8 @@ es-MX:
           tag_languages_dimension: Idiomas principales
           tag_servers_dimension: Servidores principales
           tag_servers_measure: diferentes servidores
-          tag_uses_measure: usos totales
+          tag_uses_measure: usuarios totales
+        description_html: Estos son etiquetas que están apareciendo en muchos posts que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay hashtags que se muestren públicamente hasta que los apruebes.
         listable: Pueden ser recomendadas
         not_listable: No serán recomendadas
         not_trendable: No aparecerán en tendencias
@@ -831,6 +852,7 @@ es-MX:
       actions:
         delete_statuses: para eliminar sus mensajes
         disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
         none: una advertencia
         sensitive: para marcar su cuenta como sensible
         silence: para limitar su cuenta
@@ -933,8 +955,10 @@ es-MX:
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
+      functional: Tu cuenta está completamente operativa.
       pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     trouble_logging_in: "¿Problemas para iniciar sesión?"
     use_security_key: Usar la clave de seguridad
@@ -1010,6 +1034,7 @@ es-MX:
         submit: Enviar apelación
       associated_report: Informe asociado
       created_at: Con fecha
+      description_html: Estas son las acciones emprendidas contra tu cuenta y las advertencias que te han sido enviadas por el personal de %{instance}.
       recipient: Dirigida a
       status: 'Publicación #%{id}'
       status_removed: Publicación ya eliminada del sistema
@@ -1017,8 +1042,9 @@ es-MX:
       title_actions:
         delete_statuses: Eliminación de publicación
         disable: Congelación de la cuenta
+        mark_statuses_as_sensitive: Marcando los mensajes como sensibles
         none: Advertencia
-        sensitive: Marcado de cuenta como sensible
+        sensitive: Marcando la cuenta como sensible
         silence: Limitación de cuenta
         suspend: Suspensión de cuenta
       your_appeal_approved: Se aprobó tu apelación
@@ -1390,6 +1416,7 @@ es-MX:
     profile: Perfil
     relationships: Siguiendo y seguidores
     statuses_cleanup: Eliminación automática de publicaciones
+    strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
   statuses:
@@ -1469,6 +1496,7 @@ es-MX:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de tiempo
@@ -1616,26 +1644,28 @@ es-MX:
         spam: Spam
         violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        delete_statuses: Se ha visto que algunas de tus publicaciones violan una o más directrices de la comunidad y seguidamente han sido eliminadas por los moderadores de %{instance}. Futuras violaciones pueden resultar en acciones punitivas más severas contra tu cuenta.
+        delete_statuses: Se ha determinado que algunos de tus mensajes violan una o más directrices de la comunidad y han sido por tanto eliminados por los moderadores de %{instance}.
         disable: Ya no puedes usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Puedes solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes han sido marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
         sensitive: A partir de ahora todos los archivos multimedia que subas serán marcados como sensibles y ocultos tras una advertencia que habrá que clicar.
         silence: Aún puedes usar tu cuenta, pero solo las personas que te están siguiendo verán tus publicaciones en este servidor, y puedes ser excluido de varias funcionalidades de descubrimiento. Sin embargo, otras cuentas podrán empezar a seguirte manualmente.
         suspend: Ya no puedes utilizar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía puedes iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquives la suspensión.
-      get_in_touch: Si crees que esto es un error, puedes responder a este correo electrónico para ponerte en contacto con el personal de %{instance}.
       reason: 'Razón:'
-      statuses: 'Publicaciones que han sido halladas contrarias las directrices:'
+      statuses: 'Publicaciones citadas:'
       subject:
         delete_statuses: Tus publicaciones en %{acct} han sido eliminadas
         disable: Su cuenta %{acct} ha sido congelada
+        mark_statuses_as_sensitive: Tus publicaciones en %{acct} han sido marcadas como sensibles
         none: Advertencia para %{acct}
-        sensitive: Tus archivos multimedia en %{acct} se marcarán como sensibles a partir de ahora
+        sensitive: Tus publicaciones en %{acct} se marcarán como sensibles a partir de ahora
         silence: Su cuenta %{acct} ha sido limitada
         suspend: Su cuenta %{acct} ha sido suspendida
       title:
         delete_statuses: Publicaciones eliminadas
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Publicaciones marcadas como sensibles
         none: Advertencia
-        sensitive: Contenido multimedia oculto
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1202b2d9e..d9336cbdc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -16,6 +16,7 @@ es:
     contact: Contacto
     contact_missing: No especificado
     contact_unavailable: No disponible
+    continue_to_web: Continuar con la aplicación web
     discover_users: Descubrir usuarios
     documentation: Documentación
     federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
@@ -25,6 +26,8 @@ es:
       Esta cuenta es un actor virtual usado para representar al servidor y no a ningún usuario individual.
       Se usa para fines federativos y no debe ser bloqueado a menos que usted quiera bloquear toda la instancia, en cuyo caso se debe utilizar un bloque de dominio.
     learn_more: Aprende más
+    logged_in_as_html: Actualmente has iniciado sesión como %{username}.
+    logout_before_registering: Ya has iniciado sesión.
     privacy_policy: Política de privacidad
     rules: Normas del servidor
     rules_html: 'A continuación hay un resumen de las normas que debes seguir si quieres tener una cuenta en este servidor de Mastodon:'
@@ -69,7 +72,6 @@ es:
     media: Multimedia
     moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
     network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada aquí!"
     people_followed_by: Usuarios a quien %{name} sigue
     people_who_follow: Usuarios que siguen a %{name}
@@ -448,21 +450,6 @@ es:
       reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar informes
       reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
-      rejecting_media: rechazar archivos multimedia
-      rejecting_reports: rechazando informes
-      severity:
-        silence: silenciado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Una cuenta en la base de datos afectada
-          other: "%{count} cuentas en la base de datos afectada"
-          zero: Ninguna cuenta en la base de datos está afectada
-        retroactive:
-          silence: Des-silenciar todas las cuentas existentes de este dominio
-          suspend: Des-suspender todas las cuentas existentes de este dominio
-        title: Deshacer bloque de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer
       view: Ver dominio bloqueado
     email_domain_blocks:
@@ -493,23 +480,47 @@ es:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      availability:
+        description_html:
+          one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+          other: Si el envío al dominio falla <strong>%{count} días diferentes</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+        failure_threshold_reached: Límite de fallo alcanzado el %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días diferentes.
+        no_failures_recorded: No hay fallos en el registro.
+        title: Disponibilidad
       back_to_all: Todos
       back_to_limited: Limitados
       back_to_warning: Advertencia
       by_domain: Dominio
       confirm_purge: "¿Seguro que quieres eliminar permanentemente los datos de este dominio?"
+      content_policies:
+        comment: Nota interna
+        description_html: Puedes definir políticas de contenido que se aplicarán a todas las cuentas de este dominio y a cualquiera de sus subdominios.
+        policies:
+          reject_media: Rechazar multimedia
+          reject_reports: Rechazar informes
+          silence: Límite
+          suspend: Suspender
+        policy: Política
+        reason: Razón pública
+        title: Políticas de contenido
+      dashboard:
+        instance_accounts_dimension: Cuentas más seguidas
+        instance_accounts_measure: cuentas almacenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: sus seguidores aquí
+        instance_languages_dimension: Idiomas principales
+        instance_media_attachments_measure: archivos adjuntos guardados
+        instance_reports_measure: informes sobre ellos
+        instance_statuses_measure: mensajes almacenados
       delivery:
         all: Todos
         clear: Limpiar errores de entrega
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Fallo de entrega %{count} día
-          other: Fallo de entrega %{count} días
       delivery_available: Entrega disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible a lo largo de %{count} días, se marcará automáticamente como no entregable.
@@ -526,12 +537,14 @@ es:
       private_comment: Comentario privado
       public_comment: Comentario público
       purge: Purgar
+      purge_description_html: Si crees que este dominio está desconectado, puedes borrar todos los registros de cuentas y los datos asociados de este dominio de tu almacenamiento. Esto puede llevar un tiempo.
       title: Instancias conocidas
       total_blocked_by_us: Bloqueado por nosotros
       total_followed_by_them: Seguidos por ellos
       total_followed_by_us: Seguido por nosotros
       total_reported: Informes sobre ellas
       total_storage: Archivos multimedia
+      totals_time_period_hint_html: Los totales mostrados a continuación incluyen datos para todo el tiempo.
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -586,6 +599,7 @@ es:
       action_taken_by: Acción tomada por
       actions:
         delete_description_html: Los mensajes denunciados serán eliminados y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos multimedia en los mensajes informados se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar futuras acciones sobre la misma cuenta.
         other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada.
         resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe.
         silence_description_html: El perfil será visible solo para aquellos que ya lo sigan o lo busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
@@ -606,6 +620,7 @@ es:
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelto
       no_one_assigned: Nadie
       notes:
@@ -749,6 +764,7 @@ es:
       actions:
         delete_statuses: "%{name} eliminó las publicaciones de %{target}"
         disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcado las publicaciones de %{target} como sensibles"
         none: "%{name} envió una advertencia a %{target}"
         sensitive: "%{name} marcó la cuenta de %{target} como sensible"
         silence: "%{name} limitó la cuenta de %{target}"
@@ -774,6 +790,7 @@ es:
       links:
         allow: Permitir enlace
         allow_provider: Permitir medio
+        description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
         disallow: Rechazar enlace
         disallow_provider: Rechazar medio
         shared_by_over_week:
@@ -785,14 +802,17 @@ es:
       pending_review: Revisión pendiente
       preview_card_providers:
         allowed: Los enlaces de este medio pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en su servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Su aprobación (o rechazo) se extiende a los subdominios.
         rejected: Los enlaces de este medio no pueden ser tendencia
         title: Medios
       rejected: Rechazadas
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autor
+        description_html: Estos son publicaciones que su servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más gente a la que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
         disallow: No permitir publicación
         disallow_account: No permitir autor
+        not_discoverable: El autor no ha optado por ser detectable
         shared_by:
           one: Compartido o marcado como favorito una vez
           other: Compatido o marcado como favorito %{friendly_count} veces
@@ -805,6 +825,7 @@ es:
           tag_servers_dimension: Servidores principales
           tag_servers_measure: diferentes servidores
           tag_uses_measure: usos totales
+        description_html: Estos son etiquetas que están apareciendo en muchos posts que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay hashtags que se muestren públicamente hasta que los apruebes.
         listable: Pueden ser recomendadas
         not_listable: No serán recomendadas
         not_trendable: No aparecerán en tendencias
@@ -831,6 +852,7 @@ es:
       actions:
         delete_statuses: para eliminar sus mensajes
         disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
         none: una advertencia
         sensitive: para marcar su cuenta como sensible
         silence: para limitar su cuenta
@@ -933,8 +955,10 @@ es:
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
+      functional: Tu cuenta está completamente operativa.
       pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     trouble_logging_in: "¿Problemas para iniciar sesión?"
     use_security_key: Usar la clave de seguridad
@@ -1010,6 +1034,7 @@ es:
         submit: Enviar apelación
       associated_report: Informe asociado
       created_at: Con fecha
+      description_html: Estas son las acciones emprendidas contra tu cuenta y las advertencias que te han sido enviadas por el personal de %{instance}.
       recipient: Dirigida a
       status: 'Publicación #%{id}'
       status_removed: Publicación ya eliminada del sistema
@@ -1017,8 +1042,9 @@ es:
       title_actions:
         delete_statuses: Eliminación de publicación
         disable: Congelación de la cuenta
+        mark_statuses_as_sensitive: Marcando los mensajes como sensibles
         none: Advertencia
-        sensitive: Marcado de cuenta como sensible
+        sensitive: Marcando la cuenta como sensible
         silence: Limitación de cuenta
         suspend: Suspensión de cuenta
       your_appeal_approved: Se aprobó tu apelación
@@ -1390,6 +1416,7 @@ es:
     profile: Perfil
     relationships: Siguiendo y seguidores
     statuses_cleanup: Eliminación automática de publicaciones
+    strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
   statuses:
@@ -1469,6 +1496,7 @@ es:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de tiempo
@@ -1616,26 +1644,28 @@ es:
         spam: Spam
         violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        delete_statuses: Se ha visto que algunas de tus publicaciones violan una o más directrices de la comunidad y seguidamente han sido eliminadas por los moderadores de %{instance}. Futuras violaciones pueden resultar en acciones punitivas más severas contra tu cuenta.
+        delete_statuses: Se ha determinado que algunos de tus mensajes violan una o más directrices de la comunidad y han sido por tanto eliminados por los moderadores de %{instance}.
         disable: Ya no puedes usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Puedes solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes han sido marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
         sensitive: A partir de ahora todos los archivos multimedia que subas serán marcados como sensibles y ocultos tras una advertencia que habrá que clicar.
         silence: Aún puedes usar tu cuenta, pero solo las personas que te están siguiendo verán tus publicaciones en este servidor, y puedes ser excluido de varias funcionalidades de descubrimiento. Sin embargo, otras cuentas podrán empezar a seguirte manualmente.
         suspend: Ya no puedes utilizar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía puedes iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquives la suspensión.
-      get_in_touch: Si crees que esto es un error, puedes responder a este correo electrónico para ponerte en contacto con el personal de %{instance}.
       reason: 'Razón:'
-      statuses: 'Publicaciones que han sido halladas contrarias las directrices:'
+      statuses: 'Publicaciones citadas:'
       subject:
         delete_statuses: Tus publicaciones en %{acct} han sido eliminadas
         disable: Su cuenta %{acct} ha sido congelada
+        mark_statuses_as_sensitive: Tus publicaciones en %{acct} han sido marcadas como sensibles
         none: Advertencia para %{acct}
-        sensitive: Tus archivos multimedia en %{acct} se marcarán como sensibles a partir de ahora
+        sensitive: Tus publicaciones en %{acct} se marcarán como sensibles a partir de ahora
         silence: Su cuenta %{acct} ha sido limitada
         suspend: Su cuenta %{acct} ha sido suspendida
       title:
         delete_statuses: Publicaciones eliminadas
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Publicaciones marcadas como sensibles
         none: Advertencia
-        sensitive: Contenido multimedia oculto
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index fdf5081d5..cea2d99ba 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -61,7 +61,6 @@ et:
     media: Meedia
     moved_html: "%{name} kolis %{new_profile_link}:"
     network_hidden: Neid andmeid pole saadaval
-    never_active: Mitte kunagi
     nothing_here: Siin pole midagi!
     people_followed_by: Inimesed, keda %{name} jälgib
     people_who_follow: Inimesed, kes jälgivad kasutajat %{name}
@@ -311,17 +310,6 @@ et:
       reject_media_hint: Kustutab kohalikult salvestatud meediafailid ja keeldub tulevikus rohkem allalaadimast. Ei puuduta peatamisi
       reject_reports: Lükka teavitused tagasi
       reject_reports_hint: Eira kõik teavitused sellelt domeenilt. Ei puuduta peatamisi
-      rejecting_media: keelan meediafaile
-      rejecting_reports: keelan teavitusi
-      severity:
-        silence: vaigistatud
-        suspend: peatatud
-      show:
-        retroactive:
-          silence: Eemalda vaigistus mõjutatud kasutajatelt sellel domeenil
-          suspend: Lõpeta mõjutatud kasutajate peatamine sellel domeenil
-        title: Eemalda domeeniblokeering %{domain}
-        undo: Võta tagasi
       undo: Võta tagasi domeeniblokeering
       view: Vaata domeeniblokeeringut
     email_domain_blocks:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6b07e3a03..3b0517c96 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -67,7 +67,6 @@ eu:
     media: Multimedia
     moved_html: "%{name} hona migratu da %{new_profile_link}:"
     network_hidden: Informazio hau ez dago eskuragarri
-    never_active: Inoiz ez
     nothing_here: Ez dago ezer hemen!
     people_followed_by: "%{name}(e)k jarraitzen dituenak"
     people_who_follow: "%{name} jarraitzen dutenak"
@@ -428,21 +427,6 @@ eu:
       reject_media_hint: Lokalki gordetako multimedia fitxategiak ezabatzen ditu eta etorkizunean fitxategi berriak deskargatzeari uko egingo dio. Ez du garrantzirik kanporaketetan
       reject_reports: Errefusatu salaketak
       reject_reports_hint: Ezikusi domeinu honetatik jasotako salaketak. Kanporatzeentzako garrantzirik gabekoa
-      rejecting_media: errefusatu multimedia fitxategiak
-      rejecting_reports: txostenak errefusatzen
-      severity:
-        silence: isilarazia
-        suspend: kanporatua
-      show:
-        affected_accounts:
-          one: Datu-baseko kontu bati eragiten dio
-          other: Datu-baseko %{count} konturi eragiten die
-          zero: Ez die eragiten datu-baseko kontuei
-        retroactive:
-          silence: Kendu isilarazteko agindua domeinu honetako kontu guztiei
-          suspend: Kendu kanporatzeko agindua domeinu honetako kontu guztiei
-        title: Desegin %{domain} domeinuko blokeoa
-        undo: Desegin
       undo: Desegin domeinuaren blokeoa
       view: Ikusi domeinuaren blokeoa
     email_domain_blocks:
@@ -473,13 +457,7 @@ eu:
         clear: Garbitu banaketa erroreak
         restart: Berrabiarazi banaketa
         stop: Gelditu banaketa
-        title: Banaketa
         unavailable: Eskuraezina
-        unavailable_message: Banaketa ez dago eskuragarri
-        warning: Abisua
-        warning_message:
-          one: Banaketa hutsegitea egun %{count}
-          other: Banaketa hutsegitea %{count} egun
       delivery_available: Bidalketa eskuragarri dago
       delivery_error_days: Banaketa errore egunak
       delivery_error_hint: Banaketa ezin bada %{count} egunean egin, banaezin bezala markatuko da automatikoki.
@@ -1350,6 +1328,7 @@ eu:
       '2629746': Hilabete 1
       '31556952': Urte 1
       '5259492': 2 hilabete
+      '604800': 1 week
       '63113904': 2 urte
       '7889238': 3 hilabete
     min_age_label: Denbora muga
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 48b1f095b..2d7be0a0d 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -69,7 +69,6 @@ fa:
     media: عکس و ویدیو
     moved_html: "%{name} حساب خود را به %{new_profile_link} منتقل کرده است:"
     network_hidden: این اطلاعات در دسترس نیست
-    never_active: هرگز
     nothing_here: این‌جا چیزی نیست!
     people_followed_by: کسانی که %{name} پی می‌گیرد
     people_who_follow: کسانی که %{name} را پی می‌گیرند
@@ -422,17 +421,6 @@ fa:
       reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلّی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلق‌ها
       reject_reports: نپذیرفتن گزارش‌ها
       reject_reports_hint: گزارش‌هایی را که از این دامنه می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
-      rejecting_media: نپذیرفتن پرونده‌های رسانه‌ای
-      rejecting_reports: گزارش‌ها نادیده گرفته می‌شوند
-      severity:
-        silence: بی‌صداشده
-        suspend: معلق‌شده
-      show:
-        retroactive:
-          silence: بی‌صداشدن همهٔ حساب‌های این دامین را لغو کن
-          suspend: معلق‌شدن همهٔ حساب‌های این دامین را لغو کن
-        title: واگردانی مسدودسازی دامنه برای %{domain}
-        undo: واگردانی
       undo: واگردانی مسدودسازی دامین
       view: دیدن مسدودسازی دامنه
     email_domain_blocks:
@@ -463,13 +451,7 @@ fa:
         clear: پاک کردن خطاهای تحول محتوا
         restart: بازراه‌اندازی تحویل محتوا
         stop: متوقف‌کردن تحویل محتوا
-        title: تحویل محتوا
         unavailable: ناموجود
-        unavailable_message: تحویل محتوا در دسترس نیست
-        warning: هشدار
-        warning_message:
-          one: شکست تحویل %{count} روز
-          other: شکست تحویل محتوا %{count} روز
       delivery_available: پیام آماده است
       delivery_error_days: زورهای خطای تحویل محتوا
       delivery_error_hint: اگر تحویل محتوا به مدت %{count} روز ممکن نباشد، به طور خودکار به عنوان تحویل‌ناشونده علامت‌گذاری خواهد شد.
@@ -1315,6 +1297,7 @@ fa:
       '2629746': ۱ ماه
       '31556952': ۱ سال
       '5259492': ۲ ماه
+      '604800': 1 week
       '63113904': ۲ سال
       '7889238': ۳ ماه
     min_age_label: کرانهٔ سن
@@ -1459,7 +1442,6 @@ fa:
         delete_statuses: فرسته‌ها برداشته شدند
         disable: حساب متوقف شده است
         none: هشدار
-        sensitive: رسانهٔ نهفته
         silence: حساب محدود شده است
         suspend: حساب معلق شده است
     welcome:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 878a1fac0..28f63cd74 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -16,6 +16,7 @@ fi:
     contact: Ota yhteyttä
     contact_missing: Ei asetettu
     contact_unavailable: Ei saatavilla
+    continue_to_web: Jatka verkkosovellukseen
     discover_users: Löydä käyttäjiä
     documentation: Dokumentaatio
     federation_hint_html: Tilillä %{instance}:ssa voit seurata ihmisiä millä tahansa Mastodon-palvelimella ja sen ulkopuolella.
@@ -25,6 +26,8 @@ fi:
       Tämä on virtuaalitili, joka edustaa itse palvelinta eikä yksittäistä käyttäjää.
       Sitä käytetään yhdistämistarkoituksiin, eikä sitä saa estää, ellet halua estää koko palvelinta, jolloin sinun on käytettävä verkkotunnuksen estoa.
     learn_more: Lisätietoja
+    logged_in_as_html: Olet kirjautunut sisään nimellä %{username}.
+    logout_before_registering: Olet jo kirjautunut sisään.
     privacy_policy: Tietosuojakäytäntö
     rules: Palvelimen säännöt
     rules_html: 'Alla on yhteenveto säännöistä, joita sinun on noudatettava, jos haluat olla tili tällä Mastodonin palvelimella:'
@@ -69,7 +72,6 @@ fi:
     media: Media
     moved_html: "%{name} on muuttanut osoitteeseen %{new_profile_link}:"
     network_hidden: Nämä tiedot eivät ole käytettävissä
-    never_active: Ei koskaan
     nothing_here: Täällä ei ole mitään!
     people_followed_by: Henkilöt, joita %{name} seuraa
     people_who_follow: Käyttäjän %{name} seuraajat
@@ -448,21 +450,6 @@ fi:
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
       reject_reports: Hylkää raportit
       reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Erottamisen kannalta ei merkitystä
-      rejecting_media: mediatiedostojen hylkääminen
-      rejecting_reports: raporttien hylkääminen
-      severity:
-        silence: hiljennetty
-        suspend: jäähyllä
-      show:
-        affected_accounts:
-          one: Tämä vaikuttaa yhteen tiliin tietokannassa
-          other: Vaikuttaa %{count} tiliin tietokannassa
-          zero: Tämä ei vaikuta mihinkään tietokannan tiliin
-        retroactive:
-          silence: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien hiljennys
-          suspend: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien jäähy
-        title: Peru verkkotunnuksen %{domain} esto
-        undo: Peru
       undo: Peru
       view: Näytä verkkotunnuksen esto
     email_domain_blocks:
@@ -503,13 +490,7 @@ fi:
         clear: Tyhjennä toimitusvirheet
         restart: Käynnistä toimitus uudelleen
         stop: Lopeta toimitus
-        title: Toimitus
         unavailable: Ei saatavilla
-        unavailable_message: Toimitus ei käytettävissä
-        warning: Varoitus
-        warning_message:
-          one: Toimitusvirhe %{count} päivä
-          other: Toimitushäiriö %{count} päivää
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
       delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivän aikana, se merkitään automaattisesti toimittamattomaksi.
@@ -586,6 +567,7 @@ fi:
       action_taken_by: Toimenpiteen tekijä
       actions:
         delete_description_html: Ilmoitetut viestit poistetaan ja kirjataan varoitus, joka auttaa sinua saman tilin tulevista rikkomuksista.
+        mark_as_sensitive_description_html: Ilmoitettujen viestien media merkitään arkaluonteisiksi ja varoitus tallennetaan, jotta voit lisätä saman tilin tulevia rikkomuksia.
         other_description_html: Katso lisää vaihtoehtoja tilin käytöksen hallitsemiseksi ja ilmoitetun tilin viestinnän mukauttamiseksi.
         resolve_description_html: Ilmoitettua tiliä vastaan ei ryhdytä toimenpiteisiin, varoitusta ei kirjata ja raportti suljetaan.
         silence_description_html: Profiili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi kattavuutta. Se voidaan aina palauttaa.
@@ -606,6 +588,7 @@ fi:
       forwarded: Välitetty
       forwarded_to: Välitetty %{domain}
       mark_as_resolved: Merkitse ratkaistuksi
+      mark_as_sensitive: Merkitse arkaluonteiseksi
       mark_as_unresolved: Merkitse ratkaisemattomaksi
       no_one_assigned: Ei kukaan
       notes:
@@ -749,6 +732,7 @@ fi:
       actions:
         delete_statuses: "%{name} poisti käyttäjän %{target} viestit"
         disable: "%{name} jäädytti %{target} tilin"
+        mark_statuses_as_sensitive: "%{name} merkitsi %{target} viestiä arkaluonteiseksi"
         none: "%{name} lähetti varoituksen henkilölle %{target}"
         sensitive: "%{name} merkitsi käyttäjän %{target} tilin arkaluonteiseksi"
         silence: "%{name} rajoitti käyttäjän %{target} tilin"
@@ -774,6 +758,7 @@ fi:
       links:
         allow: Salli linkki
         allow_provider: Salli julkaisija
+        description_html: Nämä ovat linkkejä, joita jaetaan tällä hetkellä paljon tileillä, joilta palvelimesi näkee viestejä. Se voi auttaa käyttäjiäsi saamaan selville, mitä maailmassa tapahtuu. Linkkejä ei näytetä julkisesti, ennen kuin hyväksyt julkaisijan. Voit myös sallia tai hylätä yksittäiset linkit.
         disallow: Hylkää linkki
         disallow_provider: Estä julkaisija
         shared_by_over_week:
@@ -785,14 +770,17 @@ fi:
       pending_review: Odottaa tarkistusta
       preview_card_providers:
         allowed: Tämän julkaisijan linkit voivat trendata
+        description_html: Nämä ovat verkkotunnuksia, joiden linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäys) ulottuu aliverkkotunnuksiin.
         rejected: Tämän julkaisijan linkit eivät voi trendata
         title: Julkaisijat
       rejected: Hylätty
       statuses:
         allow: Salli viesti
         allow_account: Salli tekijä
+        description_html: Nämä ovat viestejä, jotka palvelimesi tietää tällä hetkellä jaetuksi ja suosituksi. Tämä voi auttaa uusia ja palaavia ihmisiä löytämään lisää ihmisiä, joita seurata seurata. Julkaisuja ei näytetä julkisesti ennen kuin hyväksyt tekijän ja kirjoittaja sallii tilinsä ehdottamisen muille. Voit myös sallia tai hylätä yksittäiset viestit.
         disallow: Estä viesti
         disallow_account: Estä tekijä
+        not_discoverable: Tekijä ei ole ilmoittanut olevansa löydettävissä
         shared_by:
           one: Jaettu tai suosikki kerran
           other: Jaettu ja lisätty suosikkeihin %{friendly_count} kertaa
@@ -805,6 +793,7 @@ fi:
           tag_servers_dimension: Suosituimmat palvelimet
           tag_servers_measure: eri palvelimet
           tag_uses_measure: käyttökerrat
+        description_html: Nämä ovat hashtageja, jotka näkyvät tällä hetkellä monissa viesteissä, jotka palvelimesi näkee. Tämä voi auttaa käyttäjiäsi selvittämään, mistä ihmiset puhuvat eniten tällä hetkellä. Mitään hashtageja ei näytetä julkisesti ennen kuin hyväksyt ne.
         listable: Voidaan ehdottaa
         not_listable: Ei tulla ehdottamaan
         not_trendable: Ei näy trendien alla
@@ -831,6 +820,7 @@ fi:
       actions:
         delete_statuses: poistaa heidän viestit
         disable: jäädyttää heidän tilinsä
+        mark_statuses_as_sensitive: merkitä heidän viestinsä arkaluonteisiksi
         none: varoitus
         sensitive: merkitä heidän tilinsä arkaluonteiseksi
         silence: rajoittaa heidän tilinsä
@@ -933,8 +923,10 @@ fi:
     status:
       account_status: Tilin tila
       confirming: Odotetaan sähköpostivahvistuksen valmistumista.
+      functional: Tilisi on täysin toimiva.
       pending: Hakemuksesi odottaa henkilökuntamme tarkastusta. Tämä voi kestää jonkin aikaa. Saat sähköpostiviestin, jos hakemuksesi on hyväksytty.
       redirecting_to: Tilisi ei ole aktiivinen, koska se ohjaa tällä hetkellä kohteeseen %{acct}.
+      view_strikes: Näytä tiliäsi koskevia aiempia varoituksia
     too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
     trouble_logging_in: Ongelmia kirjautumisessa?
     use_security_key: Käytä suojausavainta
@@ -1010,6 +1002,7 @@ fi:
         submit: Lähetä valitus
       associated_report: Liittyvä raportti
       created_at: Päivätty
+      description_html: Nämä ovat tiliäsi koskevia toimia ja varoituksia, jotka %{instance} henkilökunta on lähettänyt sinulle.
       recipient: Osoitettu
       status: 'Viesti #%{id}'
       status_removed: Viesti on jo poistettu järjestelmästä
@@ -1017,8 +1010,9 @@ fi:
       title_actions:
         delete_statuses: Viestin poisto
         disable: Tilin jäädyttäminen
+        mark_statuses_as_sensitive: Viestien merkitseminen arkaluonteisiksi
         none: Varoitus
-        sensitive: Merkintä tilille arkaluonteisena
+        sensitive: Tilin merkitseminen arkaluonteiseksi
         silence: Tilin rajoittaminen
         suspend: Tilin keskeyttäminen
       your_appeal_approved: Valituksesi on hyväksytty
@@ -1390,6 +1384,7 @@ fi:
     profile: Profiili
     relationships: Seuratut ja seuraajat
     statuses_cleanup: Automaattinen viestin poisto
+    strikes: Valvojan varoitukset
     two_factor_authentication: Kaksivaiheinen todentaminen
     webauthn_authentication: Suojausavaimet
   statuses:
@@ -1469,6 +1464,7 @@ fi:
       '2629746': 1 kuukausi
       '31556952': 1 vuosi
       '5259492': 2 kuukautta
+      '604800': 1 viikko
       '63113904': 2 vuotta
       '7889238': 3 kuukautta
     min_age_label: Ikäraja
@@ -1535,26 +1531,28 @@ fi:
         spam: Roskaposti
         violation: Sisältö rikkoo seuraavia yhteisön sääntöjä
       explanation:
-        delete_statuses: Joitakin viestejäsi on havaittu rikkovan yhtä tai useampaa yhteisön sääntöä ja %{instance} valvojat ovat poistaneet ne. Tulevat rikkomukset voivat johtaa ankarampiin rangaistuksiin tiliäsi vastaan.
+        delete_statuses: Joitakin viesteistäsi on havaittu rikkovan yhtä tai useampaa yhteisön sääntöä ja %{instance} valvojat ovat poistaneet ne.
         disable: Et voi enää käyttää tiliäsi, mutta profiilisi ja muut tiedot pysyvät muuttumattomina. Voit pyytää varmuuskopiota tiedoistasi, vaihtaa tilin asetuksia tai poistaa tilisi.
+        mark_statuses_as_sensitive: Valvojat %{instance} ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa viestiä ennen kuin esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi kun julkaiset tulevaisuudessa.
         sensitive: Tästä lähtien kaikki ladatut mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
         silence: Voit edelleen käyttää tiliäsi, mutta vain sinua jo seuraavat ihmiset näkevät viestisi tällä palvelimella ja sinut voidaan sulkea pois erilaisista hakuominaisuuksista. Toiset voivat kuitenkin edelleen seurata sinua manuaalisesti.
         suspend: Et voi enää käyttää tiliäsi ja profiilisi ja muut tiedot eivät ole enää käytettävissä. Voit silti kirjautua sisään pyytääksesi varmuuskopiota tiedoistasi, kunnes tiedot on poistettu kokonaan noin 30 päivän kuluttua. Säilytämme joitakin perustietoja, jotka estävät sinua kiertämästä keskeyttämistä.
-      get_in_touch: Jos uskot, että tämä on virhe, voit vastata tähän sähköpostiin ottaaksesi yhteyttä %{instance} henkilökuntaan.
       reason: 'Syy:'
-      statuses: 'Viestit, joiden on havaittu rikkovan sääntöjä:'
+      statuses: 'Viestejä lainattu:'
       subject:
         delete_statuses: Viestisi %{acct} on poistettu
         disable: Tilisi %{acct} on jäädytetty
+        mark_statuses_as_sensitive: Viestisi %{acct} on merkitty arkaluonteisiksi
         none: Varoitus %{acct}
-        sensitive: Sinun mediatiedostosi %{acct} merkitään tästä lähtien arkaluonteisiksi
+        sensitive: Sinun viestisi %{acct} merkitään arkaluonteisiksi tästä lähtien
         silence: Tilisi %{acct} on rajoitettu
         suspend: Tilisi %{acct} on keskeytetty
       title:
         delete_statuses: Viestit poistettu
         disable: Tili jäädytetty
+        mark_statuses_as_sensitive: Viestit on merkitty arkaluonteisiksi
         none: Varoitus
-        sensitive: Media piilotettu
+        sensitive: Tili on merkitty arkaluonteiseksi
         silence: Rajoitettu tili
         suspend: Tilin käyttäminen keskeytetty
     welcome:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 208c4c342..6e38130fe 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -16,6 +16,7 @@ fr:
     contact: Contact
     contact_missing: Non défini
     contact_unavailable: Non disponible
+    continue_to_web: Continuer vers l’application web
     discover_users: Découvrez des utilisateur·rice·s
     documentation: Documentation
     federation_hint_html: Avec un compte sur %{instance}, vous pourrez suivre des gens sur n’importe quel serveur Mastodon et au-delà.
@@ -25,6 +26,8 @@ fr:
       Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un·e utilisateur·rice individuel·le.
       Il est utilisé à des fins de fédération et ne doit pas être bloqué à moins que vous ne vouliez bloquer l’instance entière, auquel cas vous devriez utiliser un blocage de domaine.
     learn_more: En savoir plus
+    logged_in_as_html: Vous êtes actuellement connecté·e en tant que %{username}.
+    logout_before_registering: Vous êtes déjà connecté·e.
     privacy_policy: Politique de confidentialité
     rules: Règles du serveur
     rules_html: 'Voici un résumé des règles que vous devez suivre si vous voulez avoir un compte sur ce serveur de Mastodon :'
@@ -69,7 +72,6 @@ fr:
     media: Médias
     moved_html: "%{name} a changé de compte pour %{new_profile_link} :"
     network_hidden: Cette information n’est pas disponible
-    never_active: Jamais
     nothing_here: Rien à voir ici !
     people_followed_by: Personnes suivies par %{name}
     people_who_follow: Personnes qui suivent %{name}
@@ -351,7 +353,7 @@ fr:
       scheduled_for: Planifiée pour %{time}
       scheduled_msg: Annonce planifiée pour publication !
       title: Annonces
-      unpublish: Supprimer la publication
+      unpublish: Retirer l'annonce
       unpublished_msg: L’annonce a été dépubliée avec succès !
       updated_msg: L’annonce a été mise à jour avec succès !
     custom_emojis:
@@ -448,21 +450,6 @@ fr:
       reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions
       reject_reports: Rejeter les signalements
       reject_reports_hint: Ignorez tous les signalements provenant de ce domaine. Ne concerne pas les suspensions
-      rejecting_media: rejet des fichiers multimédia
-      rejecting_reports: rejet des signalements
-      severity:
-        silence: limité
-        suspend: suspendu
-      show:
-        affected_accounts:
-          one: Un compte affecté dans la base de données
-          other: "%{count} comptes affectés dans la base de données"
-          zero: Pas de compte affecté dans la base de données
-        retroactive:
-          silence: Ne plus limiter les comptes existants affectés de ce domaine
-          suspend: Annuler la suspension des comptes existants affectés pour ce domaine
-        title: Annuler le blocage du domaine %{domain}
-        undo: Annuler
       undo: Annuler le blocage de domaine
       view: Afficher les blocages de domaines
     email_domain_blocks:
@@ -493,23 +480,40 @@ fr:
       title: Recommandations d'abonnement
       unsuppress: Rétablir les recommandations d'abonnement
     instances:
+      availability:
+        no_failures_recorded: Pas d'échec enregistré.
+        title: Disponibilité
       back_to_all: Tout
       back_to_limited: Limité
       back_to_warning: Avertissement
       by_domain: Domaine
       confirm_purge: Êtes-vous sûr de vouloir supprimer définitivement les données de ce domaine ?
+      content_policies:
+        comment: Note interne
+        description_html: Vous pouvez définir des politiques de contenu qui seront appliquées à tous les comptes de ce domaine et à tous ses sous-domaines.
+        policies:
+          reject_media: Rejeter les médias
+          reject_reports: Rejeter les signalements
+          silence: Limiter
+          suspend: Suspendre
+        policy: Règlement
+        reason: Raison publique
+        title: Politiques de contenu
+      dashboard:
+        instance_accounts_dimension: Comptes les plus suivis
+        instance_accounts_measure: comptes stockés
+        instance_followers_measure: nos abonné⋅e⋅s là-bas
+        instance_follows_measure: leurs abonné⋅e⋅s ici
+        instance_languages_dimension: Langues les plus utilisées
+        instance_media_attachments_measure: fichiers médias stockés
+        instance_reports_measure: signalements mentionnant l'instance
+        instance_statuses_measure: messages stockés
       delivery:
         all: Tout
         clear: Effacer les erreurs de livraison
         restart: Redémarrer la livraison
         stop: Arrêter la livraison
-        title: Livraison
         unavailable: Indisponible
-        unavailable_message: Livraison indisponible
-        warning: Avertissement
-        warning_message:
-          one: Échec de livraison %{count} jour
-          other: Échec de livraison %{count} jours
       delivery_available: Livraison disponible
       delivery_error_days: Jours d'erreur de livraison
       delivery_error_hint: Si la livraison n'est pas possible pendant %{count} jours, elle sera automatiquement marquée comme non livrable.
@@ -526,12 +530,14 @@ fr:
       private_comment: Commentaire privé
       public_comment: Commentaire public
       purge: Purge
+      purge_description_html: Si vous pensez que ce domaine est définitivement hors service, vous pouvez supprimer de votre espace de stockage toutes les traces des comptes de ce domaine et les données associées. Cela peut prendre du temps.
       title: Fédération
       total_blocked_by_us: Bloqués par nous
       total_followed_by_them: Suivi par eux
       total_followed_by_us: Suivi par nous
       total_reported: Signalements à leur sujet
       total_storage: Attachements de média
+      totals_time_period_hint_html: Les totaux affichés ci-dessous incluent des données sans limite de temps.
     invites:
       deactivate_all: Tout désactiver
       filter:
@@ -586,6 +592,7 @@ fr:
       action_taken_by: Intervention de
       actions:
         delete_description_html: Les messages signalés seront supprimés et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
+        mark_as_sensitive_description_html: Les médias des messages signalés seront marqués comme sensibles et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
         other_description_html: Voir plus d'options pour contrôler le comportement du compte et personnaliser la communication vers le compte signalé.
         resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
         silence_description_html: Le profil ne sera visible que pour ceux qui le suivent déjà ou le consultent manuellement, ce qui limite considérablement sa portée. Peut toujours être restauré.
@@ -602,10 +609,11 @@ fr:
         none: Aucun
       comment_description_html: 'Pour fournir plus d''informations, %{name} a écrit :'
       created_at: Signalé
-      delete_and_resolve: Supprimer les publications
+      delete_and_resolve: Supprimer les messages
       forwarded: Transféré
       forwarded_to: Transféré à %{domain}
       mark_as_resolved: Marquer comme résolu
+      mark_as_sensitive: Marquer comme sensible
       mark_as_unresolved: Marquer comme non-résolu
       no_one_assigned: Personne
       notes:
@@ -742,13 +750,14 @@ fr:
       deleted: Supprimé
       media:
         title: Médias
-      no_status_selected: Aucun statut n’a été modifié car aucun n’a été sélectionné
+      no_status_selected: Aucun message n’a été modifié car aucun n’a été sélectionné
       title: Messages du compte
       with_media: Avec médias
     strikes:
       actions:
         delete_statuses: "%{name} a supprimé les messages de %{target}"
         disable: "%{name} a gelé le compte de %{target}"
+        mark_statuses_as_sensitive: "%{name} a marqué le message de %{target} comme sensible"
         none: "%{name} a envoyé un avertissement à %{target}"
         sensitive: "%{name} a marqué le compte de %{target} comme sensible"
         silence: "%{name} a limité le compte de %{target}"
@@ -774,6 +783,7 @@ fr:
       links:
         allow: Autoriser le lien
         allow_provider: Autoriser l'éditeur
+        description_html: Ces liens sont actuellement énormément partagés par des comptes dont votre serveur voit les messages. Cela peut aider vos utilisateur⋅rice⋅s à découvrir ce qu'il se passe dans le monde. Aucun lien n'est publiquement affiché tant que vous n'avez pas approuvé le compte qui le publie. Vous pouvez également autoriser ou rejeter les liens individuellement.
         disallow: Interdire le lien
         disallow_provider: Interdire l'éditeur
         shared_by_over_week:
@@ -785,14 +795,17 @@ fr:
       pending_review: En attente de révision
       preview_card_providers:
         allowed: Les liens de cet éditeur peuvent être tendance
+        description_html: Voici les domaines depuis lesquels des liens sont souvent partagés sur votre serveur. Les liens n'apparaîtront pas publiquement dans les tendances à moins que le domaine du lien ne soit approuvé. Votre approbation (ou votre rejet) s'étend aux sous-domaines.
         rejected: Les liens de cet éditeur ne seront pas considérés tendance
         title: Éditeurs
       rejected: Rejeté
       statuses:
         allow: Autoriser le message
         allow_account: Autoriser l'auteur·rice
+        description_html: Voici les messages dont votre serveur a connaissance qui sont beaucoup partagés et mis en favoris en ce moment. Cela peut aider vos utilisateur⋅rice⋅s, néophytes comme aguerri⋅e⋅s, à trouver plus de comptes à suivre. Aucun message n'est publiquement affiché tant que vous n'en avez pas approuvé l'auteur⋅rice, et seulement si icellui permet que son compte soit suggéré aux autres. Vous pouvez également autoriser ou rejeter les messages individuellement.
         disallow: Proscrire le message
         disallow_account: Proscrire l'auteur·rice
+        not_discoverable: L'auteur⋅rice n'a pas choisi de pouvoir être découvert⋅e
         shared_by:
           one: Partagé ou ajouté aux favoris une fois
           other: Partagé et ajouté aux favoris %{friendly_count} fois
@@ -805,6 +818,7 @@ fr:
           tag_servers_dimension: Meilleurs serveurs
           tag_servers_measure: différents serveurs
           tag_uses_measure: utilisations totales
+        description_html: Ces hashtags apparaissent actuellement dans de nombreux messages que votre serveur voit. Cela peut aider vos utilisateur⋅rice⋅s à découvrir les sujets dont les gens parlent le plus en ce moment. Aucun hashtag n'est publiquement affiché tant que vous ne l'avez pas approuvé.
         listable: Peut être suggéré
         not_listable: Ne sera pas suggéré
         not_trendable: N'apparaîtra pas sous les tendances
@@ -831,6 +845,7 @@ fr:
       actions:
         delete_statuses: effacer les messages
         disable: geler le compte
+        mark_statuses_as_sensitive: marquer les messages comme sensibles
         none: un avertissement
         sensitive: marquer le compte comme sensible
         silence: limiter le compte
@@ -933,15 +948,17 @@ fr:
     status:
       account_status: État du compte
       confirming: En attente de la confirmation par courriel à compléter.
+      functional: Votre compte est entièrement opérationnel.
       pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
+      view_strikes: Voir les sanctions précédemment appliquées à votre compte
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
     trouble_logging_in: Vous avez un problème pour vous connecter ?
     use_security_key: Utiliser la clé de sécurité
   authorize_follow:
     already_following: Vous suivez déjà ce compte
     already_requested: Vous avez déjà envoyé une demande d’abonnement à ce compte
-    error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
+    error: Malheureusement, une erreur s'est produite lors de la recherche du compte distant
     follow: Suivre
     follow_request: 'Vous avez demandé à suivre :'
     following: 'Youpi ! Vous suivez maintenant  :'
@@ -1001,6 +1018,7 @@ fr:
   disputes:
     strikes:
       action_taken: Mesure prise
+      appeal: Faire appel
       appeal_approved: Cette sanction a été annulée en appel et n'est plus valide
       appeal_rejected: L'appel a été rejeté
       appeal_submitted_at: Appel soumis le
@@ -1009,6 +1027,7 @@ fr:
         submit: Faire appel
       associated_report: Rapport associé
       created_at: En date du
+      description_html: Ce sont les mesures prises contre votre compte et les avertissements qui vous ont été envoyés par les responsables de %{instance}.
       recipient: Adressé à
       status: 'Message #%{id}'
       status_removed: Message déjà supprimé du système
@@ -1016,8 +1035,9 @@ fr:
       title_actions:
         delete_statuses: Suppression de message
         disable: Gel du compte
+        mark_statuses_as_sensitive: Marquage des messages comme sensibles
         none: Avertissement
-        sensitive: Marquage d'un compte comme sensible
+        sensitive: Marquage du compte comme sensible
         silence: Limitation du compte
         suspend: Suspension de compte
       your_appeal_approved: Votre appel a été approuvé
@@ -1097,7 +1117,7 @@ fr:
     today: aujourd’hui
     validation_errors:
       one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
-      other: Certaines choses ne vont pas ! Veuillez vérifiez les %{count} erreurs ci-dessous
+      other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
   html_validator:
     invalid_markup: 'contient un balisage HTML invalide: %{error}'
   imports:
@@ -1156,8 +1176,8 @@ fr:
     title: Historique d'authentification
   media_attachments:
     validations:
-      images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
-      not_ready: Impossible de joindre les fichiers en traitements. Réessayez dans un instant !
+      images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images
+      not_ready: Impossible de joindre les fichiers en cours de traitement. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
     acct: A déménagé vers
@@ -1238,7 +1258,7 @@ fr:
     status:
       subject: "%{name} vient de publier"
     update:
-      subject: "%{name} a modifié une publication"
+      subject: "%{name} a modifié un message"
   notifications:
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
@@ -1389,6 +1409,7 @@ fr:
     profile: Profil
     relationships: Abonnements et abonné·e·s
     statuses_cleanup: Suppression automatique de messages
+    strikes: Sanctions de modération
     two_factor_authentication: Identification à deux facteurs
     webauthn_authentication: Clés de sécurité
   statuses:
@@ -1411,13 +1432,13 @@ fr:
       other: 'contient les hashtags désactivés : %{tags}'
     edited_at: Édité le %{date}
     errors:
-      in_reply_not_found: Le statut auquel vous essayez de répondre ne semble pas exister.
+      in_reply_not_found: Le message auquel vous essayez de répondre ne semble pas exister.
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
     pin_errors:
       direct: Les messages qui ne sont visibles que pour les utilisateurs mentionnés ne peuvent pas être épinglés
       limit: Vous avez déjà épinglé le nombre maximum de messages
-      ownership: Vous ne pouvez pas épingler un statut ne vous appartenant pas
+      ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
     poll:
       total_people:
@@ -1438,9 +1459,9 @@ fr:
       private: Abonné⋅e⋅s uniquement
       private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos statuts
+      public_long: Tout le monde peut voir vos messages
       unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos statuts mais ils ne seront pas listés sur les fils publics
+      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
     enabled: Supprimer automatiquement vos anciens messages
     enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous
@@ -1468,6 +1489,7 @@ fr:
       '2629746': 1 mois
       '31556952': 1 an
       '5259492': 2 mois
+      '604800': 1 semaine
       '63113904': 2 ans
       '7889238': 3 mois
     min_age_label: Seuil d'ancienneté
@@ -1613,28 +1635,30 @@ fr:
       appeal_description: Si vous pensez qu'il s'agit d'une erreur, vous pouvez faire appel auprès de l'équipe de %{instance}.
       categories:
         spam: Indésirable
-        violation: Le contenu viole les directives de la communauté suivantes
+        violation: Le contenu enfreint les directives de la communauté suivantes
       explanation:
-        delete_statuses: Certains de vos messages ont été jugés en violation d'une ou plusieurs directives de la communauté et ont été supprimés par les modérateurs de %{instance}. De nouvelles violations peuvent entraîner des actions punitives plus sévères contre votre compte.
+        delete_statuses: Il a été constaté que certains de vos messages enfreignent une ou plusieurs directives de la communauté. Par conséquent, ils ont été supprimés par l'équipe de modération de %{instance}.
         disable: Vous ne pouvez plus utiliser votre compte, mais votre profil et d'autres données restent intacts. Vous pouvez demander une sauvegarde de vos données, modifier les paramètres de votre compte ou supprimer votre compte.
+        mark_statuses_as_sensitive: Certains de vos messages ont été marqués comme sensibles par l'équipe de modération de %{instance}. Cela signifie qu'il faudra cliquer sur le média pour pouvoir en afficher un aperçu. Vous pouvez marquer les médias comme sensibles vous-même lorsque vous posterez à l'avenir.
         sensitive: Désormais, tous vos fichiers multimédias téléchargés seront marqués comme sensibles et cachés derrière un avertissement à cliquer.
         silence: Vous pouvez toujours utiliser votre compte, mais seules les personnes qui vous suivent déjà verront vos messages sur ce serveur, et vous pourriez être exclu de diverses fonctions de découverte. Cependant, d'autres personnes peuvent toujours vous suivre manuellement.
         suspend: Vous ne pouvez plus utiliser votre compte, votre profil et vos autres données ne sont plus accessibles. Vous pouvez toujours vous connecter pour demander une sauvegarde de vos données jusqu'à leur suppression complète dans environ 30 jours, mais nous conserverons certaines données de base pour vous empêcher d'échapper à la suspension.
-      get_in_touch: Si vous pensez qu’il s'agit d’une erreur, vous pouvez répondre à ce courriel pour entrer en contact avec l’équipe de %{instance}.
       reason: 'Motif :'
-      statuses: 'Les messages qui ont été jugés en violation :'
+      statuses: 'Messages cités :'
       subject:
         delete_statuses: Vos messages sur %{acct} ont été supprimés
         disable: Votre compte %{acct} a été gelé
+        mark_statuses_as_sensitive: Vos messages sur %{acct} ont été marqués comme sensibles
         none: Avertissement pour %{acct}
-        sensitive: Vos fichiers multimédias sur %{acct} seront désormais marqués comme sensibles
+        sensitive: Vos messages sur %{acct} seront désormais marqués comme sensibles
         silence: Votre compte %{acct} a été limité
         suspend: Votre compte %{acct} a été suspendu
       title:
         delete_statuses: Messages supprimés
         disable: Compte gelé
+        mark_statuses_as_sensitive: Messages marqués comme sensibles
         none: Avertissement
-        sensitive: Média masqué
+        sensitive: Compte marqué comme sensible
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 92ed02398..f8a4527e2 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -16,6 +16,7 @@ gd:
     contact: Fios thugainn
     contact_missing: Cha deach a shuidheachadh
     contact_unavailable: Chan eil seo iomchaidh
+    continue_to_web: Lean air adhart dhan aplacaid-lìn
     discover_users: Lorg cleachdaichean
     documentation: Docamaideadh
     federation_hint_html: Le cunntas air %{instance}, ’s urrainn dhut leantainn air daoine air frithealaiche Mastodon sam bith is a bharrachd.
@@ -25,6 +26,8 @@ gd:
       ’S e actar biortail a tha sa chunntas seo a riochdaicheas am frithealaiche fhèin seach cleachdaiche sònraichte.
       Tha e ’ga chleachdadh a chùm co-nasgaidh agus cha bu chòir dhut a bhacadh ach ma tha thu airson an t-ionstans gu lèir a bhacadh agus b’ fheàirrde thu bacadh àrainne a chleachdadh an àite sin.
     learn_more: Barrachd fiosrachaidh
+    logged_in_as_html: Tha thu air do chlàradh a-steach an-dràsta mar %{username}.
+    logout_before_registering: Tha thu air clàradh a-steach mu thràth.
     privacy_policy: Poileasaidh prìobhaideachd
     rules: Riaghailtean an fhrithealaiche
     rules_html: 'Tha geàrr-chunntas air na riaghailtean a dh’fheumas tu gèilleadh riutha ma tha thu airson cunntas fhaighinn air an fhrithealaiche Mastodon seo gu h-ìosal:'
@@ -75,7 +78,6 @@ gd:
     media: Meadhanan
     moved_html: 'Chaidh %{name} imrich gu %{new_profile_link}:'
     network_hidden: Chan eil am fiosrachadh seo ri fhaighinn
-    never_active: Chan ann idir
     nothing_here: Chan eil dad an-seo!
     people_followed_by: Daoine air a leanas %{name}
     people_who_follow: Daoine a tha a’ leantainn air %{name}
@@ -406,6 +408,21 @@ gd:
         one: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
         other: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
         two: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> gearanan ri dhèiligeadh"
+        one: "<strong>%{count}</strong> ghearan ri dhèiligeadh"
+        other: "<strong>%{count}</strong> gearan ri dhèiligeadh"
+        two: "<strong>%{count}</strong> ghearan ri dhèiligeadh"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> tagaichean hais ri dhèiligeadh"
+        one: "<strong>%{count}</strong> taga hais ri dhèiligeadh"
+        other: "<strong>%{count}</strong> taga hais ri dhèiligeadh"
+        two: "<strong>%{count}</strong> thaga hais ri dhèiligeadh"
+      pending_users_html:
+        few: "<strong>%{count}</strong> cleachdaichean ri dhèiligeadh"
+        one: "<strong>%{count}</strong> chleachdaiche ri dhèiligeadh"
+        other: "<strong>%{count}</strong> cleachdaiche ri dhèiligeadh"
+        two: "<strong>%{count}</strong> chleachdaiche ri dhèiligeadh"
       resolved_reports: gearanan air am fuasgladh
       software: Bathar-bog
       sources: Tùsan clàraidh
@@ -449,27 +466,27 @@ gd:
       reject_media_hint: Bheir seo air falbh na faidhlichean meadhain a chaidh a stòradh agus diùltaidh e luchdadh a-nuas sam bith dhiubh san àm ri teachd. Chan eil buaidh aig seo fo chur à rèim
       reject_reports: Diùlt gearanan
       reject_reports_hint: Leig seachad gearan sam bith a thig a-steach on àrainn seo. Chan eil buaidh aig seo fo chur à rèim
-      rejecting_media: a’ diùltadh faidhlichean meadhain
-      rejecting_reports: a’ diùltadh gearanan
-      severity:
-        silence: cuingichte
-        suspend: à rèim
-      show:
-        retroactive:
-          silence: Dì-chuingich na cunntasan a tha ann on àrainn seo ’s air a bheil buaidh
-          suspend: Cuir na cunntasan a tha ann on àrainn seo ’s air a bheil buaidh ann an rèim a-rithist
-        title: Neo-dhèan bacadh na h-àrainne %{domain}
-        undo: Neo-dhèan
       undo: Neo-dhèan bacadh na h-àrainne
       view: Seall bacadh na h-àrainne
     email_domain_blocks:
       add_new: Cuir tè ùr ris
+      attempts_over_week:
+        few: "%{count} oidhirpean clàraidh rè na seachdain seo chaidh"
+        one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
+        other: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
+        two: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
       created_msg: Chaidh àrainn a’ phuist-d a bhacadh
       delete: Sguab às
+      dns:
+        types:
+          mx: Clàr MX
       domain: Àrainn
       new:
         create: Cuir àrainn ris
+        resolve: Fuasgail an àrainn
         title: Bac àrainn puist-d ùr
+      no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+      resolved_through_html: Chaidh fuasgladh slighe %{domain}
       title: Àrainnean puist-d ’gam bacadh
     follow_recommendations:
       description_html: "<strong>Cuidichidh molaidhean leantainn an luchd-cleachdaidh ùr ach an lorg iad susbaint inntinneach gu luath</strong>. Mur an do ghabh cleachdaiche conaltradh gu leòr le càch airson molaidhean leantainn gnàthaichte fhaighinn, mholamaid na cunntasan seo ’nan àite. Thèid an àireamhachadh às ùr gach latha stèidhichte air na cunntasan air an robh an conaltradh as trice ’s an luchd-leantainn ionadail as motha sa chànan."
@@ -490,20 +507,16 @@ gd:
         clear: Falamhaich na mearachdan lìbhrigidh
         restart: Ath-thòisich air an lìbhrigeadh
         stop: Cuir stad air an lìbhrigeadh
-        title: Lìbhrigeadh
         unavailable: Chan eil e ri làimh
-        unavailable_message: Chan eil lìbhrigeadh ri fhaighinn
-        warning: Rabhadh
-        warning_message:
-          few: Dh’fhàillig leis an lìbhrigeadh fad %{count} làithean
-          one: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
-          other: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
-          two: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
       delivery_available: Tha lìbhrigeadh ri fhaighinn
       delivery_error_days: Làithean le mearachd lìbhrigidh
       delivery_error_hint: Mura gabh a lìbhrigeadh fad %{count} là(ithean), thèid comharra a chur ris gu fèin-obrachail a dh’innseas nach gabh a lìbhrigeadh.
       destroyed_msg: Tha an dàta o %{domain} air ciutha an sguabaidh às aithghearr.
       empty: Cha deach àrainn a lorg.
+      known_accounts:
+        one: "%{count} chunntas as aithne dhuinn"
+        other: "%{count} cunntas(an) as aithne dhuinn"
+        zero: Gun chunntas as aithne dhuinn
       moderation:
         all: Na h-uile
         limited: Cuingichte
@@ -586,9 +599,11 @@ gd:
         none: Chan eil gin
       comment_description_html: 'Airson barrachd fiosrachaidh a sholar, sgrìobh %{name}:'
       created_at: Chaidh an gearan a dhèanamh
+      delete_and_resolve: Sguab às na postaichean
       forwarded: Chaidh a shìneadh air adhart
       forwarded_to: Chaidh a shìneadh air adhart gu %{domain}
       mark_as_resolved: Cuir comharra gun deach fhuasgladh
+      mark_as_sensitive: Cuir comharra gu bheil e frionasach
       mark_as_unresolved: Cuir comharra nach deach fhuasgladh
       no_one_assigned: Gun iomruineadh
       notes:
@@ -599,12 +614,15 @@ gd:
         placeholder: Mìnich dè na ghnìomhan a chaidh a ghabhail no naidheachd sam bith eile mu dhèidhinn…
         title: Nòtaichean
       notes_description_html: Seall is sgrìobh nòtaichean do mhaoir eile is dhut fhèin san àm ri teachd
+      quick_actions_description_html: 'Gabh gnìomh luath no sgrolaich sìos a dh’fhaicinn susbaint a’ ghearain:'
+      remote_user_placeholder: cleachdaiche cèin o %{instance}
       reopen: Fosgail an gearan a-rithist
       report: 'Gearan air #%{id}'
       reported_account: Cunntas mun a chaidh a ghearan
       reported_by: Chaidh gearan a dhèanamh le
       resolved: Air fhuasgladh
       resolved_msg: Chaidh an gearan fhuasgladh!
+      skip_to_actions: Geàrr leum dha na gnìomhan
       status: Staid
       statuses: Susbaint le gearan
       statuses_description_html: Thèid iomradh a thoirt air an t-susbaint oilbheumach sa chonaltradh leis a’ chunntas mun a chaidh an gearan a thogail
@@ -726,6 +744,14 @@ gd:
       title: Postaichean a’ chunntais
       with_media: Le meadhanan riutha
     strikes:
+      actions:
+        delete_statuses: Sguab %{name} às na postaichean aig %{target}
+        disable: Reòth %{name} an cunntas aig %{target}
+        mark_statuses_as_sensitive: Chuir %{name} comharra gu bheil na postaichean aig %{target} frionasach
+        none: Chuir %{name} rabhadh gu %{target}
+        sensitive: Chuir %{name} comharra gu bheil an cunntas aig %{target} frionasach
+        silence: Chuingich %{name} an cunntas aig %{target}
+        suspend: Chuir %{name} an cunntas aig %{target} à rèim
       appeal_approved: Air ath-thagradh
       appeal_pending: "’Ga ath-thagradh"
     system_checks:
@@ -749,6 +775,10 @@ gd:
         allow_provider: Ceadaich am foillsichear
         disallow: Na ceadaich an ceangal
         disallow_provider: Na ceadaich am foillsichear
+        shared_by_over_week:
+          one: Chaidh a cho-roinneadh le aonar rè na seachdain seo chaidh
+          other: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
+          zero: Cha deach a cho-roinneadh rè na seachdain seo chaidh
         title: Ceanglaichean a’ treandadh
         usage_comparison: Chaidh a cho-roinneadh %{today} tura(i)s an-diugh an coimeas ri %{yesterday} an-dè
       pending_review: A’ feitheamh air lèirmheas
@@ -757,6 +787,18 @@ gd:
         rejected: Cha treandaich ceanglaichean on fhoillsichear seo
         title: Foillsichearan
       rejected: Air a dhiùltadh
+      statuses:
+        allow: Ceadaich am post
+        allow_account: Ceadaich an t-ùghdar
+        disallow: Na ceadaich am post
+        disallow_account: Na ceadaich an t-ùghdar
+        not_discoverable: Cha do chuir an t-ùghdar roimhe gun gabh a lorg
+        shared_by:
+          few: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} tursan
+          one: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
+          other: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
+          two: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} thuras
+        title: Postaichean a’ treandadh
       tags:
         current_score: Sgòr làithreach de %{score}
         dashboard:
@@ -775,6 +817,10 @@ gd:
         trending_rank: 'A’ treandadh #%{rank}'
         usable: Gabhaidh a chleachdadh
         usage_comparison: Chaidh a chleachdadh %{today} tura(i)s an-diugh an coimeas ri %{yesterday} an-dè
+        used_by_over_week:
+          one: Chaidh a chleachdadh le aonar rè na seachdain seo chaidh
+          other: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+          zero: Cha deach a chleachdadh rè na seachdain seo chaidh
       title: Treandaichean
     warning_presets:
       add_new: Cuir fear ùr ris
@@ -784,6 +830,14 @@ gd:
       title: Stiùirich na rabhaidhean ro-shuidhichte
   admin_mailer:
     new_appeal:
+      actions:
+        delete_statuses: sguabadh às nam postaichean aca
+        disable: reòthadh a’ chunntais aca
+        mark_statuses_as_sensitive: comharra gu bheil na postaichean aca frionasach
+        none: rabhadh
+        sensitive: comharra gu bheil an cunntas aca frionasach
+        silence: cuingeachadh a’ chunntais aca
+        suspend: cur à rèim a’ chunntais aca
       body: 'Tha %{target} ag ath-thagradh co-dhùnadh na maorsainneachd a thug %{action_taken_by} %{date} agus ’s e %{type} a bh’ ann. Sgrìobh iad:'
       next_steps: "’S urrainn dhut aontachadh ris an ath-thagradh air co-dhùnadh na maorsainneachd no a leigeil seachad."
       subject: Tha %{username} ag ath-thagradh co-dhùnadh na maorsainneachd air %{instance}
@@ -794,6 +848,18 @@ gd:
       body: Rinn %{reporter} gearan air %{target}
       body_remote: Rinn cuideigin o %{domain} gearan air %{target}
       subject: Tha gearan ùr aig %{instance} (#%{id})
+    new_trends:
+      body: 'Tha na nithean seo feumach air lèirmheas mus nochd iad gu poblach:'
+      new_trending_links:
+        no_approved_links: Chan eil ceangal a’ treandadh le aontachadh ann.
+        title: Ceanglaichean a’ treandadh
+      new_trending_statuses:
+        no_approved_statuses: Chan eil post a’ treandadh le aontachadh ann.
+        title: Postaichean a’ treandadh
+      new_trending_tags:
+        no_approved_tags: Chan eil taga hais a’ treandadh le aontachadh ann.
+        title: Tagaichean hais a’ treandadh
+      subject: Tha treandaichean ùra a’ feitheamh air lèirmheas air %{instance}
   aliases:
     add_new: Cruthaich alias
     created_msg: Chaidh an t-alias ùr a chruthachadh. ’S urrainn dhut tòiseachadh air imrich on seann-chunntas a-nis.
@@ -867,8 +933,10 @@ gd:
     status:
       account_status: Staid a’ chunntais
       confirming: A’ feitheamh air coileanadh an dearbhaidh on phost-d.
+      functional: Tha an cunntas agad ag obair gu slàn.
       pending: Feumaidh an sgioba againn lèirmheas a dhèanamh air d’ iarrtas. Dh’fhaoidte gun doir seo greis. Gheibh thu post-d nuair a bhios sinn air aontachadh ri d’ iarrtas.
       redirecting_to: Chan eil an cunntas gad gnìomhach on a tha e ’ga ath-stiùireadh gu %{acct}.
+      view_strikes: Seall na rabhaidhean a fhuair an cunntas agad roimhe
     too_fast: Chaidh am foirm a chur a-null ro luath, feuch ris a-rithist.
     trouble_logging_in: A bheil duilgheadas agad leis a’ chlàradh a-steach?
     use_security_key: Cleachd iuchair tèarainteachd
@@ -934,6 +1002,7 @@ gd:
     explore_mastodon: Rùraich %{title}
   disputes:
     strikes:
+      action_taken: An gnìomh a ghabhadh
       appeal: Ath-thagair
       appeal_approved: Chaidh le ath-thagradh an rabhaidh is chan eil e dligheach tuilleadh
       appeal_rejected: Chaidh an t-ath-thagradh a dhiùltadh
@@ -941,6 +1010,8 @@ gd:
       appealed_msg: Chaidh an t-ath-thagradh agad a chur a-null. Ma thèid aontachadh ris, gheibh thu brath mu dhèidhinn.
       appeals:
         submit: Cuir a-null an t-ath-thagradh
+      associated_report: An gearan co-cheangailte
+      created_at: Ceann-là
       your_appeal_approved: Chaidh aontachadh ris an ath-thagradh agad
       your_appeal_pending: Chuir thu ath-thagradh a-null
       your_appeal_rejected: Chaidh an t-ath-thagradh agad a dhiùltadh
@@ -1400,6 +1471,7 @@ gd:
       '2629746': Mìos
       '31556952': Bliadhna
       '5259492': 2 mhìos
+      '604800': 1 week
       '63113904': 2 bhliadhna
       '7889238': 3 mìosan
     min_age_label: Stairsneach aoise
@@ -1458,26 +1530,21 @@ gd:
         spam: Spama
         violation: Tha an t-susbaint a’ briseadh na riaghailtean giùlain a leanas
       explanation:
-        delete_statuses: Thathar dhen bheachd gu bheil cuid dhe na postaichean agad a’ briseadh riaghailt no riaghailtean giùlain agus chaidh an toirt air falbh le maoir %{instance} an uairsin. Ma bhriseas tu na riaghailtean a-rithist, dh’fhaoidte gum fulaing an cunntas agad peanas nas teinne.
         disable: Chan urrainn dhut an cunntas agad a chleachdadh tuilleadh ach mairidh a’ phròifil ’s an dàta eile agad. Faodaidh tu lethbhreac-glèidhidh dhen dàta agad iarraidh, roghainnean a’ chunntais atharrachadh no an cunntas agad a sguabadh às.
         sensitive: O seo a-mach, thèid comharra na frionasachd a chur ri faidhle meadhain sam bith a luchdaicheas tu suas agus thèid am falach air cùlaibh rabhaidh a ghabhas briogadh air.
         silence: "’S urrainn dhut an cunntas agad a chleachdadh fhathast ach chan fhaic ach na daoine a tha a’ leantainn ort mu thràth na postaichean agad air an fhrithealaiche seo agus dh’fhaoidte gun dèid d’ às-dhùnadh o iomadh gleus luirg. Gidheadh, faodaidh càch leantainn ort a làimh fhathast."
         suspend: Chan urrainn dhut an cunntas agad a chleachdadh tuilleadh agus chan fhaigh thu grèim air a’ phròifil no air an dàta eile agad. ’S urrainn dhut clàradh a-steach fhathast airson lethbhreac-glèidhidh dhen dàta agad iarraidh mur dèid an dàta a thoirt air falbh an ceann 30 latha gu slàn ach cumaidh sinn cuid dhen dàta bhunasach ach nach seachain thu an cur à rèim.
-      get_in_touch: Ma tha thu dhen bheachd gur e mearachd a th’ ann, ’s urrainn dhut freagairt dhan phost-d seo no conaltradh ris an sgioba aig %{instance}.
       reason: 'Adhbhar:'
-      statuses: 'Na postaichean a bhris riaghailt:'
       subject:
         delete_statuses: Chaidh na postaichean agad air %{acct} a thoirt air falbh
         disable: Chaidh an cunntas %{acct} agad a reòthadh
         none: Rabhadh dha %{acct}
-        sensitive: Thèid comharra na frionasachd a chur ris na faidhlichean meadhain agad air %{acct} o seo a-mach
         silence: Chaidh an cunntas %{acct} agad a chuingeachadh
         suspend: Chaidh an cunntas %{acct} agad a chur à rèim
       title:
         delete_statuses: Chaidh postaichean a thoirt air falbh
         disable: Cunntas reòite
         none: Rabhadh
-        sensitive: Chaidh meadhanan fhalach
         silence: Cunntas cuingichte
         suspend: Cunntas à rèim
     welcome:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 84acfefe6..59c2c1522 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -16,6 +16,7 @@ gl:
     contact: Contacto
     contact_missing: Non establecido
     contact_unavailable: Non dispoñíbel
+    continue_to_web: Continuar na app web
     discover_users: Descubrir usuarias
     documentation: Documentación
     federation_hint_html: Cunha conta en %{instance} poderás seguir ás persoas en calquera servidor do Mastodon e alén.
@@ -25,6 +26,8 @@ gl:
 
       '
     learn_more: Saber máis
+    logged_in_as_html: Entraches como %{username}.
+    logout_before_registering: Xa iniciaches sesión.
     privacy_policy: Política de privacidade
     rules: Regras do servidor
     rules_html: 'Aquí tes un resumo das regras que debes seguir se queres ter unha conta neste servidor de Mastodon:'
@@ -69,7 +72,6 @@ gl:
     media: Multimedia
     moved_html: "%{name} mudouse a %{new_profile_link}:"
     network_hidden: Esta información non está dispoñíbel
-    never_active: Nunca
     nothing_here: Non hai nada aquí!
     people_followed_by: Persoas que segue %{name}
     people_who_follow: Persoas que seguen a %{name}
@@ -448,21 +450,6 @@ gl:
       reject_media_hint: Eliminar ficheiros multimedia almacenados de xeito local e rexeita descargalos no futuro. Irrelevante para as suspensións
       reject_reports: Rexeitar denuncias
       reject_reports_hint: Ignorar todas as denuncias procedentes deste dominio. Irrelevante para as suspensións
-      rejecting_media: rexeitando ficheiros multimedia
-      rejecting_reports: rexeitando denuncias
-      severity:
-        silence: limitado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Ten efecto sobre unha conta na base de datos
-          other: Ten efecto sobre %{count} contas na base de datos
-          zero: Non afecta a ningunha conta na base de datos
-        retroactive:
-          silence: Deixar de silenciar todas as contas existentes deste dominio
-          suspend: Desbotar suspenso de todas as contas existentes deste dominio
-        title: Desfacer o bloqueo de dominio para %{domain}
-        undo: Desfacer
       undo: Desfacer bloqueo de dominio
       view: Ollar dominios bloqueados
     email_domain_blocks:
@@ -493,23 +480,47 @@ gl:
       title: Recomendacións de seguimento
       unsuppress: Restablecer recomendación de seguimento
     instances:
+      availability:
+        description_html:
+          one: Se fallan as entregas ao dominio por <strong>%{count} día</strong>, non se farán máis intentos a menos que se reciba unha solicitude <em>desde</em> ese dominio.
+          other: Se fallan as entregas ao dominio por <strong>%{count} días diferentes</strong>, non se farán máis intentos a menos que se reciba unha solicitude <em>desde</em> ese dominio.
+        failure_threshold_reached: Acadouse o límite de fallos o %{date}.
+        failures_recorded:
+          one: Intento fallido por %{count} día.
+          other: Intentos fallidos durante %{count} días distintos.
+        no_failures_recorded: Non hai fallos rexistrados.
+        title: Dispoñibilidade
       back_to_all: Todo
       back_to_limited: Limitado
       back_to_warning: Aviso
       by_domain: Dominio
       confirm_purge: Tes a certeza de querer eliminar permanentemente os datos deste dominio?
+      content_policies:
+        comment: Nota interna
+        description_html: Podes definir políticas acerca do contido que serán aplicadas a tódalas contas deste dominio e tódolos seus subdominios.
+        policies:
+          reject_media: Rexeitar multimedia
+          reject_reports: Rexeitar denuncias
+          silence: Límitar
+          suspend: Suspender
+        policy: Criterios
+        reason: Razón pública
+        title: Políticas sobre o contido
+      dashboard:
+        instance_accounts_dimension: Contas máis seguidas
+        instance_accounts_measure: contas gardadas
+        instance_followers_measure: as nosas seguidoras alí
+        instance_follows_measure: as súas seguidoras aquí
+        instance_languages_dimension: Top de idiomas
+        instance_media_attachments_measure: anexos multimedia gardados
+        instance_reports_measure: denuncias acerca deles
+        instance_statuses_measure: publicacións gardadas
       delivery:
         all: Todo
         clear: Eliminar erros na entrega
         restart: Restablecer a entrega
         stop: Deter a entrega
-        title: Entrega
         unavailable: Non dispoñible
-        unavailable_message: Entrega non dispoñible
-        warning: Aviso
-        warning_message:
-          one: Fallou a entrega %{count} día
-          other: Fallou a entrega %{count} días
       delivery_available: Entrega dispoñíbel
       delivery_error_days: Días de fallo na entrega
       delivery_error_hint: Se non é posible a entrega durante %{count} días, será automáticamente marcado como non entregable.
@@ -526,12 +537,14 @@ gl:
       private_comment: Comentario privado
       public_comment: Comentario público
       purge: Purgar
+      purge_description_html: Se cres que este dominio está desconectado por unha boa razón, podes borrar tódolos rexistros e datos asociados a este dominio na túa almacenaxe. Vainos levar un anaco.
       title: Federación
       total_blocked_by_us: Bloqueado por nós
       total_followed_by_them: Seguidos por eles
       total_followed_by_us: Seguidos por nós
       total_reported: Denuncias sobre eles
       total_storage: Adxuntos multimedia
+      totals_time_period_hint_html: Os totais aquí mostrados inclúen todo o historial de datos.
     invites:
       deactivate_all: Desactivar todo
       filter:
@@ -586,6 +599,7 @@ gl:
       action_taken_by: Acción tomada por
       actions:
         delete_description_html: As publicacións denunciadas van ser eliminadas e gárdase un aviso para axudarche a xestionar futuras infraccións desta conta.
+        mark_as_sensitive_description_html: O multimedia das publicacións denunciadas vai ser marcado como sensible e apúntase un aviso para axudarche a facer seguimento das infraccións da mesma conta.
         other_description_html: Mira máis opcións para controlar o comportamento da conta e personalizar as comunicacións coa conta denunciada.
         resolve_description_html: Non se van tomar accións contra a conta denunciada, nin se gardan avisos, e a denuncia arquivada.
         silence_description_html: O perfil será visible só para quen xa o está a seguir ou quen o buscou manualmente, limitando moito o seu alcance. Pódese cambiar.
@@ -606,6 +620,7 @@ gl:
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como non resolto
       no_one_assigned: Ninguén
       notes:
@@ -749,6 +764,7 @@ gl:
       actions:
         delete_statuses: "%{name} eliminou as publicacións de %{target}"
         disable: "%{name} pausou a conta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcou as publicacións de %{target} como sensibles"
         none: "%{name} envioulle un aviso a %{target}"
         sensitive: "%{name} marcou a conta de %{target} como sensible"
         silence: "%{name} limitou a conta de %{target}"
@@ -774,6 +790,7 @@ gl:
       links:
         allow: Permitir ligazón
         allow_provider: Permitir orixe
+        description_html: Estas son ligazóns que actualmente están sendo compartidas por moitas contas das que o teu servidor recibe publicación. Pode ser de utilidade para as túas usuarias para saber o que acontece polo mundo. Non se mostran ligazóns de xeito público a non ser que autorices a quen as publica. Tamén podes permitir ou rexeitar ligazóns de xeito individual.
         disallow: Denegar ligazón
         disallow_provider: Denegar orixe
         shared_by_over_week:
@@ -785,14 +802,17 @@ gl:
       pending_review: Revisión pendente
       preview_card_providers:
         allowed: As ligazóns desta orixe poden estar en voga
+        description_html: Estes son dominios de onde proceden as ligazóns compartidas con frecuencia no teu servidor. As ligazóns non se mostran públicamente a non ser que o dominio da ligazón sexa aprobado. A aprobación (ou rexeitamento) exténdese aos subdominios.
         rejected: As ligazóns desta orixe non poden estar en voga
         title: Orixes
       rejected: Rexeitado
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autora
+        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
         disallow: Rexeitar publicación
         disallow_account: Rexeitar autora
+        not_discoverable: A autora non elexiu poder ser atopada
         shared_by:
           one: Compartida ou favorecida unha vez
           other: Compartida ou favorecida %{friendly_count} veces
@@ -805,6 +825,7 @@ gl:
           tag_servers_dimension: Clasificación Servidores
           tag_servers_measure: diferentes servidores
           tag_uses_measure: total de usos
+        description_html: Estes son cancelos que actualmente están presentes en moitas publicacións que o teu servidor recibe. Pode ser útil para que as túas usuarias atopen a outras persoas a través do máis comentado neste intre. Non se mostran cancelos públicamente que non fosen aprobados por ti.
         listable: Pode ser suxerida
         not_listable: Non vai ser suxerida
         not_trendable: Non aparecerá en tendencias
@@ -831,6 +852,7 @@ gl:
       actions:
         delete_statuses: borrar as súas publicacións
         disable: pausar a súa conta
+        mark_statuses_as_sensitive: marcar as súas publicacións como sensibles
         none: un aviso
         sensitive: marcar a conta como sensible
         silence: limitar a súa conta
@@ -933,8 +955,10 @@ gl:
     status:
       account_status: Estado da conta
       confirming: Agardando a confirmación do correo enviado.
+      functional: A túa conta está completamente operativa.
       pending: A túa solicitude está pendente de revisión. Poderíanos levar algún tempo. Recibirás un correo se a solicitude está aprobada.
       redirecting_to: A túa conta está inactiva porque está redirixida a %{acct}.
+      view_strikes: Ver avisos anteriores respecto da túa conta
     too_fast: Formulario enviado demasiado rápido, inténtao outra vez.
     trouble_logging_in: Problemas para acceder?
     use_security_key: Usa chave de seguridade
@@ -1010,6 +1034,7 @@ gl:
         submit: Enviar apelación
       associated_report: Denuncia asociada
       created_at: Data
+      description_html: Estas son as accións tomadas contra a túa conta e os avisos que che enviou a administración de %{instance}.
       recipient: Entregada a
       status: 'Publicación #%{id}'
       status_removed: A publicación xa foi eliminada do sistema
@@ -1017,6 +1042,7 @@ gl:
       title_actions:
         delete_statuses: Eliminación da publicación
         disable: Pausar conta
+        mark_statuses_as_sensitive: Marcar as publicacións como sensibles
         none: Aviso
         sensitive: Marcar a conta como sensible
         silence: Limitar a conta
@@ -1226,7 +1252,7 @@ gl:
       subject: 'Seguidora pendente: %{name}'
       title: Nova petición de seguimento
     mention:
-      action: Respostar
+      action: Responder
       body: 'Foi mencionada por %{name} en:'
       subject: Foches mencionada por %{name}
       title: Nova mención
@@ -1319,7 +1345,7 @@ gl:
       proceed: Darlle a promocionar
       prompt: 'Vas promover esta publicación:'
     reply:
-      proceed: Respostar
+      proceed: Responde
       prompt: 'Vas responder a esta publicación:'
   reports:
     errors:
@@ -1390,6 +1416,7 @@ gl:
     profile: Perfil
     relationships: Seguindo e seguidoras
     statuses_cleanup: Borrado automático da publicación
+    strikes: Avisos da moderación
     two_factor_authentication: Validar Dobre Factor
     webauthn_authentication: Chaves de seguridade
   statuses:
@@ -1412,7 +1439,7 @@ gl:
       other: 'contiña uns cancelos non permitidos: %{tags}'
     edited_at: Editado %{date}
     errors:
-      in_reply_not_found: A publicación á que tentas respostar semella que non existe.
+      in_reply_not_found: A publicación á que tentas responder semella que non existe.
     open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
     pin_errors:
@@ -1469,6 +1496,7 @@ gl:
       '2629746': 1 mes
       '31556952': 1 ano
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Límite temporal
@@ -1616,26 +1644,28 @@ gl:
         spam: Spam
         violation: O contido viola as seguintes normas da comunidade
       explanation:
-        delete_statuses: Algunha das túas publicacións semella que viola algunha das normas da comunidade e foi eliminada pola moderación de %{instance}. Futuras violacións poderían implicar accións máis contundentes contra a túa conta.
+        delete_statuses: Algunha das túas publicacións son consideradas contrarias ás normas da comunidade e foron por tanto eliminadas pola moderación de %{instance}.
         disable: Xa non podes usar a túa conta, pero o teu perfil e outros datos permanecen intactos. Podes solicitar unha copia dos teus datos, cambiar os axustes da conta ou eliminar a túa conta.
+        mark_statuses_as_sensitive: Algunha das túas publicacións foron marcadas como sensible pola moderación de %{instance}. Esto significa que as persoas só poderan ver a vista previa se tocan nelas. Ti tamén podes marcar os medios como sensibles en futuras publicacións.
         sensitive: A partir deste momento, tódolos ficheiros que subiches estarán marcados como sensibles e agochados tras un aviso de contido.
         silence: Aínda podes usar a túa conta pero só as persoas que te siguen poden ver as túas publicacións neste servidor, e podes que foses excluída de varios xeitos de descubrimento. Porén, aínda te poden seguir de xeito manual.
         suspend: Xa non podes usar a túa conta, o teu perfil e outros datos xa non son accesibles. Aínda podes acceder para solicitar unha copia dos teus datos no prazo de 30 días previos á eliminación da conta. Imos reter algúns datos básicos para evitar que poidas evitar a suspensión.
-      get_in_touch: Se consideras que isto é un erro, podes responder a este email para contactar coa administración de %{instance}.
       reason: 'Razón:'
-      statuses: 'Publicacións que contradín as normas:'
+      statuses: 'Publicacións citadas:'
       subject:
         delete_statuses: As túas publicacións en %{acct} foron eliminadas
         disable: A súa conta %{acct} foi conxelada
+        mark_statuses_as_sensitive: As túas publicacións en %{acct} foron marcadas como sensibles
         none: Aviso para %{acct}
-        sensitive: A partir de agora os ficheiros multimedia en %{acct} van ser marcados como sensibles
+        sensitive: A partir de agora as túas publicacións en %{acct} van ser marcadas como sensibles
         silence: A súa conta %{acct} foi limitada
         suspend: A súa conta %{acct} foi suspendida
       title:
         delete_statuses: Publicacións eliminadas
         disable: Conta conxelada
+        mark_statuses_as_sensitive: Publicacións marcadas como sensibles
         none: Aviso
-        sensitive: Contido multimedia agochado
+        sensitive: Conta marcada como sensible
         silence: Conta limitada
         suspend: Conta suspendida
     welcome:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index e0068d5bc..8a5e51d12 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -119,16 +119,6 @@ he:
         title: חסימת שרת חדשה
       reject_media: חסימת קבצי מדיה
       reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
-      show:
-        affected_accounts:
-          one: חשבון אחד במסד נתונים מושפע
-          other: "%{count} חשבונות במסד נתונים מושפעים"
-          zero: אף חשבון במסד נתונים מושפע
-        retroactive:
-          silence: הסרת השתקה מכל החשבונות על שרת זה
-          suspend: הסרת השעייה מכל החשבונות על שרת זה
-        title: ביטול חסימת שרת עבור %{domain}
-        undo: ביטול
       undo: ביטול
     instances:
       title: שרתים מוכרים
@@ -207,6 +197,7 @@ he:
     security: החלפת סיסמא
     set_new_password: שינוי סיסמא
     status:
+      functional: החשבון שלכם פעיל לגמרי.
       redirecting_to: חשבונכם לא פעיל כעת מכיוון שמפנה ל%{acct}.
   authorize_follow:
     error: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק
@@ -336,9 +327,7 @@ he:
       reason: 'סיבה:'
       subject:
         delete_statuses: הפוסטים שלכם ב%{acct} הוסרו
-        sensitive: קבצי המדיה שלכם ב%{acct} יסומנו בתור תוכן רגיש מעכשיו והלאה
       title:
         delete_statuses: פוסטים שהוסרו
-        sensitive: מדיה שהוסתרה
   users:
     invalid_otp_token: קוד דו-שלבי שגוי
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d1a809144..2e6af8cda 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -25,7 +25,6 @@ hr:
     following: Praćenih
     last_active: posljednja aktivnost
     media: Medijski sadržaj
-    never_active: Nikad
     nothing_here: Ovdje nema ničeg!
     people_followed_by: Ljudi koje %{name} prati
     people_who_follow: Ljudi koji prate %{name}
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 224bcc986..73ade428b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -16,6 +16,7 @@ hu:
     contact: Kapcsolat
     contact_missing: Nincs megadva
     contact_unavailable: N/A
+    continue_to_web: Tovább a webes alkalmazáshoz
     discover_users: Találj meg másokat
     documentation: Dokumentáció
     federation_hint_html: Egy %{instance} fiókkal bármely más Mastodon szerveren vagy a föderációban lévő felhasználót követni tudsz.
@@ -25,6 +26,8 @@ hu:
       Ez a fiók virtuális, magát a szervert reprezentálja, nem pedig konkrét
       felhasználót. Föderációs célokra szolgál, nem szabad tehát felfüggeszteni, hacsak nem akarod a teljes szervert kitiltani, mely esetben a domain tiltásának használata javasolt.
     learn_more: Tudj meg többet
+    logged_in_as_html: Belépve, mint %{username}.
+    logout_before_registering: Már be vagy jelentkezve.
     privacy_policy: Adatvédelmi szabályzat
     rules: Szerverünk szabályai
     rules_html: 'Alább látod azon követendő szabályok összefoglalóját, melyet be kell tartanod, ha szeretnél fiókot ezen a szerveren:'
@@ -71,7 +74,6 @@ hu:
     media: Média
     moved_html: "%{name} ide költözött: %{new_profile_link}"
     network_hidden: Ez az információ nem elérhető
-    never_active: Soha
     nothing_here: Nincs itt semmi!
     people_followed_by: "%{name} követettjei"
     people_who_follow: "%{name} követői"
@@ -164,10 +166,10 @@ hu:
       not_subscribed: Nincs feliratkozás
       pending: Engedélyezés alatt
       perform_full_suspension: Felfüggesztés
-      previous_strikes: Korábbi vétségek
+      previous_strikes: Korábbi szankciók
       previous_strikes_description_html:
-        one: Ennek a fióknak <strong>egy</strong> vétsége van.
-        other: Ennek a fióknak <strong>%{count}</strong> vétsége van.
+        one: Ezt a fiókot <strong>egyszer</strong> szankcionálták.
+        other: Ezt a fiókot <strong>%{count}</strong> esetben szankcionálták.
         zero: Ez a fiók <strong>makulátlan</strong>.
       promote: Előléptetés
       protocol: Protokoll
@@ -210,7 +212,7 @@ hu:
       silence: Némítás
       silenced: Némított
       statuses: Bejegyzés
-      strikes: Korábbi kihágások
+      strikes: Korábbi szankciók
       subscribe: Feliratkozás
       suspend: Felfüggesztés
       suspended: Felfüggesztett
@@ -450,21 +452,6 @@ hu:
       reject_media_hint: Eltávolítja a helyben tárolt médiafájlokat és a továbbiakban letiltja az új médiafájlok letöltését. Felfüggesztett fiókok esetében irreleváns opció
       reject_reports: Bejelentések elutasítása
       reject_reports_hint: Erről a domainről származó minden bejelentés elutasítása. Felfüggesztett fiókok esetén irreleváns opció
-      rejecting_media: médiafájlok elutasítása
-      rejecting_reports: bejelentések elutasítása
-      severity:
-        silence: némítva
-        suspend: felfüggesztve
-      show:
-        affected_accounts:
-          one: Egy fiókot érintett az adatbázisban
-          other: "%{count} fiókot érintett az adatbázisban"
-          zero: Nem érintett fiókot az adatbázisban
-        retroactive:
-          silence: Minden felhasználó némításának feloldása ezen a domainen
-          suspend: Minden felhasználó felfüggesztésének feloldása ezen a domainen
-        title: "%{domain} domain tiltásának feloldása"
-        undo: Visszavonás
       undo: Domain tiltásának visszavonása
       view: Domain tiltásának megtekintése
     email_domain_blocks:
@@ -495,23 +482,47 @@ hu:
       title: Követési ajánlatok
       unsuppress: Követési ajánlatok visszaállítása
     instances:
+      availability:
+        description_html:
+          one: Ha a domainre történő kézbesítés <strong>%{count} teljes nap</strong> sikertelen, további kézbesítéseket már nem kísérlünk meg, hacsak mi nem kapunk kézbesítést a <em>domaintől</em>.
+          other: Ha a domainre történő kézbesítés <strong>%{count} különböző nap</strong> sikertelen, további kézbesítéseket már nem kísérlünk meg, hacsak mi nem kapunk kézbesítést a <em>domaintől</em>.
+        failure_threshold_reached: 'Hibaküszöb elérve ekkor: %{date}.'
+        failures_recorded:
+          one: Sikertelen próbálkozás %{count} napon.
+          other: Sikertelen próbálkozás %{count} különböző napon.
+        no_failures_recorded: Nem rögzítettünk hibát.
+        title: Elérhetőség
       back_to_all: Mind
       back_to_limited: Korlátozott
       back_to_warning: Figyelmeztetés
       by_domain: Domain
       confirm_purge: Biztos, hogy véglegesen törölni akarod az adatokat ebből a domainből?
+      content_policies:
+        comment: Belső megjegyzés
+        description_html: Definiálhatsz tartalmi szabályokat, melyek ezen domain és minden aldomain fiókjára vonatkozni fognak.
+        policies:
+          reject_media: Média elutasítása
+          reject_reports: Bejelentések elutasítása
+          silence: Korlátozás
+          suspend: Felfüggesztés
+        policy: Házirend
+        reason: Nyilvános indok
+        title: Tartalmi szabályok
+      dashboard:
+        instance_accounts_dimension: Legtöbbet követett fiókok
+        instance_accounts_measure: tárolt fiók
+        instance_followers_measure: követőnk náluk
+        instance_follows_measure: követőik nálunk
+        instance_languages_dimension: Legnépszerűbb nyelvek
+        instance_media_attachments_measure: tárolt médiatartalom
+        instance_reports_measure: bejelentés róluk
+        instance_statuses_measure: tárolt bejegyzés
       delivery:
         all: Mind
         clear: Kézbesítési hibák törlése
         restart: Kézbesítés újraindítása
         stop: Kézbesítés leállítása
-        title: Kézbesítés
         unavailable: Nem elérhető
-        unavailable_message: Kézbesítés nem elérhető
-        warning: Figyelmeztetés
-        warning_message:
-          one: Kézbesítés sikertelen %{count} napja
-          other: Kézbesítés sikertelen %{count} napja
       delivery_available: Kézbesítés elérhető
       delivery_error_days: Kézbesítési hiba időtartama
       delivery_error_hint: Ha a kézbesítés lehetetlen %{count} napig, automatikusan kézbesíthetetlennek lesz megjelölve.
@@ -528,12 +539,14 @@ hu:
       private_comment: Privát megjegyzés
       public_comment: Nyilvános megjegyzés
       purge: Végleges törlés
+      purge_description_html: Ha úgy véled, hogy ez a domain végleg offline marad, a tárhelyedről letörölhetsz minden fiókot és hozzá tartozó adatot. Ez eltarthat egy darabig.
       title: Föderáció
       total_blocked_by_us: Általunk letiltott
       total_followed_by_them: Általuk követett
       total_followed_by_us: Általunk követett
       total_reported: Bejelentés róluk
       total_storage: Média csatolmány
+      totals_time_period_hint_html: Az alább mutatott összesítések minden eddigi adatot tartalmaznak.
     invites:
       deactivate_all: Összes deaktiválása
       filter:
@@ -587,9 +600,10 @@ hu:
       action_log: Audit napló
       action_taken_by: 'Kezelte:'
       actions:
-        delete_description_html: A bejelentett bejegyzéseket törölni fogjuk és feljegyzünk egy vétséget, hogy segítsünk a későbbi eszkalációban ugyanennél a fióknál.
+        delete_description_html: A bejelentett bejegyzéseket törölni fogjuk és feljegyzünk egy szankciót, hogy segítsük az eszkalációt a fiók későbbi kihágásai esetén.
+        mark_as_sensitive_description_html: A bejelentett bejegyzések médaitartalmait érzékenynek jelöljük, és rögzítünk egy szankciót, hogy segítsük az eszkalációt a fiók későbbi kihágásai esetében.
         other_description_html: További lehetőségek megjelenítése a fiók viselkedésének szabályozásához, és a jelentett fiók kommunikációjának testreszabásához.
-        resolve_description_html: Nem csinálunk semmit a bejelentett fiókkal, nem jegyzünk fel vétséget, és bezárjuk a bejelentést.
+        resolve_description_html: Nem csinálunk semmit a bejelentett fiókkal, nem jegyzünk fel szankciót, és bezárjuk a bejelentést.
         silence_description_html: A profil csak azok számára lesz látható, akik már követik, vagy kézileg megkeresik, rendkívül korlátozva az elérését. Ez mindig visszafordítható.
         suspend_description_html: A profil és az összes tartalma elérhetetlen lesz, amíg végleg törlésre nem kerül. A fiókkal történő minden interakció lehetetlen lesz. 30 napon belül még visszaállítható.
       actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
@@ -608,6 +622,7 @@ hu:
       forwarded: Továbbítva
       forwarded_to: 'Továbbítva ide: %{domain}'
       mark_as_resolved: Megjelölés megoldottként
+      mark_as_sensitive: Érzékenynek jelölés
       mark_as_unresolved: Megjelölés megoldatlanként
       no_one_assigned: Senki
       notes:
@@ -751,6 +766,7 @@ hu:
       actions:
         delete_statuses: "%{name} törölte %{target} bejegyzését"
         disable: "%{name} befagyasztotta %{target} fiókját"
+        mark_statuses_as_sensitive: "%{name} %{target} bejegyzését érzékenynek jelölte"
         none: "%{name} figyelmeztetést küldött %{target} számára"
         sensitive: "%{name} érzékenynek jelölte %{target} fiókját"
         silence: "%{name} korlátozta %{target} fiókját"
@@ -776,6 +792,7 @@ hu:
       links:
         allow: Hivatkozás engedélyezése
         allow_provider: Közzétevő engedélyezése
+        description_html: Ezek olyan hivatkozások, melyeket a szervered által látott fiókok mostanában sokat osztanak meg. Ez segíthet a felhasználóidnak rátalálni arra, hogy mi történik a világban. Egy hivatkozást sem mutatunk meg nyilvánosan, amíg a közzétevőt jóvá nem hagytad. A hivatkozásokat külön is engedélyezheted vagy visszautasíthatod.
         disallow: Hivatkozás letiltása
         disallow_provider: Közzétevő letiltása
         shared_by_over_week:
@@ -787,14 +804,17 @@ hu:
       pending_review: Áttekintésre vár
       preview_card_providers:
         allowed: A közzétevő hivatkozásai felkapottak lehetnek
+        description_html: Ezek olyan domainek, melyekre vonatkozó hivatkozásokat gyakran osztanak meg a szervereden. A hivatkozások nem lesznek nyilvánosan trendik, amíg a hivatkozás domainjét jóvá nem hagytad. A jóváhagyásod (vagy visszautasításod) az aldomainekre is vonatkozik.
         rejected: A közzétevő hivatkozásai nem lesznek felkapottak
         title: Közzétévők
       rejected: Elutasított
       statuses:
         allow: Bejegyzés engedélyezése
         allow_account: Szerző engedélyezése
+        description_html: Ezek olyan, a szervered által ismert bejegyzések, melyeket mostanság gyakran osztanak meg vagy jelölnek kedvencnek. Ez segíthet az új vagy visszatérő felhasználóidnak, hogy több követhető személyt találjanak Egyetlen bejegyzést sem mutatunk meg nyilvánosan, amíg ennek szerzőjét nem hagytad jóvá és ő nem járult hozzá, hogy őt másoknak ajánlják. Bejegyzéseket egyenként is engedélyezhetsz vagy visszautasíthatsz.
         disallow: Bejegyzés tiltása
         disallow_account: Szerző tiltása
+        not_discoverable: A szerző nem járult hozzá, hogy mások rátalálhassanak
         shared_by:
           one: Megosztva vagy kedvencnek jelölve egy alkalommal
           other: Megosztva és kedvencnek jelölve %{friendly_count} alkalommal
@@ -807,6 +827,7 @@ hu:
           tag_servers_dimension: Legnépszerűbb kiszolgálók
           tag_servers_measure: különböző kiszolgáló
           tag_uses_measure: összes használat
+        description_html: Ezek olyan hashtag-ek, melyek mostanság nagyon sok bejegyzésben jelennek meg, melyet a szervered lát. Ez segíthet a felhasználóidnak abban, hogy megtudják, miről beszélnek legtöbbet az emberek az adott pillanatban. Egyetlen hashtag-et sem mutatunk meg nyilvánosan, amíg azt nem hagytad jóvá.
         listable: Javasolható
         not_listable: Nem lesz javasolva
         not_trendable: Nem fog megjelenni a trendek alatt
@@ -833,6 +854,7 @@ hu:
       actions:
         delete_statuses: bejegyzések törléséről
         disable: fiók befagyasztásáról
+        mark_statuses_as_sensitive: bejegyzések érzékenynek jelöléséről
         none: figyelmeztetésről
         sensitive: fiók érzékenynek jelöléséről
         silence: fiók korlátozásáról
@@ -935,8 +957,10 @@ hu:
     status:
       account_status: Fiók állapota
       confirming: Várakozás az e-mailes visszaigazolásra.
+      functional: A fiókod teljesen működőképes.
       pending: A jelentkezésed engedélyezésre vár. Ez eltarthat egy ideig. Kapsz egy e-mailt, ha a kérelmedet jóváhagyták.
       redirecting_to: A fiókod inaktív, mert jelenleg ide %{acct} van átirányítva.
+      view_strikes: Fiókod elleni korábbi szankciók megtekintése
     too_fast: Túl gyorsan küldted el az űrlapot, próbáld később.
     trouble_logging_in: Problémád van a bejelentkezéssel?
     use_security_key: Biztonsági kulcs használata
@@ -1004,7 +1028,7 @@ hu:
     strikes:
       action_taken: Intézkedés
       appeal: Fellebbezés
-      appeal_approved: Ezt a vétséget eredményesen fellebbezték, így már nem érvényes
+      appeal_approved: Ezt a szankciót eredményesen fellebbezték, így már nem érvényes
       appeal_rejected: A fellebbezést visszautasították
       appeal_submitted_at: Fellebbezés beküldve
       appealed_msg: A fellebbezésedet beküldtük. Ha jóváhagyták, értesítünk.
@@ -1012,6 +1036,7 @@ hu:
         submit: Fellebbezés beküldése
       associated_report: Társított bejelentés
       created_at: Dátum
+      description_html: Ezek a fiókoddal szemben elvégzett műveletek és figyelmeztetések, melyeket a %{instance} szerver csapata küldött.
       recipient: Címzett
       status: 'Bejegyzés #%{id}'
       status_removed: A bejegyzést már eltávolítottuk a rendszerből
@@ -1019,6 +1044,7 @@ hu:
       title_actions:
         delete_statuses: Bejegyzés eltávolítása
         disable: Fiók befagyasztása
+        mark_statuses_as_sensitive: Bejegyzések érzékenynek jelölése
         none: Figyelmeztetés
         sensitive: Fiók érzékenynek jelölése
         silence: Fiók korlátozása
@@ -1392,6 +1418,7 @@ hu:
     profile: Profil
     relationships: Követések és követők
     statuses_cleanup: Bejegyzések automatikus törlése
+    strikes: Moderációs szankciók
     two_factor_authentication: Kétlépcsős hitelesítés
     webauthn_authentication: Biztonsági kulcsok
   statuses:
@@ -1471,6 +1498,7 @@ hu:
       '2629746': 1 hónap
       '31556952': 1 év
       '5259492': 2 hónap
+      '604800': 1 hét
       '63113904': 2 év
       '7889238': 3 hónap
     min_age_label: Korhatár
@@ -1594,11 +1622,11 @@ hu:
   user_mailer:
     appeal_approved:
       action: Ugrás a fiókodhoz
-      explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
+      explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i szankcióval kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
       subject: A %{date}-i fellebbezésedet jóváhagyták
       title: Fellebbezés jóváhagyva
     appeal_rejected:
-      explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i vétségével kapcsolatos, elutasításra került.
+      explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i szankciójával kapcsolatos, elutasításra került.
       subject: A %{date}-i fellebbezésedet visszautasították
       title: Fellebbezés visszautasítva
     backup_ready:
@@ -1618,26 +1646,28 @@ hu:
         spam: Kéretlen üzenet
         violation: A tartalom megsérti a következő közösségi irányelveket
       explanation:
-        delete_statuses: Néhány bejegyzésedről a moderátorok úgy találták, hogy sérti a közösségi szabályainkat, így ezeket eltávolították a %{instance} kiszolgálóról. A jövőbeni kihágásokat a fiókodon keményebben is büntethetik.
+        delete_statuses: Néhány bejegyzésedről úgy találták, hogy megsértenek egy vagy több közösségi irányelvet, így ezeket a %{instance} moderátorai eltávolították.
         disable: Nem használhatod tovább a fiókodat, bár a profil- és egyéb adataid érintetlenül maradnak. Kérhetsz mentést az adataidról, megváltoztathatod a beállításaidat vagy törölheted a fiókodat.
+        mark_statuses_as_sensitive: Néhány bejegyzésedet a %{instance} moderátorai érzékenynek jelölték. Ez azt jelenti, hogy az embereknek először rá kell nyomni a bejegyzés médiatartalmára, mielőtt egy előnézet megjelenne. A jövőben te is megjelölheted bejegyzés írása közben a médiatartalmat érzékenyként.
         sensitive: Mostantól minden feltöltött médiaállományodat érzékeny tartalomként jelölünk meg és kattintásos figyelmeztetés mögé rejtjük.
         silence: A fiókodat most is használhatod, de ezen a kiszolgálón csak olyanok láthatják a bejegyzéseidet, akik már eddig is a követőid voltak, valamint kihagyunk különböző felfedezésre használható funkciókból. Ettől még mások továbbra is manuálisan be tudnak követni.
         suspend: Többé nem használhatod a fiókodat, a profilod és más adataid többé nem elérhetőek. Még be tudsz jelentkezni, hogy mentést kérj az adataidról addig, amíg kb. 30 nap múlva teljesen le nem töröljük őket. Néhány alapadatot megtartunk, hogy el tudjuk kerülni, hogy megkerüld a felfüggesztést.
-      get_in_touch: Ha azt gondolod, hogy ez egy hiba, akkor válaszolj erre az e-mail-re, hogy kapcsolatba léphess a %{instance} kiszolgáló üzemeltetőivel.
       reason: 'Indok:'
-      statuses: 'Szabálysértőnek talált bejegyzések:'
+      statuses: 'Bejegyzések idézve:'
       subject:
         delete_statuses: A(z) %{acct} fiók bejegyzései eltávolításra kerültek
         disable: A fiókodat %{acct} befagyasztották
+        mark_statuses_as_sensitive: Bejegyzéseidet a %{acct} szerveren érzékenyek jelölték
         none: Figyelmeztetés a %{acct} fióknak
-        sensitive: A(z) %{acct} fiók médiafájljai mostantól érzékenynek lesznek jelölve
+        sensitive: Bejegyzéseidet a %{acct} szerveren mostantól érzékenynek jelöljük
         silence: A fiókodat %{acct} korlátozták
         suspend: A fiókodat %{acct} felfüggesztették
       title:
         delete_statuses: Bejegyzések törölve
         disable: Befagyasztott fiók
+        mark_statuses_as_sensitive: Bejegyzések érzékenynek jelölve
         none: Figyelem
-        sensitive: Média elrejtve
+        sensitive: Fiók érzékenynek jelölve
         silence: Lekorlátozott fiók
         suspend: Felfüggesztett fiók
     welcome:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 0739f3879..86287e3db 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -67,7 +67,6 @@ hy:
     media: Մեդիա
     moved_html: "%{name} տեղափոխուել է %{new_profile_link}"
     network_hidden: Այս տուեալը հասանելի չէ
-    never_active: Երբեք
     nothing_here: Այստեղ բան չկայ
     people_followed_by: Մարդիկ, որոնց %{name}ը հետեւում է
     people_who_follow: Մարդիկ, որոնք հետեւում են %{name}ին
@@ -337,14 +336,6 @@ hy:
       public_comment: Հրապարակային մեկնաբանութիւն
       reject_media: Մերժել մեդիա ֆայլերը
       reject_reports: Մերժել բողոքները
-      rejecting_media: մերժուում են մեդիա ֆայլեր
-      rejecting_reports: մերժուում են բողոքներ
-      severity:
-        silence: լռեցուած
-        suspend: կասեցուած
-      show:
-        title: Ետարկել տիրոյթի արգելափակումը %{domain}ի համար
-        undo: Ետարկել
       undo: Ետարկել տիրոյթի արգելափակումը
       view: Տեսնել տիրոյթի արգելափակումը
     email_domain_blocks:
@@ -367,7 +358,6 @@ hy:
       delivery:
         all: Բոլորը
         unavailable: Անհասանելի է
-        warning: Զգուշացում
       empty: Դոմեյնները չեն գտնուել
       moderation:
         all: Բոլորը
@@ -912,6 +902,7 @@ hy:
       '2629746': 1 ամիս
       '31556952': 1 տարի
       '5259492': 2 ամիս
+      '604800': 1 week
       '63113904': 2 տարի
       '7889238': 3 ամիս
   stream_entries:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 4e94de090..158f4d6b1 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -16,6 +16,7 @@ id:
     contact: Kontak
     contact_missing: Belum diset
     contact_unavailable: Tidak Tersedia
+    continue_to_web: Lanjut ke apl web
     discover_users: Temukan pengguna
     documentation: Dokumentasi
     federation_hint_html: Dengan akun di %{instance} Anda dapat mengikuti orang di server Mastodon mana pun dan di luarnya.
@@ -23,6 +24,8 @@ id:
     hosted_on: Mastodon dihosting di %{domain}
     instance_actor_flash: "Akun ini adalah aktor virtual yang dipakai untuk merepresentasikan server, bukan pengguna individu. Ini dipakai untuk tujuan federasi dan jangan diblokir kecuali Anda ingin memblokir seluruh instansi, yang seharusnya Anda pakai blokir domain. \n"
     learn_more: Pelajari selengkapnya
+    logged_in_as_html: Anda sedang masuk sebagai %{username}.
+    logout_before_registering: Anda sudah masuk.
     privacy_policy: Kebijakan Privasi
     rules: Aturan server
     rules_html: 'Di bawah ini adalah ringkasan aturan yang perlu Anda ikuti jika Anda ingin memiliki akun di server Mastodon ini:'
@@ -64,7 +67,6 @@ id:
     media: Media
     moved_html: "%{name} telah pindah ke %{new_profile_link}:"
     network_hidden: Informasi ini tidak tersedia
-    never_active: Tak pernah
     nothing_here: Tidak ada apapun disini!
     people_followed_by: Orang yang diikuti %{name}
     people_who_follow: Orang-orang yang mengikuti %{name}
@@ -438,21 +440,6 @@ id:
       reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
       reject_reports: Tolak laporan
       reject_reports_hint: Abaikan semua laporan dari domain ini. Tidak relevan untuk penangguhan
-      rejecting_media: tolak berkas media
-      rejecting_reports: laporan ditolak
-      severity:
-        silence: dibungkam
-        suspend: ditangguhkan
-      show:
-        affected_accounts:
-          one: Satu akun di basis data terpengaruh
-          other: "%{count} akun di basis data terpengaruh"
-          zero: Tidak ada akun di basis data terpengaruh
-        retroactive:
-          silence: Hapus pendiaman terhadap akun pada domain ini
-          suspend: Hapus suspen terhadap akun pada domain ini
-        title: Hapus pemblokiran domain %{domain}
-        undo: Urungkan
       undo: Urungkan blokir domain
       view: Lihat blokir domain
     email_domain_blocks:
@@ -482,22 +469,41 @@ id:
       title: Rekomendasi untuk diikuti
       unsuppress: Kembalikan rekomendasi untuk diikuti
     instances:
+      availability:
+        description_html:
+          other: Jika pengiriman ke domain selama <strong>%{count} hari</strong> tidak berhasil, tidak akan ada upaya pengiriman kecuali bila kiriman <em>dari</em> domain tersebut berhasil diterima.
+        failure_threshold_reached: Batas kegagalan tercapai pada %{date}.
+        failures_recorded:
+          other: Upaya gagal dalam %{count} hari berbeda.
+        no_failures_recorded: Tidak ada kegagalan tercatat.
+        title: Ketersediaan
       back_to_all: Semua
       back_to_limited: Terbatas
       back_to_warning: Peringatan
       by_domain: Domain
       confirm_purge: Yakin ingin menghapus permanen data dari domain ini?
+      content_policies:
+        comment: Catatan internal
+        description_html: Anda dapat menentukan kebijakan konten yang akan diterapkan ke semua akun dari domain ini dan dari subdomainnya.
+        policies:
+          reject_media: Tolak media
+          reject_reports: Tolak laporan
+          silence: Batas
+          suspend: Tangguhkan
+        policy: Kebijakan
+        reason: Alasan publik
+        title: Kebijakan konten
+      dashboard:
+        instance_accounts_dimension: Akun yang paling banyak diikuti
+        instance_accounts_measure: akun tersimpan
+        instance_followers_measure: pengikut kami di sana
+        instance_follows_measure: pengikut mereka di sini
       delivery:
         all: Semua
         clear: Hapus galat pengiriman
         restart: Mulai ulang pengiriman
         stop: Setop pengiriman
-        title: Pengiriman
         unavailable: Tidak tersedia
-        unavailable_message: Pengiriman tidak tersedia
-        warning: Peringatan
-        warning_message:
-          other: Kegagalan pengiriman %{count} hari
       delivery_available: Pengiriman tersedia
       delivery_error_days: Lama hari pengiriman galat
       delivery_error_hint: Jika pengiriman tidak terjadi selama %{count} hari, ia akan ditandai secara otomatis sebagai tidak terkirim.
@@ -573,6 +579,7 @@ id:
       action_taken_by: Aksi dilakukan oleh
       actions:
         delete_description_html: Kiriman yang dilaporkan akan dihapus dan peringatan akan direkam untuk membantu Anda mengurus masalah oleh akun yang sama di masa mendatang.
+        mark_as_sensitive_description_html: Media di dalam kiriman terlapor akan ditandai sebagai sensitif dan hukuman akan direkam untuk membantu menangani pelanggaran dari akun yang sama di masa mendatang.
         other_description_html: Lihat opsi lain untuk mengendalikan perilaku akun dan menyesuaikan komunikasi ke akun yang dilaporkan.
         resolve_description_html: Tidak ada tindakan untuk akun yang dilaporkan, tidak ada peringatan yang direkam, dan laporan akan ditutup.
         silence_description_html: Profil hanya dapat terlihat oleh pengguna yang telah mengikuti atau melihatnya secara manual, yang sangat membatasi jangkauannya. Selalu dapat dipulihkan kembali.
@@ -593,6 +600,7 @@ id:
       forwarded: Diteruskan
       forwarded_to: Diteruskan ke %{domain}
       mark_as_resolved: Tandai telah diseleseikan
+      mark_as_sensitive: Tandai sebagai sensitif
       mark_as_unresolved: Tandai belum terselesaikan
       no_one_assigned: Tidak ada
       notes:
@@ -1004,7 +1012,6 @@ id:
         delete_statuses: Penghapusan kiriman
         disable: Pembekuan akun
         none: Peringatan
-        sensitive: Tandai akun sebagai sensitif
         silence: Pembatasan akun
         suspend: Penangguhan akun
       your_appeal_approved: Banding Anda disetujui
@@ -1445,6 +1452,7 @@ id:
       '2629746': 1 bulan
       '31556952': 1 tahun
       '5259492': 2 bulan
+      '604800': 1 week
       '63113904': 2 tahun
       '7889238': 3 bulan
     min_age_label: Batas usia
@@ -1592,26 +1600,21 @@ id:
         spam: Spam
         violation: Konten melanggar panduan komunitas berikut
       explanation:
-        delete_statuses: Beberapa kiriman Anda melanggar satu atau lebih panduan komunitas dan telah dihapus oleh moderator %{instance}. Pelanggaran berikutnya akan menyebabkan tindakan yang lebih parah terhadap akun Anda.
         disable: Anda tidak lagi dapat menggunakan akun, tapi profil dan data Anda lainnya masih tersimpan. Anda dapat minta cadangan data Anda, mengubah pengaturan akun, atau menghapus akun.
         sensitive: Mulai sekarang, semua berkas media yang telah Anda unggah akan ditandai sebagai sensitif dan disembunyikan di balik peringatan yang harus diklik.
         silence: Anda masih tetap dapat menggunakan akun tetapi hanya orang yang mengikuti Anda yang dapat melihat kiriman Anda di server ini, dan Anda mungkin akan dikeluarkan dari fitur pencarian akun. Bagaimana pun, orang lain tetap dapat mengikuti Anda secara manual.
         suspend: Anda tidak dapat menggunakan akun Anda, dan profil serta data lain Anda tidak lagi dapat diakses. Anda masih tetap bisa masuk akun untuk minta cadangan data sampai data Anda akan dihapus permanen 30 hari lagi, tapi kami akan menyimpan beberapa data dasar untuk mencegah Anda menghindari penangguhan.
-      get_in_touch: Jika Anda yakin ini kesalahan, Anda dapat membalas email ini untuk menghubungi staf %{instance}.
       reason: 'Alasan:'
-      statuses: 'Postingan yang telah terbukti pelanggarannya:'
       subject:
         delete_statuses: Postingan anda pada %{acct} telah dihapus
         disable: Akun Anda %{acct} telah dibekukan
         none: Peringatan untuk %{acct}
-        sensitive: File media anda pada %{acct} akan ditandai sebagai sensitif mulai saat ini
         silence: Akun Anda %{acct} telah dibatasi
         suspend: Akun Anda %{acct} telah ditangguhkan
       title:
         delete_statuses: Postingan dihapus
         disable: Akun dibekukan
         none: Peringatan
-        sensitive: Media disembunyikan
         silence: Akun dibatasi
         suspend: Akun ditangguhkan
     welcome:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index ad9ac5be6..4360d804e 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -27,10 +27,6 @@ io:
       new:
         severity:
           desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data."
-      show:
-        retroactive:
-          silence: Unsilence all existing accounts from this domain
-          suspend: Unsuspend all existing accounts from this domain
       undo: Undo
     instances:
       title: Known Instances
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 38c31d12f..4d50f866a 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -16,6 +16,7 @@ is:
     contact: Hafa samband
     contact_missing: Ekki skilgreint
     contact_unavailable: Ekki til staðar
+    continue_to_web: Halda áfram í vefforritið
     discover_users: Uppgötva notendur
     documentation: Hjálparskjöl
     federation_hint_html: Með notandaaðgangi á %{instance} geturðu fylgst með fólki á hvaða Mastodon-þjóni sem er og reyndar víðar.
@@ -25,6 +26,8 @@ is:
       Þessi aðgangur er sýndarnotandi sem er notaður til að tákna sjálfan vefþjóninn en ekki neinn einstakan notanda.
       Tilgangur hans tengist virkni vefþjónasambandsins og ætti alls ekki að loka á hann nema að þú viljir útiloka allan viðkomandi vefþjón, en þá ætti frekar að útiloka sjálft lénið.
     learn_more: Kanna nánar
+    logged_in_as_html: Þú ert núna skráð/ur inn sem %{username}.
+    logout_before_registering: Þú ert þegar skráð/ur inn.
     privacy_policy: Persónuverndarstefna
     rules: Reglur netþjónsins
     rules_html: 'Hér fyrir neðan er yfirlit yfir þær reglur sem þú þarft að fara eftir ef þú ætlar að vera með notandaaðgang á þessum Mastodon-netþjóni:'
@@ -69,7 +72,6 @@ is:
     media: Myndefni
     moved_html: "%{name} hefur verið færður í %{new_profile_link}:"
     network_hidden: Þessar upplýsingar ekki tiltækar
-    never_active: Aldrei
     nothing_here: Það er ekkert hér!
     people_followed_by: Fólk sem %{name} fylgist með
     people_who_follow: Fólk sem fylgist með %{name}
@@ -448,21 +450,6 @@ is:
       reject_media_hint: Fjarlægir staðværar myndefnisskrár úr geymslu og neitar framvegis að sækja neinar slíkar. Skiptir ekki máli fyrir biðstöður
       reject_reports: Hafna kærum
       reject_reports_hint: Hunsa allar kærur frá þessu léni. Skiptir ekki máli fyrir biðstöður
-      rejecting_media: hafna myndskrám
-      rejecting_reports: hafna kærum
-      severity:
-        silence: takmarkað
-        suspend: í bið
-      show:
-        affected_accounts:
-          one: Einn notandaaðgangur í gagnagrunninum kemur við sögu
-          other: "%{count} notendaaðgangar í gagnagrunninum koma við sögu"
-          zero: Enginn notandaaðgangur í gagnagrunninum kemur við sögu
-        retroactive:
-          silence: Hætta að takmarka viðkomandi notendaaðganga frá þessu léni
-          suspend: Taka úr bið viðkomandi notendaaðganga frá þessu léni
-        title: Afturkalla útilokun á léni fyrir %{domain}
-        undo: Afturkalla
       undo: Afturkalla útilokun á léni
       view: Skoða útilokun á léni
     email_domain_blocks:
@@ -493,23 +480,47 @@ is:
       title: Fylgja meðmælum
       unsuppress: Endurheimta að fylgja meðmælum
     instances:
+      availability:
+        description_html:
+          one: Ef afhending til lénsins mistekst í <strong>%{count} dag</strong>, verður ekki reynt aftur að afhenda til lénsins nema ef afhending <em>frá</em> léninu berst.
+          other: Ef afhending til lénsins mistekst í <strong>%{count} daga</strong>, verður ekki reynt aftur að afhenda til lénsins nema ef afhending <em>frá</em> léninu berst.
+        failure_threshold_reached: Hámarki misheppnaðra tilrauna náð þann %{date}.
+        failures_recorded:
+          one: Misheppnaðar tilraunir á %{count} degi.
+          other: Misheppnaðar tilraunir á %{count} mismunandi dögum.
+        no_failures_recorded: Engar misheppnaðar tilraunir á skrá.
+        title: Tiltækileiki
       back_to_all: Allt
       back_to_limited: Takmarkað
       back_to_warning: Aðvörun
       by_domain: Lén
       confirm_purge: Ertu viss um að þú viljir eyða gögnum endanlega frá þessu léni?
+      content_policies:
+        comment: Innri minnispunktur
+        description_html: Þú getur skilgreint stefnu varðandi efni sem verður beitt á alla aðganga frá þessu léni og öllum undirlénum þess.
+        policies:
+          reject_media: Hafna myndefni
+          reject_reports: Hafna kærum
+          silence: Takmörk
+          suspend: Setja í bið
+        policy: Stefna
+        reason: Opinber ástæða
+        title: Stefnur varðandi efni
+      dashboard:
+        instance_accounts_dimension: Aðgangar sem mest er fylgst með
+        instance_accounts_measure: geymdir aðgangar
+        instance_followers_measure: fylgjendur okkar þar
+        instance_follows_measure: fylgjendur þeirra hér
+        instance_languages_dimension: Vinsælustu tungumál
+        instance_media_attachments_measure: geymd myndefnisviðhengi
+        instance_reports_measure: kærur um þá
+        instance_statuses_measure: geymdar færslur
       delivery:
         all: Allt
         clear: Hreinsa afhendingarvillur
         restart: Endurræsa afhendingu
         stop: Stöðva afhendingu
-        title: Afhending
         unavailable: Ekki tiltækt
-        unavailable_message: Afhending ekki möguleg
-        warning: Aðvörun
-        warning_message:
-          one: "%{count} dagur með villum í afhendingu"
-          other: "%{count} dagar með villum í afhendingu"
       delivery_available: Afhending er til taks
       delivery_error_days: Dagar með villum í afhendingu
       delivery_error_hint: Ef afhending er ekki möguleg í %{count} daga, verður það sjálfkrafa merkt sem óafhendanlegt.
@@ -526,12 +537,14 @@ is:
       private_comment: Einkaathugasemd
       public_comment: Opinber athugasemd
       purge: Henda
+      purge_description_html: Ef þú heldur að þetta lén sé farið endanlega af netinu, geturðu eytt öllum færslum aðganga og tengdum gögnum frá þessu léni úr gagnageymslum þínum. Þetta gæti tekið þó nokkra stund.
       title: Samband
       total_blocked_by_us: Útilokað af okkur
       total_followed_by_them: Fylgt af þeim
       total_followed_by_us: Fylgt af okkur
       total_reported: Kærur um þá
       total_storage: Myndaviðhengi
+      totals_time_period_hint_html: Samtölurnar sem birtar eru hér fyrir neðan innihalda gögn frá upphafi.
     invites:
       deactivate_all: Gera allt óvirkt
       filter:
@@ -586,6 +599,7 @@ is:
       action_taken_by: Aðgerð framkvæmd af
       actions:
         delete_description_html: Kærðum færslum verður eytt og refsing skráð svo þú eigir auðveldara með að bregðast við í framtíðinni verði um fleiri brot að ræða frá sama notandaaðgangi.
+        mark_as_sensitive_description_html: Myndefnið í kærðu færslunum verður merkt sem viðkvæmt og refsing verður skráð til minnis fyrir viðbrögð gegn mögulegum framtíðarbrotum frá sama notandaaðgangi.
         other_description_html: Skoðaðu fleir valkosti fyrir stjórnun á hegðun notandaaðgangsins og til að stýra samskiptum við kærðan notandaaðgang.
         resolve_description_html: Til engra aðgerða verður tekið gagnvart kærðum færslum, engin refsing verður skráð og kærunni verður lokað.
         silence_description_html: Notandaaðgangurinn verður einungis sýnilegur þeim sem þegar fylgjast með honum eða sem fletta honum upp handvirkt, sem takmarkar útbreiðslu efnis verulega. Er alltaf hægt að afturkalla.
@@ -606,6 +620,7 @@ is:
       forwarded: Áframsent
       forwarded_to: Áframsent á %{domain}
       mark_as_resolved: Merkja sem leyst
+      mark_as_sensitive: Merkja sem viðkvæmt
       mark_as_unresolved: Merkja sem óleyst
       no_one_assigned: Enginn
       notes:
@@ -749,6 +764,7 @@ is:
       actions:
         delete_statuses: "%{name} eyddi færslum frá %{target}"
         disable: "%{name} frysti aðganginn %{target}"
+        mark_statuses_as_sensitive: "%{name} merkti færslur frá %{target} sem viðkvæmar"
         none: "%{name} sendi aðvörun til %{target}"
         sensitive: "%{name} merkti efni frá %{target} sem viðkvæmt"
         silence: "%{name} takmarkaði aðganginn %{target}"
@@ -774,6 +790,7 @@ is:
       links:
         allow: Leyfa tengil
         allow_provider: Leyfa útgefanda
+        description_html: Þetta eru tenglar/slóðir sem mikið er deilt af notendum sem netþjónninn þinn sér færslur frá. Þeir geta hjálpað notendunum þínu við að finna út hvað sé í gangi í heiminum. Engir tenglar birtast opinberlega fyrr en þú hefur samþykkt útgefanda þeirra. Þú getur líka leyft eða hafnað eintökum tenglum.
         disallow: Ekki leyfa tengil
         disallow_provider: Ekki leyfa útgefanda
         shared_by_over_week:
@@ -785,14 +802,17 @@ is:
       pending_review: Bíður eftir yfirlestri
       preview_card_providers:
         allowed: Tenglar frá þessum útgefanda geta verið með í vinsældum
+        description_html: Þetta eru lén þaðan sem tenglum er oftast deilt á netþjóninum þínum. Vinsældir tengla munu ekki aukast opinberlega nema lén þeirra sé samþykkt. Samþykki þitt (eða höfnun) nær einnig yfir undirlén.
         rejected: Tenglar frá þessum útgefanda verða ekki með í vinsældum
         title: Útgefendur
       rejected: Hafnað
       statuses:
         allow: Leyfa færslu
         allow_account: Leyfa höfund
+        description_html: Þetta eru færslur sem netþjónninn þinn veit að er víða deilt eða eru mikið sett í eftirlæti þessa stundina. Þær geta hjálpað nýjum sem eldri notendum þínum við að finna fleira fólk til að fylgjast með. Engar færslur birtast opinberlega fyrr en þú hefur samþykkt höfund þeirra og að viðkomandi höfundur leyfi að efni frá þeim sé notað í tillögur til annarra. Þú getur líka leyft eða hafnað eintökum færslum.
         disallow: Ekki leyfa færslu
         disallow_account: Ekki leyfa höfund
+        not_discoverable: Höfundur hefur ekki beðið um að vera finnanlegur
         shared_by:
           one: ShaDeilt eða gert að eftirlæti einu sinni
           other: Deilt eða gert að eftirlæti %{friendly_count} sinnum
@@ -805,6 +825,7 @@ is:
           tag_servers_dimension: Vinsælustu netþjónar
           tag_servers_measure: mismunandi netþjónar
           tag_uses_measure: tilvik alls
+        description_html: Þetta eru myllumerki sem birtast núna í mjög mörgum færslum sem netþjónninn þinn sér. Þau geta hjálpað notendunum þínu við að finna út hvað sé mest í umræðunni hjá öðru fólki. Engin myllumerki birtast opinberlega fyrr en þú hefur samþykkt þau.
         listable: Má stinga uppá
         not_listable: Mun ekki vera stungið uppá
         not_trendable: Mun ekki birtast í vinsældum
@@ -831,6 +852,7 @@ is:
       actions:
         delete_statuses: að eyða færslum viðkomandi
         disable: að frysta aðgang viðkomandi
+        mark_statuses_as_sensitive: að merkja færslur frá þeim sem viðkvæmar
         none: aðvörun
         sensitive: að merkja efni á aðgangnum sem viðkvæmt
         silence: að takmarka aðgang viðkomandi
@@ -933,8 +955,10 @@ is:
     status:
       account_status: Staða notandaaðgangs
       confirming: Bíð eftir að staðfestingu tölvupósts sé lokið.
+      functional: Notandaaðgangurinn þinn er með fulla virkni.
       pending: Umsóknin þín bíður eftir að starfsfólkið okkar fari yfir hana. Það gæti tekið nokkurn tíma. Þú munt fá tölvupóst ef umsóknin er samþykkt.
       redirecting_to: Notandaaðgangurinn þinn er óvirkur vegna þess að hann endurbeinist á %{acct}.
+      view_strikes: Skoða fyrri bönn notandaaðgangsins þíns
     too_fast: Innfyllingarform sent inn of hratt, prófaðu aftur.
     trouble_logging_in: Vandræði við að skrá inn?
     use_security_key: Nota öryggislykil
@@ -1010,6 +1034,7 @@ is:
         submit: Senda inn áfrýjun
       associated_report: Tengd kæra
       created_at: Dagsett
+      description_html: Þetta eru aðgerðir sem notaðar hafa verið gagnvart aðgangnum þínum og aðvaranir sem þér hafa verið sendar af umsjónarfólki á %{instance}.
       recipient: Stílað til
       status: 'Færsla #%{id}'
       status_removed: Færsla þegar fjarlægð úr kerfinu
@@ -1017,8 +1042,9 @@ is:
       title_actions:
         delete_statuses: Fjarlæging færslu
         disable: Frysting aðgangs
+        mark_statuses_as_sensitive: Merking færslna sem viðkvæmar
         none: Aðvörun
-        sensitive: Efni verður merkt sem viðkvæmt frá aðgangnum
+        sensitive: Merking notanda sem viðkvæms
         silence: Takmörkun aðgangs
         suspend: Setja aðgang í bið
       your_appeal_approved: Áfrýjun þín hefur verið samþykkt
@@ -1390,6 +1416,7 @@ is:
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur
     statuses_cleanup: Sjálfvirk eyðing færslna
+    strikes: Umsýsla refsinga
     two_factor_authentication: Tveggja-þátta auðkenning
     webauthn_authentication: Öryggislyklar
   statuses:
@@ -1469,6 +1496,7 @@ is:
       '2629746': 1 mánuður
       '31556952': 1 ár
       '5259492': 2 mánuðir
+      '604800': 1 vika
       '63113904': 2 ár
       '7889238': 3 mánuðir
     min_age_label: Aldursmörk
@@ -1616,26 +1644,28 @@ is:
         spam: Ruslpóstur
         violation: Efnið er á skjön við eftirfarandi leiðbeiningar til notenda
       explanation:
-        delete_statuses: Sumar færslur frá þér eru álitnar hafa gengið gegn samþykktum skilmálum vegna notkunar og hafa því stjórnendur fjarlægt þau af %{instance}. Brot sem framin verða hér eftir geta leitt til enn harðari aðgerða gegn notandaaðgangnum þínum.
+        delete_statuses: Sumar færslur frá þér eru álitnar hafa gengið gegn samþykktum skilmálum vegna notkunar og hafa því verið fjarlægðar af stjórnendum á %{instance}.
         disable: Þú getur ekki lengur notað aðganginn þinn, en notandasniðið þitt og önnur gögn eru óskemmd. Þú getur beðið um afrit af gögnunum þínum, getur breytt stillingum eða eytt aðgangnum þínum.
+        mark_statuses_as_sensitive: Sumar færslur frá þér hafa verið merktar sem viðkvæmt efni af stjórnendum á %{instance}. Þetta þýðir að fólk þarf að ýta á myndefnið til þess að forskoðunarmynd birtist. Þú getur framvegis sjálf/ur merkt myndefnið þitt sem viðkvæmt í færslunum þínum.
         sensitive: Héðan í frá verður allt myndefni sem þú sendir inn meðhöndlað sem viðkvæmt efni og falið á bakvið aðvörun sem smella þarf á.
         silence: Þú getur áfram notað aðganginn þinn en aðeins fólk sem þegar fylgist með þér mun sjá færslurnar þínar á þessum vefþjóni, auk þess sem lokað gæti verið á þig á ýmsum opinberum listum. Aftur á móti geta aðrir gerst fylgjendur þínir handvirkt.
         suspend: Þú getur ekki lengur notað aðganginn þinn og notandasniðið þitt og önnur gögn eru ekki lengur aðgengileg. Þú getur enn skráð þig inn til að biðja um afrit af gögnunum þínum þar til þeim verður eytt að fullu eftir 30 daga, við munum hinsvegar halda eftir einstaka grunnupplýsingum til að koma í veg fyrir að þú komist framhjá þessu banni.
-      get_in_touch: Ef þú álítur að um mistök sé að ræða, geturðu svarað þessum tölvupósti til að setja þig í samband við umsjónarmenn %{instance}.
       reason: 'Ástæða:'
-      statuses: 'Færslur sem álitnar eru að hafa gengið gegn samþykktum ákvæðum:'
+      statuses: 'Færslur sem vísað er í:'
       subject:
         delete_statuses: Færslurnar þínar á %{acct} hafa verið fjarlægðar
         disable: Notandaaðgangurinn þinn %{acct} hefur verið frystur
+        mark_statuses_as_sensitive: Færslur þínar á %{acct} hafa verið merktar sem viðkvæmar
         none: Aðvörun fyrir %{acct}
-        sensitive: Myndefnið þitt á %{acct} verður héðan í frá merkt sem viðkvæmt
+        sensitive: Færslur þínar á %{acct} verða héðan í frá merktar sem viðkvæmar
         silence: Notandaaðgangurinn þinn %{acct} hefur verið takmarkaður
         suspend: Notandaaðgangurinn þinn %{acct} hefur verið settur í bið
       title:
         delete_statuses: Færslur fjarlægðar
         disable: Notandaaðgangur frystur
+        mark_statuses_as_sensitive: Færslur merktar sem viðkvæmar
         none: Aðvörun
-        sensitive: Mynd er falin
+        sensitive: Notandaaðgangur merktur sem viðkvæmur
         silence: Notandaaðgangur takmarkaður
         suspend: Notandaaðgangur í bið
     welcome:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a5cab56a1..5c82b5207 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -16,6 +16,7 @@ it:
     contact: Contatti
     contact_missing: Non impostato
     contact_unavailable: N/D
+    continue_to_web: Continua all'app web
     discover_users: Scopri utenti
     documentation: Documentazione
     federation_hint_html: Con un account su %{instance} sarai in grado di seguire persone su qualsiasi server Mastodon e oltre.
@@ -25,6 +26,8 @@ it:
       Questo account è un attore virtuale utilizzato per rappresentare il server stesso e non un particolare utente.
       È utilizzato per scopi di federazione e non dovrebbe essere bloccato a meno che non si voglia bloccare l'intera istanza: in questo caso si dovrebbe utilizzare un blocco di dominio.
     learn_more: Scopri altro
+    logged_in_as_html: Sei correntemente connesso come %{username}.
+    logout_before_registering: Hai giù acceduto.
     privacy_policy: Politica della privacy
     rules: Regole del server
     rules_html: 'Di seguito è riportato un riassunto delle regole che devi seguire se vuoi avere un account su questo server di Mastodon:'
@@ -69,7 +72,6 @@ it:
     media: Media
     moved_html: "%{name} si è spostato su %{new_profile_link}:"
     network_hidden: Questa informazione non e' disponibile
-    never_active: Mai
     nothing_here: Qui non c'è nulla!
     people_followed_by: Persone seguite da %{name}
     people_who_follow: Persone che seguono %{name}
@@ -448,21 +450,6 @@ it:
       reject_media_hint: Rimuovi i file media salvati in locale e blocca i download futuri. Irrilevante per le sospensioni
       reject_reports: Respingi rapporti
       reject_reports_hint: Ignora tutti i rapporti provenienti da questo dominio. Irrilevante per sospensioni
-      rejecting_media: rigetta file media
-      rejecting_reports: rigetta segnalazioni
-      severity:
-        silence: silenziato
-        suspend: sospeso
-      show:
-        affected_accounts:
-          one: Interessato un solo account nel database
-          other: Interessati %{count} account nel database
-          zero: Nessun account nel database è interessato
-        retroactive:
-          silence: De-silenzia tutti gli account esistenti da questo dominio
-          suspend: Annulla la sospensione di tutti gli account esistenti da questo dominio
-        title: Annulla il blocco del dominio per %{domain}
-        undo: Annulla
       undo: Annulla
       view: Visualizza blocco di dominio
     email_domain_blocks:
@@ -493,23 +480,47 @@ it:
       title: Consigli su chi seguire
       unsuppress: Ripristina consigli su chi seguire
     instances:
+      availability:
+        description_html:
+          one: Se la consegna al dominio fallisce <strong>%{count} giorno</strong>, non sarà effettuato alcun tentativo di consegna ulteriore a meno che la consegna <em>dal</em> dominio non sia ricevuta.
+          other: Se la consegna al dominio fallisce <strong>%{count} giorni differenti</strong>, non sarà effettuato alcun tentativo di consegna ulteriore a meno che la consegna <em>dal</em> dominio non sia ricevuta.
+        failure_threshold_reached: Soglia di fallimento raggiunta il %{date}.
+        failures_recorded:
+          one: Tentativo fallito %{count} giorno.
+          other: Tentativo fallito %{count} giorni differenti.
+        no_failures_recorded: Nessun fallimento registrato.
+        title: Disponibilità
       back_to_all: Tutto
       back_to_limited: Limitato
       back_to_warning: Avviso
       by_domain: Dominio
       confirm_purge: Sei sicuro di voler cancellare definitivamente i dati di questo dominio?
+      content_policies:
+        comment: Nota interna
+        description_html: Puoi definire le politiche del contenuto che saranno applicate a tutti i profili da questo dominio e ognuno dei suoi sottodomini.
+        policies:
+          reject_media: Rifiuta multimedia
+          reject_reports: Rifiuta rapporti
+          silence: Limita
+          suspend: Sospendi
+        policy: Politica
+        reason: Motivo pubblico
+        title: Politiche sui contenuti
+      dashboard:
+        instance_accounts_dimension: Profili più seguiti
+        instance_accounts_measure: profili memorizzati
+        instance_followers_measure: i nostri seguaci lì
+        instance_follows_measure: i loro seguaci qui
+        instance_languages_dimension: Lingue preferite
+        instance_media_attachments_measure: allegati multimediali memorizzati
+        instance_reports_measure: segnalazioni su di loro
+        instance_statuses_measure: post memorizzati
       delivery:
         all: Tutto
         clear: Cancella errori di consegna
         restart: Riavvia la consegna
         stop: Interrompi consegna
-        title: Consegna
         unavailable: Non disponibile
-        unavailable_message: Consegna non disponibile
-        warning: Avviso
-        warning_message:
-          one: Errore di consegna %{count} giorno
-          other: Errori di consegna %{count} giorni
       delivery_available: Distribuzione disponibile
       delivery_error_days: Giorni con errori di consegna
       delivery_error_hint: Se la consegna non è possibile per %{count} giorni, sarà automaticamente contrassegnata come non consegnabile.
@@ -526,12 +537,14 @@ it:
       private_comment: Commento privato
       public_comment: Commento pubblico
       purge: Ripulisci
+      purge_description_html: Se credi che questo dominio sia offline per sempre, puoi eliminare tutti i registri del profilo e i dati associati da questo dominio dalla tua archiviazione. Questo potrebbe richiedere un po' di tempo.
       title: Istanze conosciute
       total_blocked_by_us: Bloccato da noi
       total_followed_by_them: Seguito da loro
       total_followed_by_us: Seguito da noi
       total_reported: Segnalazioni su di loro
       total_storage: Media allegati
+      totals_time_period_hint_html: I totali sotto visualizzati includono i dati per tutti i tempi.
     invites:
       deactivate_all: Disattiva tutto
       filter:
@@ -586,6 +599,7 @@ it:
       action_taken_by: Azione intrapresa da
       actions:
         delete_description_html: I post segnalati saranno eliminati e la violazione sarà registrata per aiutarti a prendere ulteriori provvedimenti sulle future infrazioni dello stesso account.
+        mark_as_sensitive_description_html: I media nei post segnalati saranno segnati come sensibili e la violazione sarà registrata per aiutarti a prendere ulteriori provvedimenti sulle future infrazioni dello stesso account.
         other_description_html: Vedi altre opzioni per controllare il comportamento dell'account e personalizzare la comunicazione all'account segnalato.
         resolve_description_html: Nessuna azione sarà intrapresa contro l'account segnalato, nessuna violazione registrata, e la segnalazione sarà chiusa.
         silence_description_html: Il profilo sarà visibile solo a coloro che lo seguono o lo cercano manualmente, limitandone fortemente la raggiungibilità. Può sempre essere annullato.
@@ -606,6 +620,7 @@ it:
       forwarded: Inoltrato
       forwarded_to: Inoltrato a %{domain}
       mark_as_resolved: Segna come risolto
+      mark_as_sensitive: Segna come sensibile
       mark_as_unresolved: Segna come non risolto
       no_one_assigned: Nessuno
       notes:
@@ -749,6 +764,7 @@ it:
       actions:
         delete_statuses: "%{name} ha eliminato i post di %{target}"
         disable: "%{name} ha congelato l'account di %{target}"
+        mark_statuses_as_sensitive: "%{name} ha segnato il media di %{target} come sensibile"
         none: "%{name} ha inviato un avviso a %{target}"
         sensitive: "%{name} ha contrassegnato l'account di %{target} come sensibile"
         silence: "%{name} ha limitato l'account di %{target}"
@@ -774,6 +790,7 @@ it:
       links:
         allow: Consenti link
         allow_provider: Consenti editore
+        description_html: Questi sono collegamenti che attualmente vengono molto condivisi dagli account di cui il server vede i post. Può aiutare i tuoi utenti a scoprire cosa sta succedendo nel mondo. Nessun link viene visualizzato pubblicamente finché non si approva chi lo pubblica. È anche possibile permettere o rifiutare i singoli collegamenti.
         disallow: Non consentire link
         disallow_provider: Non consentire editore
         shared_by_over_week:
@@ -785,14 +802,17 @@ it:
       pending_review: Revisione in sospeso
       preview_card_providers:
         allowed: I link da questa fonte possono essere in tendenza
+        description_html: Questi sono domini da cui i link sono spesso condivisi sul tuo server. I link non appariranno di tendenza se il dominio del link non è approvato. La tua approvazione (o rifiuto) si estende ai sottodomini.
         rejected: I link da questa fonte non possono essere in tendenza
         title: Editori
       rejected: Rifiutato
       statuses:
         allow: Consenti post
         allow_account: Consenti autore
+        description_html: Questi sono post noti al tuo server che sono attualmente molto condivisi e preferiti. Può aiutare i tuoi utenti (nuovi e non) a trovare più persone da seguire. Nessun post viene visualizzato pubblicamente fino a quando si approva l'autore, e l'autore permette che il suo account sia suggerito ad altri. È anche possibile permettere o rifiutare singoli post.
         disallow: Non consentire post
         disallow_account: Non consentire autore
+        not_discoverable: L'autore non ha optato di essere scopribile
         shared_by:
           one: Condiviso o preferito una volta
           other: Condiviso e preferito %{friendly_count} volte
@@ -805,6 +825,7 @@ it:
           tag_servers_dimension: Server migliori
           tag_servers_measure: server diversi
           tag_uses_measure: usi totali
+        description_html: Questi sono hashtag che attualmente compaiono in molti post che il tuo server vede. Può aiutare i tuoi utenti a scoprire di cosa le persone stanno parlando di più al momento. Nessun hashtag viene visualizzato pubblicamente finché non lo approvi.
         listable: Suggeribile
         not_listable: Non sarà suggerito
         not_trendable: Non apparirà nelle tendenze
@@ -831,6 +852,7 @@ it:
       actions:
         delete_statuses: per cancellare i loro post
         disable: per congelare il loro account
+        mark_statuses_as_sensitive: per contrassegnare i loro post come sensibili
         none: avviso
         sensitive: per contrassegnare il loro account come sensibile
         silence: per limitare il loro account
@@ -935,8 +957,10 @@ it:
     status:
       account_status: Stato dell'account
       confirming: In attesa che la conferma e-mail sia completata.
+      functional: Il tuo profilo è completamente operativo.
       pending: La tua richiesta è in attesa di esame da parte del nostro staff. Potrebbe richiedere un po' di tempo. Riceverai una e-mail se la richiesta è approvata.
       redirecting_to: Il tuo account è inattivo perché attualmente reindirizza a %{acct}.
+      view_strikes: Visualizza gli avvisi passati contro il tuo profilo
     too_fast: Modulo inviato troppo velocemente, riprova.
     trouble_logging_in: Problemi di accesso?
     use_security_key: Usa la chiave di sicurezza
@@ -1012,6 +1036,7 @@ it:
         submit: Presenta un appello
       associated_report: Segnalazione associata
       created_at: Data
+      description_html: Queste sono azioni intraprese contro il tuo profilo e avvisi inviati a te dallo staff di %{instance}.
       recipient: Indirizzata a
       status: 'Post #%{id}'
       status_removed: Post già rimosso dal sistema
@@ -1019,6 +1044,7 @@ it:
       title_actions:
         delete_statuses: Eliminazione del post
         disable: Congelamento dell'account
+        mark_statuses_as_sensitive: Marcatura dei post come sensibili
         none: Avviso
         sensitive: Marcatura dell'account come sensibile
         silence: Limitazione dell'account
@@ -1392,6 +1418,7 @@ it:
     profile: Profilo
     relationships: Follows e followers
     statuses_cleanup: Cancellazione automatica dei post
+    strikes: Avvisi di moderazione
     two_factor_authentication: Autenticazione a due fattori
     webauthn_authentication: Chiavi di sicurezza
   statuses:
@@ -1471,6 +1498,7 @@ it:
       '2629746': 1 mese
       '31556952': 1 anno
       '5259492': 2 mesi
+      '604800': 1 settimana
       '63113904': 2 anni
       '7889238': 3 mesi
     min_age_label: Soglia di età
@@ -1621,26 +1649,28 @@ it:
         spam: Spam
         violation: Il contenuto viola le seguenti linee guida della comunità
       explanation:
-        delete_statuses: Alcuni dei tuoi post sono in violazione di una o più linee guida della comunità, e quindi sono stati eliminati dai moderatori di %{instance}. Le future violazioni possono comportare azioni punitive più severe contro il tuo account.
+        delete_statuses: Alcuni dei tuoi post sono stati riconosciuti in violazione di una o più linee guida della comunità e sono stati successivamente rimossi dai moderatori di %{instance}.
         disable: Non puoi più utilizzare il tuo account, ma il tuo profilo e gli altri dati rimangono intatti. Puoi richiedere un backup dei tuoi dati, modificare le impostazioni dell'account o eliminare il tuo account.
+        mark_statuses_as_sensitive: Alcuni dei tuoi post sono stati contrassegnati come sensibili dai moderatori di %{instance}. Ciò significa che le persone dovranno toccare i media nei post prima che venga visualizzata un'anteprima. Puoi contrassegnare tu i media come sensibili quando ne pubblicherai in futuro.
         sensitive: D'ora in poi, tutti i file multimediali che hai caricato saranno contrassegnati come sensibili e nascosti dietro un avviso click-through.
         silence: Puoi ancora utilizzare il tuo account, ma solo le persone che già ti seguono possono vedere i tuoi post su questo server, e potresti essere escluso da varie funzionalità di ricerca. Gli altri utenti possono comunque seguirti manualmente.
         suspend: Non puoi più utilizzare il tuo account, e il tuo profilo e gli altri dati non sono più accessibili. Puoi ancora effettuare il login per richiedere un backup dei dati fino a quando i dati non saranno completamente cancellati nei prossimi 30 giorni, ma conserveremo alcuni dati di base per impedirti di eludere la sospensione.
-      get_in_touch: Se credi che questo sia un errore, puoi rispondere a questa e-mail per metterti in contatto con lo staff di %{instance}.
       reason: 'Motivo:'
-      statuses: 'Post che sono stati trovati in violazione:'
+      statuses: 'Post citati:'
       subject:
         delete_statuses: I tuoi post su %{acct} sono stati eliminati
         disable: Il tuo account %{acct} è stato congelato
+        mark_statuses_as_sensitive: I tuoi post su %{acct} sono stati contrassegnati come sensibili
         none: Avviso per %{acct}
-        sensitive: I tuoi file multimediali su %{acct} d'ora in poi saranno contrassegnati come sensibili
+        sensitive: I tuoi post su %{acct} d'ora in poi saranno contrassegnati come sensibili
         silence: Il tuo account %{acct} è stato limitato
         suspend: Il tuo account %{acct} è stato sospeso
       title:
         delete_statuses: Post eliminati
         disable: Account congelato
+        mark_statuses_as_sensitive: Post contrassegnati come sensibili
         none: Avviso
-        sensitive: Media nascosto
+        sensitive: Account contrassegnato come sensibile
         silence: Account limitato
         suspend: Account sospeso
     welcome:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 99428d7de..7f518b41e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -16,6 +16,7 @@ ja:
     contact: 連絡先
     contact_missing: 未設定
     contact_unavailable: N/A
+    continue_to_web: アプリで続ける
     discover_users: ユーザーを見つける
     documentation: ドキュメント
     federation_hint_html: "%{instance} のアカウントひとつでどんなMastodon互換サーバーのユーザーでもフォローできるでしょう。"
@@ -23,6 +24,8 @@ ja:
     hosted_on: Mastodon hosted on %{domain}
     instance_actor_flash: "このアカウントはサーバーそのものを示す仮想的なもので、特定のユーザーを示すものではありません。これはサーバーの連合のために使用されます。サーバー全体をブロックするときは、このアカウントをブロックせずに、ドメインブロックを使用してください。 \n"
     learn_more: もっと詳しく
+    logged_in_as_html: "%{username} としてログインしています。"
+    logout_before_registering: 既にログインしています。
     privacy_policy: プライバシーポリシー
     rules: サーバーのルール
     rules_html: 'このMastodonサーバーには、アカウントの所持にあたって従うべきルールが設定されています。概要は以下の通りです:'
@@ -64,7 +67,6 @@ ja:
     media: メディア
     moved_html: "%{name} さんは引っ越しました %{new_profile_link}:"
     network_hidden: この情報は利用できません
-    never_active: 活動なし
     nothing_here: 何もありません!
     people_followed_by: "%{name} さんがフォロー中のアカウント"
     people_who_follow: "%{name} さんをフォロー中のアカウント"
@@ -432,17 +434,6 @@ ja:
       reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
       reject_reports: 通報を拒否
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
-      rejecting_media: メディアファイルを拒否中
-      rejecting_reports: 通報を拒否中
-      severity:
-        silence: サイレンス中
-        suspend: 停止中
-      show:
-        retroactive:
-          silence: このドメインの既存の影響するアカウントのサイレンスを戻す
-          suspend: このドメインの既存の影響するアカウントの停止を戻す
-        title: "%{domain}のドメインブロックを戻す"
-        undo: 元に戻す
       undo: ドメインブロックを戻す
       view: ドメインブロックを表示
     email_domain_blocks:
@@ -477,12 +468,7 @@ ja:
         clear: 配送エラーをクリア
         restart: 配送を再開
         stop: 配送を停止
-        title: 配送
         unavailable: 配送不可
-        unavailable_message: 配送不可
-        warning: 警告あり
-        warning_message:
-          other: "%{count} 日配送失敗"
       delivery_available: 配送可能
       delivery_error_days: 配送エラー発生日
       delivery_error_hint: "%{count} 日間配送ができない場合は、自動的に配送不可としてマークされます。"
@@ -570,6 +556,7 @@ ja:
       forwarded: 転送済み
       forwarded_to: "%{domain} に転送されました"
       mark_as_resolved: 解決済みとしてマーク
+      mark_as_sensitive: 閲覧注意にする
       mark_as_unresolved: 未解決に戻す
       no_one_assigned: なし
       notes:
@@ -740,6 +727,9 @@ ja:
         rejected: この発行者からのリンクを拒否
         title: 発行者
       rejected: 拒否
+      statuses:
+        allow: 投稿を許可する
+        disallow: 投稿を許可しない
       tags:
         current_score: 現在のスコア %{score}
         dashboard:
@@ -769,6 +759,7 @@ ja:
     new_appeal:
       actions:
         none: 警告
+        sensitive: アカウントを閲覧注意にする
     new_pending_account:
       body: 新しいアカウントの詳細は以下の通りです。この申請を承認または却下することができます。
       subject: "%{instance} で新しいアカウント (%{username}) が承認待ちです"
@@ -834,6 +825,7 @@ ja:
     invalid_reset_password_token: パスワードリセットトークンが正しくないか期限切れです。もう一度リクエストしてください。
     link_to_otp: 携帯電話から二段階認証コードを入力するか、リカバリーコードを入力してください
     link_to_webauth: セキュリティキーを使用する
+    log_in_with: 次の方法でログイン
     login: ログイン
     logout: ログアウト
     migrate_account: 別のアカウントに引っ越す
@@ -1362,6 +1354,7 @@ ja:
       '2629746': 1ヶ月
       '31556952': 1年
       '5259492': 2ヶ月
+      '604800': 1 週間
       '63113904': 2年
       '7889238': 3ヶ月
     min_age_label: 投稿を保持する期間
@@ -1501,7 +1494,6 @@ ja:
         spam: スパム
         violation: コンテンツは以下のコミュニティガイドラインに違反しています
       explanation:
-        delete_statuses: あなたの投稿のいくつかは、1つ以上のコミュニティガイドラインに違反していることが判明し、 %{instance} のモデレータによって削除されました。 今後の違反は、より厳しい処罰が行われる可能性があります。
         disable: アカウントは使用できませんが、プロフィールやその他のデータはそのまま残ります。 データのバックアップをリクエストしたり、アカウント設定を変更したり、アカウントを削除したりできます。
         sensitive: 今後、アップロードされたすべてのメディアファイルは閲覧注意してマークされ、クリックスルー警告の背後に隠されます。
         silence: アカウントが制限されています。このサーバーでは既にフォローしている人だけがあなたの投稿を見ることができます。 様々な発見機能から除外されるかもしれません。他の人があなたを手動でフォローすることは可能です。
@@ -1515,7 +1507,6 @@ ja:
         delete_statuses: 投稿が削除されました
         disable: アカウントが凍結されました
         none: 警告
-        sensitive: メディアが非表示にされました
         silence: アカウントがサイレンスにされました
         suspend: アカウントが停止されました
     welcome:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 48b3c227d..ab8ba6ec3 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -171,12 +171,6 @@ ka:
         title: ახალი დომენის ბლოკი
       reject_media: მედია ფაილების უარყოფა
       reject_media_hint: შლის ლოკალურად შენახულ მედია ფაილებს და უარყოფს სამომავლო გადმოტვირთებს. შეუსაბამო შეჩერებებისთვის
-      show:
-        retroactive:
-          silence: ამ დომენში ყველა არსებულ ანგარიშზე გაჩუმების მოშორება
-          suspend: ამ დომენში ყველა არსებულ ანგარიშზე შეჩერების მოშორება
-        title: უკუაქციეთ დომენის ბლოკი %{domain} დომენზე
-        undo: უკუქცევა
       undo: უკუქცევა
     email_domain_blocks:
       add_new: ახლის დამატება
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 169f69492..d43a1c8c2 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -55,7 +55,6 @@ kab:
     media: Taɣwalt
     moved_html: 'ibeddel %{name} amiḍan ɣer %{new_profile_link}:'
     network_hidden: Ulac isalli-agi
-    never_active: Werǧin
     nothing_here: Ulac kra da!
     people_followed_by: Imdanen i yeṭṭafaṛ %{name}
     people_who_follow: Imdanen yeṭṭafaṛen %{name}
@@ -330,13 +329,6 @@ kab:
       public_comment: Awennit azayez
       reject_media: Agi ifuyla n umidya
       reject_reports: Agi ineqqisen
-      rejecting_media: agami n yifuyla n umidya
-      rejecting_reports: agami n yineqqisen
-      severity:
-        silence: yettwasgugem
-        suspend: yeḥbes
-      show:
-        undo: Sefsex
       undo: Sefsex iḥder n taɣult
       view: Sken-d iḥder n taɣult
     email_domain_blocks:
@@ -360,10 +352,7 @@ kab:
         clear: Sfeḍ tuccḍiwin n usiweḍ
         restart: Ales asiweḍ
         stop: Seḥbes asiweḍ
-        title: Asiweḍ
         unavailable: Ur yelli ara
-        unavailable_message: Asiweḍ ur yelli ara
-        warning: Aneddeh
       delivery_available: Yella usiweḍ
       delivery_error_days: Ussan n tuccḍiwin n usiweḍ
       empty: Ulac taɣultin yettwafen.
@@ -818,6 +807,7 @@ kab:
       '2629746': 1 n wayyur
       '31556952': 1 n useggas
       '5259492': 2 n wayyuren
+      '604800': 1 week
       '63113904': 2 n yiseggasen
       '7889238': 3 n wayyuren
   stream_entries:
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 3e6615956..d72d10a5f 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -62,7 +62,6 @@ kk:
     media: Медиа
     moved_html: "%{name} мына жерге көшті %{new_profile_link}:"
     network_hidden: Бұл ақпарат қолжетімді емес
-    never_active: Ешқашан
     nothing_here: Бұл жерде ештеңе жоқ!
     people_followed_by: "%{name} жазылған адамдар"
     people_who_follow: "%{name} атты қолданушының оқырмандары"
@@ -260,17 +259,6 @@ kk:
       reject_media_hint: Жергілікті сақталған мультимедиалық файлдарды жояды және болашақта кез келген жүктеуден бас тартады. Суспензияға байланысты емес
       reject_reports: Шағым қабылдамау
       reject_reports_hint: Бұл доменнен келген барлық есептерді елемеңіз. Суспензияға байланысты емес
-      rejecting_media: медиа файлдарды қабылдамау
-      rejecting_reports: шағымдарды қабылдамау
-      severity:
-        silence: үнсіз
-        suspend: тоқтатылған
-      show:
-        retroactive:
-          silence: Осы домендегі бар тіркелгілерді жою
-          suspend: Осы домендегі бар барлық тіркелгілерді тоқтатыңыз
-        title: "%{domain} доменіндегі блокты алып таста"
-        undo: Қайтару
       undo: Домен блокын қайтып алу
       view: Домен блокын көрсету
     email_domain_blocks:
diff --git a/config/locales/kmr.yml b/config/locales/kmr.yml
index 6ee62729c..8d90b1e42 100644
--- a/config/locales/kmr.yml
+++ b/config/locales/kmr.yml
@@ -16,6 +16,7 @@ kmr:
     contact: Têkilî
     contact_missing: Nehate sazkirin
     contact_unavailable: N/A
+    continue_to_web: Bo malpera sepanê bidomîne
     discover_users: Bikarhêneran keşf bike
     documentation: Pelbend
     federation_hint_html: Bi ajimêrê xwe %{instance} re tu dikarî kesên rajekar û li derveyî mastodonê bişopînî.
@@ -25,6 +26,8 @@ kmr:
 
       '
     learn_more: Bêtir fêr bibe
+    logged_in_as_html: Tu niha wekî %{username} têketî ye.
+    logout_before_registering: Jixwe te berê têketin kiriye.
     privacy_policy: Polîtikaya nihêniyê
     rules: Rêbazên rajekar
     rules_html: 'Heger tu bixwazî ajimêrekî li ser rajekarê mastodon vebikî, li jêrê de kurtasî ya qaîdeyên ku tu guh bidî heye:'
@@ -69,7 +72,6 @@ kmr:
     media: Medya
     moved_html: "%{name} bar kire %{new_profile_link}:"
     network_hidden: Ev zanyarî berdest nîne
-    never_active: Tu car
     nothing_here: Li vir tiştek tune ye!
     people_followed_by: Kesên ku%{name} wan dişopîne
     people_who_follow: Kesên%{name} dişopîne
@@ -450,21 +452,6 @@ kmr:
       reject_media_hint: Pelên medyayê herêmî hatine tomarkirin radike û di pêşerojê de daxistinê red dike. Ji bo rawstandinê ne girîng e
       reject_reports: Ragihandinan red bike
       reject_reports_hint: Ragihandinên ku ji vê navperê tê paşguh bike. Ji bo dûrbûnê re ne guncav e
-      rejecting_media: pelên medyayê red bike
-      rejecting_reports: ragihandinê red bike
-      severity:
-        silence: sînorkirî
-        suspend: hatiye rawestandin
-      show:
-        affected_accounts:
-          one: Yek ajimêr di danegehê de bandor kir
-          other: "%{count} ajimêr di danegehê de bandor kir"
-          zero: Yek ajimêr di danegehê de bi bandor e
-        retroactive:
-          silence: Vê navperê de sînorê li ser hemî ajimêran rabike
-          suspend: Vê navperê de rawestandinê li ser hemî ajimêran rabike
-        title: Ji bo navperê %{domain} asteng kirinê hilde
-        undo: Vegerîne
       undo: Astengkirina navperê vegerîne
       view: Astengkirina navperê nîşan bike
     email_domain_blocks:
@@ -505,13 +492,7 @@ kmr:
         clear: Çewtiyên gihandinê paqij bike
         restart: Gihandinê nû va bike
         stop: Gehandinê rawestîne
-        title: Gihiştin
         unavailable: Nederbasdar
-        unavailable_message: Gihandin berdest nîne
-        warning: Hişyarî
-        warning_message:
-          one: Sernekeftina radestkirinê %{count} roj
-          other: Sernekeftina radestkirinê %{count} roj
       delivery_available: Gihandin berdest e
       delivery_error_days: Rojên çewtiyên gehandinê
       delivery_error_hint: Ger gehandin %{count} rojan ne pêkan be ewê wek bixweber wê nayê gehandin were nîşandan.
@@ -588,6 +569,7 @@ kmr:
       action_taken_by: Çalakî hate kirin ji aliyê
       actions:
         delete_description_html: Şandiyên hatine ragihandin wê werin jêbirin û were tomarkirin da ku ji te re bibe alîkar ku tu ji hêla heman ajimêrê ve binpêkirinên pêşerojê bêtir bikî.
+        mark_as_sensitive_description_html: Şandiyên hatine ragihandin wê werin nîşandan wekî hestyar û were tomarkirin da ku ji te re bibe alîkar ku tu ji hêla heman ajimêrê ve binpêkirinên pêşerojê bêtir bikî.
         other_description_html: Bêtir vebijêrkên ji bo kontrolkirina tevgera ajimêrê bibîne û pêwendiyê li ser ajimêra ragihandî kesane bike.
         resolve_description_html: Li hemberî ajimêra hatiye ragihandin wê tiştek pêk neyê, binpêkirin nayên tomarkirin û ragihandin wê were girtin.
         silence_description_html: Wê profîl tenê ji kesên ku berê te dişopînin an ji bi destan lê serî lê didin re xuya bibe, gihandina wê bi tundî sînordar dike. Her gav dikare were vegerandin.
@@ -608,6 +590,7 @@ kmr:
       forwarded: Beralîkirî
       forwarded_to: Beralîkirî bo %{domain}
       mark_as_resolved: Wekî çareserkirî nîşan bide
+      mark_as_sensitive: Wekî hestiyar nîşan bide
       mark_as_unresolved: Wekî neçareserkirî nîşan bide
       no_one_assigned: Ne yek
       notes:
@@ -751,6 +734,7 @@ kmr:
       actions:
         delete_statuses: "%{name} şandiyên %{target} jêbirin"
         disable: "%{name} ajimêr %{target} cemidand"
+        mark_statuses_as_sensitive: "%{name} medyayê %{target} wekî hestiyar nîşan kir"
         none: "%{name} ji bo %{target} hişyariyek şand"
         sensitive: "%{name} ajimêrê %{target} wekî hestiyarî nîşan kir"
         silence: "%{name} ajimêra %{target} bi sînor kir"
@@ -776,6 +760,7 @@ kmr:
       links:
         allow: Mafê bide girêdanê
         allow_provider: Mafê bide weşanger
+        description_html: Van girêdanên ku niha ji hêla ajimêrên ku rajekarê te ji wan peyaman dibîne pir têne parvekirin. Ew dikare ji bikarhênerên te re bibe alîkar ku fêr bibin ka li cîhanê çi diqewime. Heya ku tu weşanger nepejirînin, ti girêdan bi gelemperî nayê xuyangkirin. Her weha tu dikarî mafê bidî girêdanên kesane an jî nedî.
         disallow: Mafê nede girêdanê
         disallow_provider: Mafê nede weşanger
         shared_by_over_week:
@@ -787,14 +772,17 @@ kmr:
       pending_review: Li benda nirxandinê ye
       preview_card_providers:
         allowed: Girêdanên ji vê weşangerê dikarin bibin rojev
+        description_html: Ev navperên ku ji wan girêdanên bi gelemperî li ser rajekarê te têne parvekirin. Heya ku girêdana rojevê neyê pejirandin, girêdan wê ji raya giştî re nebin rojev. Pejirandina (an nepejirandina) te berbi jêrnavperan ve diçe.
         rejected: Girêdanên ji vê weşangerê nikarin bibin rojev
         title: Weşanger
       rejected: Nepejirand
       statuses:
         allow: Mafê bide şandiyê
         allow_account: Mafê bide nivîskar
+        description_html: Van şandiyên ku rajekarê te pê dizane ku niha pir têne parvekirin û bijartekirin. Ew dikare ji bikarhênerên te yên nû û yên vedigerin re bibe alîkar ku bêtir mirovên ku bişopînin bibînin. Heya ku tu nivîskar nepejirînî, tu şandî bi gelemperî nayên xuyangkirin, û nivîskar mafê dide ku ajimêrê xwe ji kesên din re were pêşniyarkirin. Her weha tu dikarî mafê bidî şandiyên kesane an jî nedî.
         disallow: Mafê nede şandiyê
         disallow_account: Mafê nede nivîskar
+        not_discoverable: Nivîskar nejilbijartiye ji bo ku were kifşkirin
         shared_by:
           one: Yek carî parvekirî an bijartî
           other: "%{friendly_count} carên parvekirî û bijartî"
@@ -807,6 +795,7 @@ kmr:
           tag_servers_dimension: Rajekarên pir tên bikaranîn
           tag_servers_measure: rajekarên cuda
           tag_uses_measure: bikaranîna giştî
+        description_html: Ev hashtag in ku niha di gelek şandiyên ku rajekarê te dibîne de xuya dibin. Ew dikare ji bikarhênerên te re bibe alîkar ku fêr bibin ka mirov di vê demê de herî pir li ser çi diaxive. Heya ku tu wan nepejirînî, tu hashtag bi gelemperî nayê xuyangkirin.
         listable: Dikare were pêşniyarkirin
         not_listable: Nikare wer pêşniyarkirin
         not_trendable: Wê di bin rojevan de xuya neke
@@ -833,6 +822,7 @@ kmr:
       actions:
         delete_statuses: ku şandiyên wan jê bibî
         disable: ku ajimêrê wan bicemidînî
+        mark_statuses_as_sensitive: ku şandiyê wan wekî hestyar nîşan bikî
         none: hişyariyek
         sensitive: ku ajimêrê wan wekî hestyar nîşan bikî
         silence: ku ajimêrê wan sînordar bikî
@@ -935,8 +925,10 @@ kmr:
     status:
       account_status: Rewşa ajimêr
       confirming: Li benda pejirandina e-nameyê ne da ku biqede.
+      functional: Ajimêra te êdî amade ye.
       pending: Daxwaza te li benda vekolînê ji hêla xebatkarên me ye. Ev dibe ku hinek dem bigire. Heke daxwaza te were pejirandin tu yê e-nameyekê bistîne.
       redirecting_to: Ajimêra te neçalak e ji ber ku niha ber bi %{acct} ve tê beralîkirin.
+      view_strikes: Binpêkirinên berê yên dijî ajimêrê xwe bibîne
     too_fast: Form pir zû hat şandin, dîsa biceribîne.
     trouble_logging_in: Têketina te de pirsgirêk çêdibe?
     use_security_key: Kilîteke ewlehiyê bikar bîne
@@ -1012,6 +1004,7 @@ kmr:
         submit: Îtîrazê bişîne
       associated_report: Ragihandina têkildar
       created_at: Dîrok
+      description_html: Ev kiryarên ku li dijî ajimêrê te hatine kirin û hişyariyên ku ji hêla xebatkarên %{instance} ve ji te re hatine şandinin.
       recipient: Ji kê re
       status: 'Şandî #%{id}'
       status_removed: Şandî jixwe ji pergalê hatî rakirin
@@ -1019,8 +1012,9 @@ kmr:
       title_actions:
         delete_statuses: Jêbirina şandiyê
         disable: Cemdandina ajimêrê
+        mark_statuses_as_sensitive: Nîşankirina şandiyan wekî hestyar
         none: Hişyarî
-        sensitive: Nîşankirina ajimêr wekî hestyar
+        sensitive: Nîşankirina ajimêran wekî hestyar
         silence: Sînorkirina ajimêrê
         suspend: Rawestandina ajimêrê
       your_appeal_approved: Îtîraza te hate pejirandin
@@ -1117,7 +1111,7 @@ kmr:
       blocking: Rêzoka astengkirinê
       bookmarks: Şûnpel
       domain_blocking: Rêzoka navperên astengkirî
-      following: Rêzoka yên tên şopandin
+      following: Rêzoka yên dişopînin
       muting: Rêzoka bêdengiyê
     upload: Bar bike
   in_memoriam_html: Di bîranînê de.
@@ -1392,6 +1386,7 @@ kmr:
     profile: Profîl
     relationships: Yên tê şopandin û şopîner
     statuses_cleanup: Bi xweberî va jê birina şandiya
+    strikes: Binpêkirinên çavdêriyê
     two_factor_authentication: Piştrastkirinê du-faktorî
     webauthn_authentication: Kilîdên ewlehiyê
   statuses:
@@ -1471,6 +1466,7 @@ kmr:
       '2629746': 1 meh
       '31556952': 1 sal
       '5259492': 2 meh
+      '604800': 1 hefte
       '63113904': 2 sal
       '7889238': 3 meh
     min_age_label: Şêmûga demê
@@ -1618,26 +1614,28 @@ kmr:
         spam: Nexwestî (Spam)
         violation: Naverok rêbazên civakê yên jêrîn binpê dike
       explanation:
-        delete_statuses: Hate dîtin ku hinek nivîsên te yek an çend rêbazên civakê binpê dikin û dû re ji hêla çavdêran %{instance} ve hatine rakirin. Binpêkirinên di pêşerojê dibe ku li dijî ajimêra te bibe sedema kiryarên cezayê tundtir.
+        delete_statuses: Hate dîtin ku hinek şandiyên te yek an jî çend rêwerzên civatê binpê dikin û dû re ji hêla çavdêrên %{instance} ve hatine rakirin.
         disable: Tu êdî nikarî ajimêra xwe bi kar bînî, lê profîla te û daneyên din bê ziyan dimînin. Tu dikarî ji daneyên xwe hilanînê bixwazî, sazkariyên ajimêrê biguherîmî an jî ajimêrê xwe jê bibî.
+        mark_statuses_as_sensitive: Hinek şandiyên te ji hêla çavdêrên %{instance} ve wekî hestyar hatine nîşankirin. Ev tê vê wateyê ku berî ku pêşdîtinek were xuyang kirin pêdivî ye ku mirov di nav şandiyan de bitikînî. Dema ku di pêşerojê de bişînî tu dikarî medyayê wekî xwe hestyar nîşan bikî.
         sensitive: Ji niha û pê ve, hemû pelên te yên medyayê yên hatine barkirin wê li piştî hişyariyek wekî hestyar û veşartî bêne nîşankirin.
         silence: Tu hîn jî dikarî ajimêra xwe bi kar bînî lê tenê kesên ku jixwe te dişopînin wê şandiyên te li ser vê rajekarê bibînin, û dibe ku tu ji cûrbecûr taybetmendiyên vedîtinê werî bi dûrxistin. Lêbelê, yên din hîn jî dikarin bi destan te bişopînin.
         suspend: Tu êdî nikarî têkevî ajimêra xwe, û profîla te û daneyên din êdî nayên gihîştin. Dîsa jî tu dikarî têkevî da ku hilanîna daneyên xwe daxwaz bikî heya ku dane bi tevahî werin rakirin di hundirê 30 roj de, lê em ê hin daneyan biparêzin da ku tu ji rawestandinê rizgar bikî.
-      get_in_touch: Ku tu bawer dikî ev çewtiyeke, tu dikarî bersiva vê e-nameyê bidî ku bi xebatkarên %{instance} re têkevî pêwendiyê.
       reason: 'Sedem:'
-      statuses: 'Şandiyên ku di binpêkirinê de hatine dîtin:'
+      statuses: 'Şandiyên binavkirî:'
       subject:
         delete_statuses: Şandiyên te yên li ser %{acct} hatin rakirin
         disable: Ajimêra te a %{acct} hat qerisandin
+        mark_statuses_as_sensitive: Şandiyên te yên li ser %{acct} wekî hestyar hatine nîşankirin
         none: Hişyarî bo %{acct}
-        sensitive: Pelên te yên medyayê yên li ser %{acct} wê ji niha û pê ve wekî hestyar bêne nîşankirin
+        sensitive: Şandiyên te yên li ser %{acct} wê ji niha û pê ve wekî hestyar bêne nîşankirin
         silence: Ajimêra te ya %{acct} hate bisînorkirin
         suspend: Ajimêra te %{acct} hate rawestandin
       title:
         delete_statuses: Şandî hatin rakirin
         disable: Ajimêr hate qerisandin
+        mark_statuses_as_sensitive: Şandî wekî hestyar hatine nîşankirin
         none: Hişyarî
-        sensitive: Medya veşartî ye
+        sensitive: Ajimêr wekî hestyar hate nîşankirin
         silence: Ajimêr sînor kiriye
         suspend: Ajimêr hatiye rawestandin
     welcome:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d905fb606..889f8eed4 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -16,6 +16,7 @@ ko:
     contact: 연락처
     contact_missing: 미설정
     contact_unavailable: 없음
+    continue_to_web: 웹앱에서 계속하기
     discover_users: 유저 발견하기
     documentation: 문서
     federation_hint_html: "%{instance}에 계정을 만드는 것으로 모든 마스토돈 서버, 그리고 호환 되는 모든 서버의 사용자를 팔로우 할 수 있습니다."
@@ -25,6 +26,8 @@ ko:
       이 계정은 가상의 actor로서 개인 유저가 아닌 서버 자체를 나타냅니다.
       이것은 페더레이션을 목적으로 사용 되며 인스턴스 전체를 차단하려 하지 않는 이상 차단하지 않아야 합니다, 그 경우에는 도메인 차단을 사용하세요.
     learn_more: 자세히
+    logged_in_as_html: 현재 %{username}으로 로그인 했습니다.
+    logout_before_registering: 이미 로그인 했습니다.
     privacy_policy: 개인정보 정책
     rules: 서버 규칙
     rules_html: '아래의 글은 이 마스토돈 서버에 계정이 있다면 따라야 할 규칙의 요약입니다:'
@@ -66,7 +69,6 @@ ko:
     media: 미디어
     moved_html: "%{name}은 %{new_profile_link}으로 이동되었습니다:"
     network_hidden: 이 정보는 사용할 수 없습니다
-    never_active: 없음
     nothing_here: 아무 것도 없습니다!
     people_followed_by: "%{name} 님이 팔로우 중인 계정"
     people_who_follow: "%{name} 님을 팔로우 중인 계정"
@@ -442,57 +444,73 @@ ko:
       reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지와는 관계 없습니다
       reject_reports: 신고 거부
       reject_reports_hint: 이 도메인으로부터의 모든 신고를 무시합니다. 정지와는 무관합니다
-      rejecting_media: 미디어 거부
-      rejecting_reports: 신고 거부
-      severity:
-        silence: 침묵
-        suspend: 정지
-      show:
-        affected_accounts:
-          one: 데이터베이스 내부의 1개의 계정에 영향을 끼칩니다
-          other: 데이터베이스 내부의 %{count} 개의 계정에 영향을 끼칩니다
-          zero: 데이터베이스 내부의 영향을 끼치는 계정이 없습니다
-        retroactive:
-          silence: 이 도메인에 존재하는 모든 계정의 침묵를 해제
-          suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
-        title: "%{domain}의 도메인 차단을 해제"
-        undo: 실행 취소
       undo: 도메인 차단 취소
       view: 도메인 차단 보기
     email_domain_blocks:
       add_new: 새로 추가
+      attempts_over_week:
+        other: 지난 주 동안 %{count} 건의 가입 시도가 있었습니다
       created_msg: 이메일 도메인 차단 규칙을 생성했습니다
       delete: 삭제
+      dns:
+        types:
+          mx: MX 레코드
       domain: 도메인
       new:
         create: 차단 규칙 생성
+        resolve: 도메인 해결
         title: 새 이메일 도메인 차단
+      no_email_domain_block_selected: 아무 것도 선택 되지 않아 어떤 이메일 도메인 차단도 변경되지 않았습니다
+      resolved_through_html: "%{domain}을 통해 해결됨"
       title: Email 도메인 차단
     follow_recommendations:
       description_html: "<strong>팔로우 추천은 새 사용자들이 관심 가는 콘텐트를 빠르게 찾을 수 있도록 도와줍니다</strong>. 사용자가 개인화 된 팔로우 추천이 만들어지기 위한 충분한 상호작용을 하지 않은 경우, 이 계정들이 대신 추천 됩니다. 이들은 해당 언어에 대해 많은 관심을 갖거나 많은 로컬 팔로워를 가지고 있는 계정들을 섞어서 날마다 다시 계산 됩니다."
-      language: 할당할 언어
+      language: 언어 필터
       status: 상태
       suppress: 팔로우 추천 숨기기
       suppressed: 숨겨짐
       title: 팔로우 추천
       unsuppress: 팔로우 추천 복원
     instances:
+      availability:
+        description_html:
+          other: 도메인에 대한 전달이 성공 없이 <strong>%{count}</strong>일 실패한다면, 이후의 전달 시도는 해당 도메인<em>에서</em> 전달이 오기 전까지는 만들어지지 않습니다.
+        failure_threshold_reached: "%{date}에 실패 임계점에 도달했습니다."
+        failures_recorded:
+          other: 실패한 전달 시도 총 %{count}일.
+        no_failures_recorded: 실패 기록이 없습니다.
+        title: 가용성
       back_to_all: 전체
       back_to_limited: 제한됨
       back_to_warning: 경고
       by_domain: 도메인
       confirm_purge: 정말로 이 도메인의 데이터를 영구적으로 삭제하길 원하십니까?
+      content_policies:
+        comment: 내부 참고사항
+        description_html: 이 도메인과 하위 도메인의 모든 계정에 적용될 콘텐츠 정책을 정의할 수 있습니다.
+        policies:
+          reject_media: 미디어 거부
+          reject_reports: 신고 거부
+          silence: 제한
+          suspend: 정지
+        policy: 정책
+        reason: 공개적인 사유
+        title: 콘텐츠 정책
+      dashboard:
+        instance_accounts_dimension: 제일 많이 팔로우된 계정
+        instance_accounts_measure: 보관된 계정
+        instance_followers_measure: 저쪽을 팔로우 하는 우리의 팔로워 수
+        instance_follows_measure: 우리를 팔로우 하는 저쪽의 팔로워 수
+        instance_languages_dimension: 상위 언어
+        instance_media_attachments_measure: 보관된 미디어 첨부파일
+        instance_reports_measure: 이들에 대한 신고
+        instance_statuses_measure: 보관된 게시물
       delivery:
         all: 전체
         clear: 전달 에러 초기화
         restart: 전달 재시작
         stop: 전달 중지
-        title: 전달
         unavailable: 사용불가
-        unavailable_message: 전달 불가
-        warning: 경고
-        warning_message:
-          other: 전달 실패 %{count}일
       delivery_available: 전송 가능
       delivery_error_days: 전달 에러가 난 날짜들
       delivery_error_hint: 만약 %{count}일동안 전달이 불가능하다면, 자동으로 전달불가로 표시됩니다.
@@ -509,12 +527,14 @@ ko:
       private_comment: 비공개 주석
       public_comment: 공개 주석
       purge: 제거
+      purge_description_html: 이 도메인이 영구적으로 오프라인 상태라고 생각되면 스토리지에서 이 도메인의 모든 계정 레코드와 관련 데이터를 삭제할 수 있습니다. 이 작업은 시간이 좀 걸릴 수 있습니다.
       title: 연합
       total_blocked_by_us: 우리에게 차단 됨
       total_followed_by_them: 우리를 팔로우
       total_followed_by_us: 우리가 한 팔로우
       total_reported: 이들에 대한 신고
       total_storage: 미디어 첨부
+      totals_time_period_hint_html: 아래에 표시된 총계에는 모든 시간에 대한 데이터가 포함됩니다.
     invites:
       deactivate_all: 전부 비활성화
       filter:
@@ -568,10 +588,12 @@ ko:
       action_taken_by: 신고 처리자
       actions:
         delete_description_html: 신고된 게시물은 삭제될 것이며 이 처벌기록은 같은 계정의 향후 규정 위반에 대해 참고사항으로 쓰일 수 있도록 저장됩니다.
+        mark_as_sensitive_description_html: 신고된 게시물의 미디어는 민감함으로 표시될 것이며 이 처벌기록은 같은 계정의 향후 규정 위반에 대해 참고사항으로 쓰일 수 있도록 저장됩니다.
         other_description_html: 계정 동작을 제어하고 신고된 계정과의 의사소통을 사용자 지정하기 위한 추가 옵션을 봅니다.
         resolve_description_html: 신고된 계정에 대해 아무런 동작도 취하지 않으며, 처벌기록이 남지 않으며, 신고는 처리됨으로 변경됩니다.
         silence_description_html: 이미 팔로우 하고 있는 사람이나 수동으로 찾아보는 사람에게만 프로필이 보여지고, 도달 범위를 엄격하게 제한합니다. 언제든지 되돌릴 수 있습니다.
         suspend_description_html: 프로필과 모든 컨텐츠가 최종적으로 삭제될 때까지 접근 불가상태가 됩니다. 이 계정과의 상호작용은 불가능해집니다. 30일 이내에 되돌릴 수 있습니다.
+      actions_description_html: 이 보고서를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면 <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 이메일 알림이 해당 계정으로 전송됩니다.
       add_to_report: 신고에 더 추가하기
       are_you_sure: 정말로 실행하시겠습니까?
       assign_to_self: 나에게 할당하기
@@ -587,6 +609,7 @@ ko:
       forwarded: 전달됨
       forwarded_to: "%{domain}에게 전달됨"
       mark_as_resolved: 해결 완료 처리
+      mark_as_sensitive: 민감함으로 설정
       mark_as_unresolved: 미해결로 표시
       no_one_assigned: 아무도 없음
       notes:
@@ -597,12 +620,15 @@ ko:
         placeholder: 이 리포트에 대한 조치, 기타 관련 된 사항에 대해 설명합니다…
         title: 노트
       notes_description_html: 확인하고 다른 중재자나 미래의 자신을 위해 기록을 작성합니다
+      quick_actions_description_html: '보고된 콘텐츠를 보려면 빠른 조치를 취하거나 아래로 스크롤하세요:'
+      remote_user_placeholder: "%{instance}의 리모트 사용자"
       reopen: 리포트 다시 열기
       report: '신고 #%{id}'
       reported_account: 신고 대상 계정
       reported_by: 신고자
       resolved: 해결됨
       resolved_msg: 리포트가 성공적으로 해결되었습니다!
+      skip_to_actions: 작업으로 건너뛰기
       status: 상태
       statuses: 신고된 컨텐츠
       statuses_description_html: 문제가 되는 컨텐츠는 신고된 계정에게 인용되어 전달됩니다
@@ -727,6 +753,7 @@ ko:
       actions:
         delete_statuses: "%{name} 님이 %{target}의 게시물을 지웠습니다"
         disable: "%{name} 님이 %{target}의 계정을 동결시켰습니다"
+        mark_statuses_as_sensitive: "%{name} 님이 %{target}의 게시물을 민감함으로 표시했습니다"
         none: "%{name} 님이 %{target}에게 경고를 보냈습니다"
         sensitive: "%{name} 님이 %{target}의 계정을 민감함으로 표시했습니다"
         silence: "%{name} 님이 %{target}의 계정을 제한시켰습니다"
@@ -758,7 +785,7 @@ ko:
           one: 지난 주 동안 한 명의 사람이 공유했습니다
           other: 지난 주 동안 %{count} 명의 사람들이 공유했습니다
           zero: 지난 주 동안 공유한 사람이 없습니다
-        title: 지금 유행 중인 링크
+        title: 유행하는 링크
         usage_comparison: 오늘은 %{today}회 공유되었고, 어제는 %{yesterday}회 공유되었습니다
       pending_review: 심사 대기
       preview_card_providers:
@@ -766,6 +793,15 @@ ko:
         rejected: 이 출처의 링크는 유행 목록에 실릴 수 없습니다
         title: 출처
       rejected: 거부됨
+      statuses:
+        allow: 게시물 허용
+        allow_account: 작성자 허용
+        disallow: 게시물 불허
+        disallow_account: 작성자 불허
+        not_discoverable: 작성자가 발견되기를 원치 않습니다
+        shared_by:
+          other: "%{friendly_count} 번 공유되고 즐겨찾기 되었습니다"
+        title: 유행하는 게시물
       tags:
         current_score: 현재 %{score}점
         dashboard:
@@ -798,7 +834,15 @@ ko:
   admin_mailer:
     new_appeal:
       actions:
+        delete_statuses: 게시물을 삭제하는 것
+        disable: 계정을 동결시키는 것
+        mark_statuses_as_sensitive: 게시물을 민감함으로 표시하는 것
         none: 경고
+        sensitive: 계정을 민감함으로 표시하는 것
+        silence: 계정을 제한하는 것
+        suspend: 계정을 정지하는 것
+      body: "%{target} 님이 %{action_taken_by} 님에 의해 %{date}에 결정된 중재 결정에 대한 이의를 제기했습니다, 결정된 사항은 %{type}이었습니다. 작성내용은 다음과 같습니다:"
+      subject: "%{username} 님이 %{instance}에서 발생한 중재 결정에 대해 소명을 제출했습니다"
     new_pending_account:
       body: 아래에 새 계정에 대한 상세정보가 있습니다. 이 가입을 승인하거나 거부할 수 있습니다.
       subject: "%{instance}의 새 계정(%{username})에 대한 심사가 대기중입니다"
@@ -806,6 +850,17 @@ ko:
       body: "%{reporter} 가 %{target} 를 신고했습니다"
       body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다"
       subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+    new_trends:
+      body: '아래에 있는 항목들은 공개적으로 보여지기 전에 검토를 거쳐야 합니다:'
+      new_trending_links:
+        no_approved_links: 현재 승인된 유행 중인 링크가 없습니다.
+        title: 유행하는 링크
+      new_trending_statuses:
+        no_approved_statuses: 현재 승인된 유행 중인 게시물이 없습니다.
+        title: 유행하는 게시물
+      new_trending_tags:
+        title: 유행하는 해시태그
+      subject: 새 트렌드가 %{instance}에서 심사 대기 중입니다
   aliases:
     add_new: 별칭 만들기
     created_msg: 새 별칭이 성공적으로 만들어졌습니다. 이제 기존 계정에서 이주를 시작할 수 있습니다.
@@ -879,8 +934,10 @@ ko:
     status:
       account_status: 계정 상태
       confirming: 이메일 확인 과정이 완료되기를 기다리는 중.
+      functional: 계정이 완벽히 작동합니다.
       pending: 당신의 가입 신청은 스태프의 검사를 위해 대기중입니다. 이것은 시간이 다소 소요됩니다. 가입 신청이 승인 될 경우 이메일을 받게 됩니다.
       redirecting_to: 계정이 %{acct}로 리다이렉트 중이기 때문에 비활성 상태입니다.
+      view_strikes: 내 계정에 대한 과거 중재 기록 보기
     too_fast: 너무 빠르게 양식이 제출되었습니다, 다시 시도하세요.
     trouble_logging_in: 로그인 하는데 문제가 있나요?
     use_security_key: 보안 키 사용
@@ -948,22 +1005,30 @@ ko:
     strikes:
       action_taken: 내려진 징계
       appeal: 이의제기
+      appeal_approved: 이 중재기록은 소명이 받아들여졌으며 더이상 유효하지 않습니다
+      appeal_rejected: 소명이 기각되었습니다
       appeal_submitted_at: 이의제기 접수됨
       appealed_msg: 당신의 이의제기가 접수되었습니다. 만약 승인된다면, 알림을 받게 될 것입니다.
       appeals:
         submit: 이의 제출
       associated_report: 관련된 신고
       created_at: 날짜
+      description_html: 이 결정사항들은 당신에 계정에 대해 행해졌고 %{instance}의 스태프에 의해 경고가 발송되었습니다.
       recipient: 수신자
       status: '게시물 #%{id}'
       status_removed: 게시물이 이미 시스템에서 지워졌습니다
+      title: "%{action} (%{date}에)"
       title_actions:
         delete_statuses: 게시물 삭제
         disable: 계정 동결
+        mark_statuses_as_sensitive: 게시물을 민감함으로 표시
         none: 경고
         sensitive: 계정을 민감함으로 표시
         silence: 계정의 제한
         suspend: 계정 정지
+      your_appeal_approved: 당신의 소명이 받아들여졌습니다
+      your_appeal_pending: 소명을 제출했습니다
+      your_appeal_rejected: 당신의 소명이 기각되었습니다
   domain_validator:
     invalid_domain: 올바른 도메인 네임이 아닙니다
   errors:
@@ -1257,6 +1322,9 @@ ko:
     reply:
       proceed: 답장 진행
       prompt: '이 게시물에 답장을 하려 합니다:'
+  reports:
+    errors:
+      invalid_rules: 올바른 규칙을 포함하지 않습니다
   scheduled_statuses:
     over_daily_limit: 그 날짜에 대한 %{limit}개의 예약 게시물 제한을 초과합니다
     over_total_limit: 예약 게시물 제한 %{limit}을 초과합니다
@@ -1323,6 +1391,7 @@ ko:
     profile: 프로필
     relationships: 팔로잉과 팔로워
     statuses_cleanup: 게시물 자동 삭제
+    strikes: 중재 기록
     two_factor_authentication: 2단계 인증
     webauthn_authentication: 보안 키
   statuses:
@@ -1396,6 +1465,7 @@ ko:
       '2629746': 1 개월
       '31556952': 1 년
       '5259492': 2 개월
+      '604800': 1주일
       '63113904': 2 년
       '7889238': 3 개월
     min_age_label: 기한
@@ -1519,7 +1589,12 @@ ko:
   user_mailer:
     appeal_approved:
       action: 내 계정으로 가기
+      explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
+      subject: "%{date}에 작성한 소명이 승인되었습니다"
+      title: 소명이 받아들여짐
     appeal_rejected:
+      explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했지만 거절되었습니다."
+      subject: "%{date}에 작성한 소명이 거절되었습니다"
       title: 이의제기가 거절되었습니다
     backup_ready:
       explanation: 당신이 요청한 계정의 풀 백업이 이제 다운로드 가능합니다!
@@ -1538,26 +1613,28 @@ ko:
         spam: 스팸
         violation: 컨텐츠가 다음의 커뮤니티 규정을 위반합니다
       explanation:
-        delete_statuses: 당신의 게시물 중 몇 개가 커뮤니티 규정을 위반하는 것으로 확인되었고 %{instance}의 중재자에 의해 삭제되었습니다. 이후의 규정 위반은 당신의 계정에 대해 더 강력한 제재가 이루어 질 수 있습니다.
+        delete_statuses: 귀하의 게시물 중 일부가 하나 이상의 커뮤니티 가이드라인을 위반한 것으로 확인되어 %{instance} 모더레이터에 의해 삭제되었습니다.
         disable: 당신은 더이상 당신의 계정을 사용할 수 없습니다, 하지만 프로필과 다른 데이터들은 여전히 그대로 남아있습니다. 당신의 데이터에 대한 백업을 요청하거나, 계정 설정을 변경 또는 계정을 삭제할 수 있습니다.
+        mark_statuses_as_sensitive: 당신의 몇몇 게시물들은 %{instance}의 중재자에 의해 민감함으로 설정되었습니다. 이것은 사람들이 미리보기를 보기 전에 미디어를 한번 눌러야 함을 의미합니다. 당신은 스스로도 자신의 게시물을 작성할 때 미디어를 민감함으로 설정할 수 있습니다.
         sensitive: 지금부터는, 당신이 업로드한 미디어 파일들은 민감함 표시가 뜨게 되고 클릭해야만 볼 수 있다는 경고문 뒤에 가려지게 됩니다.
         silence: 당신은 여전히 당신의 계정을 사용할 수 있지만 당신을 팔로우 하고 있는 사람들만 당신의 게시물을 볼 수 있으며, 여러가지 탐색 기능에서 제외됩니다. 하지만, 여전히 다른 사람들은 수동으로 당신을 팔로우 할 수 있습니다.
         suspend: 당신은 더이상 당신의 계정을 사용할 수 없으며, 프로필과 데이터는 접근 불가능하게 됩니다. 데이터가 완전히 삭제되기 전인 30일동안은 여전히 백업을 요청하기 위해 로그인 할 수 있습니다, 하지만 계정 정지를 회피하는 것을 방지하기 위하여 몇 가지 정보는 유지됩니다.
-      get_in_touch: 이것이 잘못된 조치라고 생각된다면, 이 메일에 답장하여 %{instance}의 스태프들에게 연락할 수 있습니다.
       reason: '사유:'
-      statuses: '위반사항이 발견된 게시물:'
+      statuses: '인용된 게시물:'
       subject:
         delete_statuses: 당신의 계정 %{acct}에서 작성한 게시물이 삭제되었습니다
         disable: 당신의 계정 %{acct}가 동결 되었습니다
+        mark_statuses_as_sensitive: "%{acct}로 작성한 당신의 게시물은 민감한 것으로 표시되었습니다"
         none: "%{acct}에게의 경고"
-        sensitive: 지금부터 당신의 계정 %{acct}의 미디어 파일들은 민감함으로 표시됩니다
+        sensitive: "%{acct}로 작성되는 당신의 게시물은 이제부터 민감한 것으로 표시됩니다"
         silence: 당신의 계정 %{acct}가 제한 되었습니다
         suspend: 당신의 계정 %{acct}가 정지 되었습니다
       title:
         delete_statuses: 게시물 삭제됨
         disable: 계정 동결 됨
+        mark_statuses_as_sensitive: 게시물이 민감함으로 표시됨
         none: 경고
-        sensitive: 미디어 숨겨짐
+        sensitive: 계정이 민감함으로 표시됨
         silence: 계정 제한 됨
         suspend: 계정 정지 됨
     welcome:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 4fb522d09..cf0fdbf8b 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -65,7 +65,6 @@ ku:
     media: میدیا
     moved_html: "%{name} گواستراوەتەوە بۆ %{new_profile_link}:"
     network_hidden: ئەم زانیاریە بەردەست نیە
-    never_active: هەرگیز
     nothing_here: لێرە هیچ نییە!
     people_followed_by: ئەو کەسانەی کە %{name} بەدوایدا دەکەون
     people_who_follow: ئەو کەسانەی کە بەدوای %{name} دا دەکەون
@@ -335,17 +334,6 @@ ku:
       reject_media_hint: پەڕگە میدیای پاشکەوتکراو بە شێوەێکی ناوخۆیی لابدە و دابەزین لە داهاتوو ڕەتدەکاتەوە. ناپەیوەندیدار ە بۆ ڕاگرتن
       reject_reports: گوزارشتەکان ڕەت بکەوە
       reject_reports_hint: پشتگوێ خستنی هەموو گوزارشتەکان کە دێن لەم دۆمەینە. ناپەیوەندیدارە بۆ ڕاگرتن
-      rejecting_media: ڕەتکردنەوەی فایلەکانی میدیا
-      rejecting_reports: ڕەتکردنەوەی گوزارشتەکان
-      severity:
-        silence: بێدەنگ
-        suspend: ڕاگرتن
-      show:
-        retroactive:
-          silence: نابێدەنگی ئەو ئەژمێرانەی کە هەیە لەم دۆمەینەوە
-          suspend: هەڵنەپەسێدراوی هەژمارە کاریگەرەکانی ئەم دۆمەین
-        title: گەڕانەوەی بلۆککردنی دۆمەین %{domain}
-        undo: گەڕانەوە
       undo: گەڕانەوەی بلۆکی دۆمەینی
       view: دیتنی بلۆکی دۆمەینی
     email_domain_blocks:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 838eccc15..d866fb52e 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -187,17 +187,6 @@ lt:
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
       reject_reports: Atmesti skundai
       reject_reports_hint: Ignoruoti visus skundus, kurie siunčiami iš šio domeno. Neliečia užblokavimu
-      rejecting_media: atmetami medijos failai
-      rejecting_reports: atmetami skundai
-      severity:
-        silence: užtildytas
-        suspend: uždraustas
-      show:
-        retroactive:
-          silence: Atitildyti visus egzistuojančius vartotojus šiame domene
-          suspend: Atblokuotis visus egzistuojančius vartotojus šiame domene
-        title: Atkurti domeno blokavimą domenui %{domain}
-        undo: Atkurti
       undo: Atkurti domeno bloką
     email_domain_blocks:
       add_new: Pridėti naują
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 8e1a831dd..58a9350d3 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -16,6 +16,7 @@ lv:
     contact: Kontakts
     contact_missing: Nav uzstādīts
     contact_unavailable: N/A
+    continue_to_web: Pārej uz tīmekļa lietotni
     discover_users: Atklāj lietotājus
     documentation: Dokumentācija
     federation_hint_html: Izmantojot kontu vietnē %{instance}, varēsi sekot cilvēkiem jebkurā Mastodon serverī un ārpus tā.
@@ -25,6 +26,8 @@ lv:
       Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju.
       To izmanto apvienošanas nolūkos, un to nedrīkst bloķēt, ja vien nevēlies bloķēt visu instanci, un tādā gadījumā tev jāizmanto domēna bloķēšana.
     learn_more: Uzzināt vairāk
+    logged_in_as_html: Tu pašlaik esi pieteicies kā %{username}.
+    logout_before_registering: Tu jau esi pieteicies.
     privacy_policy: Privātuma politika
     rules: Servera noteikumi
     rules_html: 'Tālāk ir sniegts noteikumu kopsavilkums, kas jāievēro, ja vēlies izveidot kontu šajā Mastodon serverī:'
@@ -72,7 +75,6 @@ lv:
     media: Mediji
     moved_html: "%{name} ir pārcēlies uz %{new_profile_link}:"
     network_hidden: Šāda informācija nav pieejama
-    never_active: Nekad
     nothing_here: Te nekā nav!
     people_followed_by: Cilvēki, kuriem %{name} seko
     people_who_follow: Cilvēki, kuri seko %{name}
@@ -456,21 +458,6 @@ lv:
       reject_media_hint: Noņem lokāli saglabātos mediju failus un atsaka tos lejupielādēt nākotnē. Nav nozīmes apturēšanai
       reject_reports: Noraidīt ziņojumus
       reject_reports_hint: Ignorēt visus ziņojumus, kas nāk no šī domēna. Nav nozīmes apturēšanai
-      rejecting_media: noraidīt mediju failus
-      rejecting_reports: noraida ziņojumus
-      severity:
-        silence: ierobežots
-        suspend: apturēts
-      show:
-        affected_accounts:
-          one: Ietekmēts viens konts datu bāzē
-          other: Ietekmēti %{count} konti datu bāzē
-          zero: Nav ietekmētu kontu datubāzē
-        retroactive:
-          silence: Atsaukt ierobežojumus esošajiem ietekmētajiem kontiem no šī domēna
-          suspend: Atcelt šī domēna esošo ietekmēto kontu darbības apturēšanu
-        title: Atsaukt domēna bloķēšanu %{domain}
-        undo: Atsaukt
       undo: Atsaukt domēna bloķēšanu
       view: Skatīt domēna bloķēšanu
     email_domain_blocks:
@@ -502,24 +489,49 @@ lv:
       title: Sekošanas rekomendācijas
       unsuppress: Atjaunot sekošanas rekomendāciju
     instances:
+      availability:
+        description_html:
+          one: Ja piegāde uz domēnu neizdodas <strong>%{count} dienu</strong> bez panākumiem, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+          other: Ja piegāde uz domēnu neizdodas <strong>%{count} dažādas dienās</strong>, un tas neizdodas, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+          zero: Ja piegāde uz domēnu neizdodas <strong>%{count} dažādas dienās</strong>, un tas neizdodas, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+        failure_threshold_reached: Kļūmju slieksnis sasniegts %{date}.
+        failures_recorded:
+          one: Neizdevies mēģinājums %{count} dienā.
+          other: Neizdevušies mēģinājumi %{count} dienās.
+          zero: Neizdevušies mēģinājumi %{count} dienās.
+        no_failures_recorded: Nav reģistrētu kļūdu.
+        title: Pieejamība
       back_to_all: Visas
       back_to_limited: Ierobežotās
       back_to_warning: Brīdinājums
       by_domain: Domēns
       confirm_purge: Vai tiešām vēlies neatgriezeniski izdzēst datus no šī domēna?
+      content_policies:
+        comment: Iekšējā piezīme
+        description_html: Tu vari definēt satura politikas, kas tiks piemērotas visiem kontiem no šī domēna un jebkura tā apakšdomēna.
+        policies:
+          reject_media: Noraidīt medijus
+          reject_reports: Noraidīt ziņojumus
+          silence: Ierobežot
+          suspend: Apturēt
+        policy: Politika
+        reason: Publisks iemesls
+        title: Satura politikas
+      dashboard:
+        instance_accounts_dimension: Visvairāk sekotie konti
+        instance_accounts_measure: saglabātie konti
+        instance_followers_measure: mūsu sekotāji tur
+        instance_follows_measure: viņu sekotāji šeit
+        instance_languages_dimension: Populārākās valodas
+        instance_media_attachments_measure: saglabātie mediju pielikumi
+        instance_reports_measure: ziņojumi par viņiem
+        instance_statuses_measure: saglabātās ziņas
       delivery:
         all: Visas
         clear: Notīrīt piegādes kļūdas
         restart: Pārstartēt piegādi
         stop: Apturēt piegādi
-        title: Piegāde
         unavailable: Nav pieejams
-        unavailable_message: Piegāde nav iespējama
-        warning: Brīdinājums
-        warning_message:
-          one: Piegādes kļūme %{count} diena
-          other: Piegādes kļūme %{count} dienas
-          zero: Piegādes kļūme %{count} dienas
       delivery_available: Piegāde ir iespējama
       delivery_error_days: Piegādes kļūdu dienas
       delivery_error_hint: Ja piegāde nav iespējama %{count} dienas, tā tiks automātiski atzīmēta kā nepiegādājama.
@@ -536,12 +548,14 @@ lv:
       private_comment: Privāts komentārs
       public_comment: Publisks komentārs
       purge: Iztīrīt
+      purge_description_html: Ja uzskati, ka šis domēns uz visiem laikiem ir bezsaistē, tu vari no savas krātuves dzēst visus konta ierakstus un saistītos datus no šī domēna. Tas var aizņemt kādu laiku.
       title: Federācija
       total_blocked_by_us: Mūsu bloķēta
       total_followed_by_them: Viņiem seko
       total_followed_by_us: Mums seko
       total_reported: Ziņojumi par viņiem
       total_storage: Mediju pielikumi
+      totals_time_period_hint_html: Tālāk redzamajās summās ir iekļauti dati par visu laiku.
     invites:
       deactivate_all: Deaktivēt visu
       filter:
@@ -597,6 +611,7 @@ lv:
       action_taken_by: Veiktā darbība
       actions:
         delete_description_html: Raksti, par kurām ziņots, tiks dzēsti, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākos pārkāpumus saistībā ar to pašu kontu.
+        mark_as_sensitive_description_html: Mediju faili ziņojumos, par kuriem ziņots, tiks atzīmēti kā sensitīvi, un tiks reģistrēts brīdinājums, lai palīdzētu tev palielināt tā paša konta turpmākās refrakcijas.
         other_description_html: Skatīt vairāk iespēju kontrolēt konta uzvedību un pielāgot saziņu ar paziņoto kontu.
         resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
         silence_description_html: Profils būs redzams tikai tiem, kas jau tam seko vai manuāli apskata, stingri ierobežojot tās sasniedzamību. Šo vienmēr var atgriezt.
@@ -617,6 +632,7 @@ lv:
       forwarded: Pārsūtīti
       forwarded_to: Pārsūtīti %{domain}
       mark_as_resolved: Atzīmēt kā atrisinātu
+      mark_as_sensitive: Atzīmēt kā sensitīvu
       mark_as_unresolved: Atzīmēt kā neatrisinātu
       no_one_assigned: Neviena
       notes:
@@ -760,6 +776,7 @@ lv:
       actions:
         delete_statuses: "%{name} izdzēsa %{target} publikācijas"
         disable: "%{name} iesaldēja %{target} kontu"
+        mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ziņu kā sensitīvu"
         none: "%{name} nosūtīja brīdinājumu %{target}"
         sensitive: "%{name} atzīmēja %{target} kontu kā sensitīvu"
         silence: "%{name} ierobežoja %{target} kontu"
@@ -785,6 +802,7 @@ lv:
       links:
         allow: Atļaut saiti
         allow_provider: Atļaut publicētāju
+        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem tavs serveris redz ziņas. Tas var palīdzēt taviem lietotājiem uzzināt, kas notiek pasaulē. Kamēr tu neapstiprini izdevēju, neviena saite netiek rādīta publiski. Vari arī atļaut vai noraidīt atsevišķas saites.
         disallow: Neatļaut saiti
         disallow_provider: Neatļaut publicētāju
         shared_by_over_week:
@@ -796,14 +814,17 @@ lv:
       pending_review: Gaida pārskatīšanu
       preview_card_providers:
         allowed: Šī publicētāja saites var mainīties
+        description_html: Tie ir domēni, no kuriem tavā serverī bieži tiek koplietotas saites. Saites nebūs publiski pieejamas, ja vien saites domēns netiks apstiprināts. Tavs apstiprinājums (vai noraidījums) attiecas arī uz apakšdomēniem.
         rejected: Saites no šī publicētāja nebūs tendence
         title: Publicētāji
       rejected: Noraidīts
       statuses:
         allow: Atļaut publicēt
         allow_account: Atļaut autoru
+        description_html: Šīs ir ziņas, par kurām tavs serveris zina un kuras pašlaik tiek koplietotas un pašlaik ir daudz izlasē. Tas var palīdzēt taviem jaunajiem un atkārtotiem lietotājiem atrast vairāk cilvēku, kam sekot. Neviena ziņa netiek publiski rādīta, kamēr neesi apstiprinājis autoru un autors atļauj savu kontu ieteikt citiem. Vari arī atļaut vai noraidīt atsevišķas ziņas.
         disallow: Neatļaut publicēt
         disallow_account: Neatļaut autoru
+        not_discoverable: Autors nav izvēlējies būt atklājams
         shared_by:
           one: Vienreiz kopīgots vai pievienots izlasei
           other: Kopīgots un pievienots izlasei %{friendly_count} reizes
@@ -817,6 +838,7 @@ lv:
           tag_servers_dimension: Populārākie serveri
           tag_servers_measure: dažādi serveri
           tag_uses_measure: lietojumi pavisam
+        description_html: Šīs ir atsauces, kas pašlaik tiek rādītas daudzās ziņās, kuras redz tavs serveris. Tas var palīdzēt taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviena atsauce netiek rādīta publiski, kamēr tu neesi tās apstiprinājis.
         listable: Var tikt ieteikts
         not_listable: Nevar tikt ieteikts
         not_trendable: Neparādīsies pie tendencēm
@@ -843,6 +865,7 @@ lv:
       actions:
         delete_statuses: lai izdzēstu viņu ierakstus
         disable: lai iesaldētu viņu kontu
+        mark_statuses_as_sensitive: lai atzīmētu viņu ziņas kā sensitīvas
         none: brīdinājums
         sensitive: lai atzīmētu viņu kontu kā sensitīvu
         silence: lai ierobežotu viņu kontu
@@ -945,8 +968,10 @@ lv:
     status:
       account_status: Konta statuss
       confirming: Gaida e-pasta apstiprinājuma pabeigšanu.
+      functional: Tavs konts ir pilnībā darboties spējīgs.
       pending: Tavu pieteikumu gaida mūsu darbinieku izskatīšana. Tas var aizņemt kādu laiku. Ja tavs pieteikums tiks apstiprināts, tu saņemsi e-pastu.
       redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
+      view_strikes: Skati iepriekšējos brīdinājumus par savu kontu
     too_fast: Veidlapa ir iesniegta pārāk ātri, mēģini vēlreiz.
     trouble_logging_in: Problēma ar pieteikšanos?
     use_security_key: Lietot drošības atslēgu
@@ -1022,6 +1047,7 @@ lv:
         submit: Iesniegt apelāciju
       associated_report: Saistītais ziņojums
       created_at: Datēts
+      description_html: Šīs ir darbības, kas veiktas pret tavu kontu, un brīdinājumi, ko tev ir nosūtījuši %{instance} darbinieki.
       recipient: Adresēts
       status: 'Publikācija #%{id}'
       status_removed: Publikācija jau ir noņemta no sistēmas
@@ -1029,6 +1055,7 @@ lv:
       title_actions:
         delete_statuses: Ziņas noņemšana
         disable: Konta iesaldēšana
+        mark_statuses_as_sensitive: Ziņu atzīmēšana kā sensitīvas
         none: Brīdinājums
         sensitive: Konta atzīmēšana kā sensitīvs
         silence: Konta ierobežošana
@@ -1406,6 +1433,7 @@ lv:
     profile: Profils
     relationships: Man seko un sekotāji
     statuses_cleanup: Automātiska ziņu dzēšana
+    strikes: Moderācijas aizrādījumi
     two_factor_authentication: Divfaktoru Aut
     webauthn_authentication: Drošības atslēgas
   statuses:
@@ -1491,6 +1519,7 @@ lv:
       '2629746': 1 mēnesis
       '31556952': 1 gads
       '5259492': 2 mēneši
+      '604800': 1 nedēļa
       '63113904': 2 gadi
       '7889238': 3 mēneši
     min_age_label: Vecuma slieksnis
@@ -1650,26 +1679,28 @@ lv:
         spam: Spams
         violation: Saturs pārkāpj šādas kopienas pamatnostādnes
       explanation:
-        delete_statuses: Ir konstatēts, ka daži no jūsu ierakstiem pārkāpj vienu vai vairākas kopienas vadlīnijas, un pēc tam %{instance} moderatori tos ir izdzēsuši. Turpmāki pārkāpumi var novest pie bargākiem soda pasākumiem pret jūsu kontu.
+        delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
         disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
+        mark_statuses_as_sensitive: "%{instance} moderatori dažas no tavām ziņām ir atzīmējušas kā sensitīvas. Tas nozīmē, ka cilvēkiem būs jāpieskaras ziņās esošajiem medijiem, pirms tiek parādīts priekšskatījums. Tu arī pats vari atzīmēt mediju kā sensitīvu, kad tādu publicēsi turpmāk."
         sensitive: No šī brīža visi augšupielādētie mediju faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
         silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
         suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
-      get_in_touch: Ja uzskati, ka tā ir kļūda, vari atbildēt uz šo e-pastu, lai sazinātos ar %{instance} darbiniekiem.
       reason: 'Iemesls:'
-      statuses: 'Ziņas, kurās tika konstatēti pārkāpumi:'
+      statuses: 'Citētās ziņas:'
       subject:
         delete_statuses: Tavas ziņas %{acct} tika noņemtas
         disable: Tavs konts %{acct} tika iesaldēts
+        mark_statuses_as_sensitive: Tavas ziņas vietnē %{acct} ir atzīmētas kā sensitīvas
         none: Brīdinājums par %{acct}
-        sensitive: Tavi mediju faili %{acct} turpmāk tiks marķēti kā sensitīvi
+        sensitive: Tavas ziņas vietnē %{acct} turpmāk tiks atzīmētas kā sensitīvas
         silence: Tavs konts %{acct} tika ierobežots
         suspend: Tava konta %{acct} darbība ir apturēta
       title:
         delete_statuses: Izdzēstās ziņas
         disable: Konts iesaldēts
+        mark_statuses_as_sensitive: Ziņas ir atzīmēts kā sensitīvas
         none: Brīdinājums
-        sensitive: Paslēptie mediji
+        sensitive: Konts ir atzīmēts kā sensitīvs
         silence: Konts ierobežots
         suspend: Konts apturēts
     welcome:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 9a9b92d3c..5bc9f2884 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -66,7 +66,6 @@ ms:
     media: Media
     moved_html: "%{name} telah berpindah ke %{new_profile_link}:"
     network_hidden: Maklumat ini tidak tersedia
-    never_active: Belum pernah
     nothing_here: Tiada apa-apa di sini!
     people_followed_by: Orang yang %{name} ikuti
     people_who_follow: Orang yang mengikut %{name}
@@ -386,17 +385,6 @@ ms:
       reject_media_hint: Buang fail media yang disimpan secara tempatan dan tolak sebarang muat turun pada masa hadapan. Tidak terpakai untuk penggantungan
       reject_reports: Tolak laporan
       reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak terpakai untuk penggantungan
-      rejecting_media: menolak fail media
-      rejecting_reports: menolak laporan
-      severity:
-        silence: didiamkan
-        suspend: digantungkan
-      show:
-        retroactive:
-          silence: Nyahdiamkan akaun yang menerima kesan sedia ada daripada domain ini
-          suspend: Nyahgantungkan akaun yang menerima kesan sedia ada daripada domain ini
-        title: Undurkan sekatan domain untuk %{domain}
-        undo: Undurkan
       undo: Undurkan penyekatan domain
       view: Lihat penyekatan domain
     email_domain_blocks:
@@ -426,12 +414,7 @@ ms:
         clear: Buang ralat penghantaran
         restart: Mulakan semula penghantaran
         stop: Hentikan penghantaran
-        title: Penghantaran
         unavailable: Tidak tersedia
-        unavailable_message: Penghantaran tidak tersedia
-        warning: Amaran
-        warning_message:
-          other: Penghantaran gagal selama %{count} hari
       delivery_available: Penghantaran tersedia
       delivery_error_days: Hari ralat penghantaran
       delivery_error_hint: Jika penghantaran tidak berjaya selama %{count} hari, ia akan ditanda sebagai tidak boleh dihantar.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f1cbecbc0..c9291b59c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -67,7 +67,6 @@ nl:
     media: Media
     moved_html: "%{name} is verhuisd naar %{new_profile_link}:"
     network_hidden: Deze informatie is niet beschikbaar
-    never_active: Nooit
     nothing_here: Hier is niets!
     people_followed_by: Mensen die %{name} volgen
     people_who_follow: Mensen die %{name} volgen
@@ -389,17 +388,6 @@ nl:
       reject_media_hint: Verwijderd lokaal opgeslagen mediabestanden en weigert deze in de toekomst te downloaden. Irrelevant voor opgeschorte domeinen
       reject_reports: Rapportages weigeren
       reject_reports_hint: Alle rapportages die vanaf dit domein komen negeren. Irrelevant voor opgeschorte domeinen
-      rejecting_media: mediabestanden worden geweigerd
-      rejecting_reports: rapportages worden geweigerd
-      severity:
-        silence: genegeerd
-        suspend: opgeschort
-      show:
-        retroactive:
-          silence: Alle genegeerde accounts van dit domein niet langer negeren
-          suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
-        title: Domeinblokkade voor %{domain} ongedaan maken
-        undo: Ongedaan maken
       undo: domeinblokkade ongedaan maken
       view: Domeinblokkade bekijken
     email_domain_blocks:
@@ -429,13 +417,7 @@ nl:
         clear: Bezorgfouten weghalen
         restart: Bezorging herstarten
         stop: Bezorging beëindigen
-        title: Bezorging
         unavailable: Niet beschikbaar
-        unavailable_message: Bezorging is niet beschikbaar
-        warning: Waarschuwing
-        warning_message:
-          one: Bezorgingsfout voor %{count} dag
-          other: Bezorgfout voor %{count} dagen
       delivery_available: Bezorging is mogelijk
       delivery_error_days: Dagen met bezorgfouten
       delivery_error_hint: Wanneer de bezorging voor %{count} dagen niet mogelijk is, wordt de bezorging automatisch als niet beschikbaar gemarkeerd.
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 14cd5a1c7..177fbd111 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -67,7 +67,6 @@ nn:
     media: Media
     moved_html: "%{name} har flytta til %{new_profile_link}:"
     network_hidden: Denne informasjonen er ikkje tilgjengeleg
-    never_active: Aldri
     nothing_here: Her er det ingenting!
     people_followed_by: Folk som %{name} fylgjer
     people_who_follow: Folk som fylgjer %{name}
@@ -362,17 +361,6 @@ nn:
       reject_media_hint: Fjernar mediefiler som er lagra lokalt og nektar å lasta ned andre i framtida. Har ikkje noko å seia for utvisingar
       reject_reports: Avvis rapportar
       reject_reports_hint: Ignorer alle rapportar frå dette domenet. Har ikkje noko å seia for utvisingar
-      rejecting_media: avviser mediefiler
-      rejecting_reports: avviser rapportar
-      severity:
-        silence: dempa
-        suspend: utvist
-      show:
-        retroactive:
-          silence: Avmålbind alle eksisterende kontoer fre dette domenet
-          suspend: Avutvis alle eksisterende kontoer fra dette domenet
-        title: Angre domeneblokkering for %{domain}
-        undo: Angr
       undo: Angre
       view: Vis domeneblokkering
     email_domain_blocks:
@@ -402,9 +390,7 @@ nn:
         clear: Feil ved fjerning
         restart: Starte levering
         stop: Stopp levering
-        title: Levering
         unavailable: Ikke tilgjengelig
-        warning: Advarsel
       delivery_available: Levering er tilgjengelig
       moderation:
         all: Alle
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 3e6b49524..7dc570554 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -67,7 +67,6 @@
     media: Media
     moved_html: "%{name} har flyttet til %{new_profile_link}:"
     network_hidden: Denne informasjonen er ikke tilgjengelig
-    never_active: Aldri
     nothing_here: Det er ingenting her!
     people_followed_by: Folk som %{name} følger
     people_who_follow: Folk som følger %{name}
@@ -359,17 +358,6 @@
       reject_media_hint: Fjerner lokalt lagrede mediefiler og nekter å laste dem ned i fremtiden. Irrelevant for utvisninger
       reject_reports: Avslå rapporter
       reject_reports_hint: Ignorer alle rapporter som kommer fra dette domenet. Irrelevant for utvisninger
-      rejecting_media: avviser mediafiler
-      rejecting_reports: avslår rapporter
-      severity:
-        silence: stilnet
-        suspend: suspendert
-      show:
-        retroactive:
-          silence: Avmålbind alle eksisterende kontoer fre dette domenet
-          suspend: Avutvis alle eksisterende kontoer fra dette domenet
-        title: Angre domeneblokkering for %{domain}
-        undo: Angre
       undo: Angre
       view: Vis domeneblokkering
     email_domain_blocks:
@@ -399,9 +387,7 @@
         clear: Feil ved fjerning
         restart: Starte levering
         stop: Stopp levering
-        title: Levering
         unavailable: Ikke tilgjengelig
-        warning: Advarsel
       delivery_available: Levering er tilgjengelig
       moderation:
         all: Alt
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 79b73d12f..17c9dd4ec 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -61,7 +61,6 @@ oc:
     media: Mèdias
     moved_html: "%{name} a mudat a %{new_profile_link} :"
     network_hidden: Aquesta informacion es pas disponibla
-    never_active: Jamai
     nothing_here: I a pas res aquí !
     people_followed_by: Lo monde que %{name} sèc
     people_who_follow: Lo monde que sègon %{name}
@@ -322,17 +321,6 @@ oc:
       reject_media_hint: Lèva los fichièrs gardats localament e regèta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions
       reject_reports: Regetar los senhalaments
       reject_reports_hint: Ignorar totes los senhalaments que venon d’aqueste domeni. Pas pertiment per las suspensions
-      rejecting_media: regeta los fichièrs multimèdias
-      rejecting_reports: regeta los senhalements
-      severity:
-        silence: mes en silenci
-        suspend: suspendut
-      show:
-        retroactive:
-          silence: Levar lo silenci de totes los comptes d’aqueste domeni
-          suspend: Levar la suspension de totes los comptes d’aqueste domeni
-        title: Restablir lo blocatge de domeni de %{domain}
-        undo: Restablir
       undo: Restablir
       view: Veire lo blocatge de domeni
     email_domain_blocks:
@@ -1043,6 +1031,7 @@ oc:
       '2629746': 1 mes
       '31556952': 1 an
       '5259492': 2 meses
+      '604800': 1 week
       '63113904': 2 ans
       '7889238': 3 meses
   stream_entries:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b953b44e3..74837c7c0 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -75,7 +75,6 @@ pl:
     media: Zawartość multimedialna
     moved_html: "%{name} korzysta teraz z konta %{new_profile_link}:"
     network_hidden: Ta informacja nie jest dostępna
-    never_active: Nigdy
     nothing_here: Niczego tu nie ma!
     people_followed_by: Konta śledzone przez %{name}
     people_who_follow: Osoby, które śledzą konto %{name}
@@ -464,17 +463,6 @@ pl:
       reject_media_hint: Usuwa przechowywane lokalnie pliki multimedialne i nie pozwala na ich pobieranie. Nieprzydatne przy zawieszeniu
       reject_reports: Odrzucaj zgłoszenia
       reject_reports_hint: Zgłoszenia z tej instancji będą ignorowane. Nieprzydatne przy zawieszeniu
-      rejecting_media: pliki multimedialne są odrzucane
-      rejecting_reports: zgłoszenia są odrzucane
-      severity:
-        silence: wyciszono
-        suspend: zawieszono
-      show:
-        retroactive:
-          silence: Odwołaj wyciszenie wszystkich kont w tej domenie
-          suspend: Odwołaj zawieszenie wszystkich kont w tej domenie
-        title: Odwołaj blokadę dla domeny %{domain}
-        undo: Cofnij
       undo: Cofnij
       view: Zobacz blokadę domeny
     email_domain_blocks:
@@ -512,15 +500,7 @@ pl:
         clear: Wyczyść błędy w doręczaniu
         restart: Uruchom ponownie doręczenie
         stop: Zatrzymaj doręczanie
-        title: Doręczanie
         unavailable: Niedostępne
-        unavailable_message: Doręczaniei niedostępne
-        warning: Ostrzeżenie
-        warning_message:
-          few: "%{count} dni niepowodzenia doręczenia"
-          many: "%{count} dni niepowodzenia doręczenia"
-          one: "%{count} dzień niepowodzenia doręczenia"
-          other: "%{count} dni niepowodzenia doręczenia"
       delivery_available: Doręczanie jest dostępne
       delivery_error_days: Dni błędów doręczenia
       delivery_error_hint: Jeżeli doręczanie nie będzie możliwe przez %{count} dni, zostanie automatycznie oznaczona jako nie do doręczania.
@@ -595,6 +575,7 @@ pl:
       action_taken_by: Działanie podjęte przez
       actions:
         delete_description_html: Zgłoszone posty zostaną usunięte, a zdarzenie zostanie zapisane, aby pomóc w eskalacji przyszłych wykroczeń na tym samym koncie.
+        mark_as_sensitive_description_html: Media w zgłaszanych postach zostaną oznaczone jako wrażliwe, a ostrzeżenie zostanie nagane, aby pomóc w eskalacji przyszłych przewinień na tym samym koncie.
         other_description_html: Zobacz więcej opcji do kontrolowania zachowania konta i dostosuj komunikację do zgłoszonego konta.
         resolve_description_html: Nie zostaną podjęte żadne działania przeciwko zgłoszonemu sprawozdaniu, zdarzenie nie zostanie zarejestrowane, a zgłoszenie zostanie zamknięte.
         silence_description_html: Profil będzie widoczny tylko dla tych, którzy go już obserwują lub szukaj ręcznie, poważnie ograniczając jego zasięg. Może być zawsze cofnięty.
@@ -615,6 +596,7 @@ pl:
       forwarded: Przekazano
       forwarded_to: Przekazano do %{domain}
       mark_as_resolved: Oznacz jako rozwiązane
+      mark_as_sensitive: Oznacz jako wrażliwe
       mark_as_unresolved: Oznacz jako nierozwiązane
       no_one_assigned: Nikt nie
       notes:
@@ -757,6 +739,7 @@ pl:
       actions:
         delete_statuses: "%{name} usunął(-ęła) posty %{target}"
         disable: "%{name} zamroził(a) konto %{target}"
+        mark_statuses_as_sensitive: "%{name} oznaczył/a wiadomości %{target} jako wrażliwe"
         none: "%{name} wysłał(a) ostrzeżenie do %{target}"
         sensitive: "%{name} oznaczył(-a) konto %{target} jako wrażliwe"
         silence: "%{name} ograniczył(-a) konto %{target}"
@@ -782,6 +765,7 @@ pl:
       links:
         allow: Zezwól na link
         allow_provider: Zezwalaj na wydawcę
+        description_html: Są to linki, które są obecnie często udostępniane przez konta, z których Twój serwer widzi posty. Może to pomóc Twoim użytkownikom dowiedzieć się, co dzieje się na świecie. Żadne linki nie są wyświetlane publicznie dopóki nie zaakceptujesz wydawcy. Możesz również zezwolić lub odrzucić indywidualne linki.
         disallow: Nie zezwalaj na link
         disallow_provider: Nie zezwalaj na wydawcę
         title: Popularne linki
@@ -828,6 +812,7 @@ pl:
       actions:
         delete_statuses: aby usunąć ich wpisy
         disable: aby zamrozić jego/jej konto
+        mark_statuses_as_sensitive: aby oznaczyć swoje posty jako wrażliwe
         none: ostrzeżenie
         sensitive: aby oznaczyć konto jako wrażliwe
         silence: aby ograniczyć swoje konto
@@ -1003,8 +988,9 @@ pl:
       title_actions:
         delete_statuses: Usuwanie postów
         disable: Zamrażanie konta
+        mark_statuses_as_sensitive: Oznaczanie postów jako wrażliwych
         none: Ostrzeżenie
-        sensitive: Oznaczenie konta jako wrażliwe
+        sensitive: Oznaczanie konta jako wrażliwe
         silence: Ograniczenie konta
         suspend: Zawieszenie konta
       your_appeal_approved: Twoje odwołanie zostało zatwierdzone
@@ -1473,6 +1459,7 @@ pl:
       '2629746': 1 miesiąc
       '31556952': 1 rok
       '5259492': 2 miesiące
+      '604800': 1 week
       '63113904': 2 lata
       '7889238': 3 miesiące
     min_age_label: Próg wieku
@@ -1611,26 +1598,27 @@ pl:
         spam: Spam
         violation: Zawartość narusza następujące wytyczne społeczności
       explanation:
-        delete_statuses: Stwierdzono, że niektóre z Twoich postów naruszają jedną lub więcej wytycznych dla społeczności i zostały usunięte przez moderatorów %{instance}. Przyszłe naruszenia mogą skutkować ostrzejszymi działaniami karnymi w stosunku do Twojego konta.
         disable: Nie możesz już używać swojego konta, ale Twój profil i inne dane pozostają nienaruszone. Możesz poprosić o kopię swoich danych, zmienić ustawienia konta lub usunąć swoje konto.
+        mark_statuses_as_sensitive: Niektóre z Twoich postów zostały oznaczone jako wrażliwe przez moderatorów %{instance}. Oznacza to, że ludzie będą musieli dotknąć mediów w postach przed wyświetleniem podglądu. Możesz oznaczyć media jako wrażliwe podczas publikowania w przyszłości.
         sensitive: Od teraz wszystkie przesłane pliki multimedialne będą oznaczone jako wrażliwe i ukryte za ostrzeżeniem kliknięcia.
         silence: Kiedy Twoje konto jest ograniczone, tylko osoby, które je śledzą, będą widzieć Twoje wpisy. Może ono też przestać być widoczne w funkcjach odkrywania. Inni wciąż mogą zacząć Cię śledzić.
         suspend: Nie możesz już używać Twojego konta, a Twój profil i inne dane nie są już dostępne. Zanim w pełni usuniemy Twoje dane po około 30 dniach, możesz nadal zalogować się, aby uzyskać ich kopię. Zachowamy pewne podstawowe dane, aby zapobiegać obchodzeniu przez Ciebie zawieszenia.
-      get_in_touch: Jeżeli uważasz to za błąd, możesz odpowiedzieć na ten e-mail, aby skontaktować się z prowadzącymi %{instance}.
       reason: 'Powód:'
-      statuses: 'Wpisy uznane za naruszające wytyczne:'
+      statuses: 'Cytowane posty:'
       subject:
         delete_statuses: Twoje wpisy na %{acct} zostały usunięte
         disable: Twoje konto %{acct} zostało wyłączone
+        mark_statuses_as_sensitive: Twoje posty na %{acct} zostały oznaczone jako wrażliwe
         none: Ostrzeżenie dla %{acct}
-        sensitive: Twoje multimedia na %{acct} będą od teraz oznaczane jako wrażliwe
+        sensitive: Twoje posty na %{acct} będą od teraz oznaczone jako wrażliwe
         silence: Twoje konto %{acct} zostało ograniczone
         suspend: Twoje konto %{acct} zostało zawieszone
       title:
         delete_statuses: Wpisy usunięte
         disable: Konto wyłączone
+        mark_statuses_as_sensitive: Posty oznaczone jako wrażliwe
         none: Ostrzeżenie
-        sensitive: Media ukryte
+        sensitive: Konto oznaczone jako wrażliwe
         silence: Konto ograniczone
         suspend: Konto zawieszone
     welcome:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index e9f1f6350..1d9f4c4c4 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -69,7 +69,6 @@ pt-BR:
     media: Mídia
     moved_html: "%{name} se mudou para %{new_profile_link}:"
     network_hidden: Informação indisponível
-    never_active: Nunca
     nothing_here: Nada aqui!
     people_followed_by: Pessoas que %{name} segue
     people_who_follow: Pessoas que seguem %{name}
@@ -424,19 +423,6 @@ pt-BR:
       reject_media_hint: Remove arquivos de mídia armazenados localmente e recusa fazer download de qualquer um no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar denúncias
       reject_reports_hint: Ignora todas as denúncias vindo deste domínio. Irrelevante para suspensões
-      rejecting_media: rejeitando arquivos de mídia
-      rejecting_reports: rejeitando denúncias
-      severity:
-        silence: silenciado
-        suspend: banido
-      show:
-        affected_accounts:
-          one: Uma conta no banco de dados foi afetada
-        retroactive:
-          silence: Dessilenciar contas existentes afetadas deste domínio
-          suspend: Remover a suspensão das contas afetadas deste domínio
-        title: Desfazer bloqueio de domínio para %{domain}
-        undo: Desfazer
       undo: Desfazer bloqueio de domínio
       view: Ver domínios bloqueados
     email_domain_blocks:
@@ -467,10 +453,7 @@ pt-BR:
         clear: Limpar erros de entrega
         restart: Reiniciar a entrega
         stop: Parar entrega
-        title: Entrega
         unavailable: Indisponível
-        unavailable_message: Envio indisponível
-        warning: Aviso
       delivery_available: Envio disponível
       empty: Nenhum domínio encontrado.
       moderation:
@@ -721,6 +704,8 @@ pt-BR:
         title: Editor
       rejected: Rejeitado
       statuses:
+        allow: Permitir postagem
+        allow_account: Permitir autor
         title: Publicações em alta
       tags:
         current_score: Pontuação atual %{score}
@@ -888,6 +873,13 @@ pt-BR:
     directory: Diretório de perfis
     explanation: Descobrir usuários baseado em seus interesses
     explore_mastodon: Explore o %{title}
+  disputes:
+    strikes:
+      title_actions:
+        none: Aviso
+        sensitive: Marcar a conta como sensível
+        silence: Limitação da conta
+        suspend: Suspensão de conta
   domain_validator:
     invalid_domain: não é um nome de domínio válido
   errors:
@@ -1322,6 +1314,7 @@ pt-BR:
       '2629746': 1 mês
       '31556952': 1 ano
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Validade
@@ -1442,6 +1435,11 @@ pt-BR:
     recovery_instructions_html: Se você perder acesso ao seu celular, você pode usar um dos códigos de recuperação abaixo para acessar a sua conta. <strong>Mantenha os códigos de recuperação em um local seguro</strong>. Por exemplo, você pode imprimi-los e guardá-los junto com outros documentos importantes.
     webauthn: Chaves de segurança
   user_mailer:
+    appeal_approved:
+      action: Acessar perfil
+      title: Contestação aprovada
+    appeal_rejected:
+      title: Contestação rejeitada
     backup_ready:
       explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
       subject: Seu arquivo está pronto para ser baixado
@@ -1453,12 +1451,13 @@ pt-BR:
       subject: Por favor, confirme a tentativa de acesso
       title: Tentativa de acesso
     warning:
+      appeal: Enviar uma contestação
       categories:
         spam: Spam
         violation: O conteúdo viola as seguintes diretrizes da comunidade
       explanation:
+        disable: Você não poderá mais usar a sua conta, mas o seu perfil e outros dados permanecem intactos. Você pode solicitar um backup dos seus dados, mudar as configurações ou excluir sua conta.
         sensitive: A partir de agora, todos os seus arquivos de mídia enviados serão marcados como confidenciais e escondidos por trás de um aviso de clique.
-      get_in_touch: Se você acredita que isso é um erro, você pode responder a este e-mail para entrar em contato com a equipe de %{instance}.
       reason: 'Motivo:'
       subject:
         disable: Sua conta %{acct} foi bloqueada
@@ -1469,7 +1468,6 @@ pt-BR:
         delete_statuses: Publicações removidas
         disable: Conta bloqueada
         none: Aviso
-        sensitive: Mídia oculta
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 743758cca..d638ab54d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -16,6 +16,7 @@ pt-PT:
     contact: Contacto
     contact_missing: Não configurado
     contact_unavailable: n.d.
+    continue_to_web: Continuar para a aplicação web
     discover_users: Descobrir utilizadores
     documentation: Documentação
     federation_hint_html: Ter uma conta em %{instance} permitirá seguir pessoas em qualquer instância Mastodon.
@@ -25,6 +26,8 @@ pt-PT:
       Esta conta é um actor virtual usado para representar a própria instância e não um utilizador individual.
       É usada para motivos de federação e não deve ser bloqueada a não ser que que queira bloquear a instância por completo. Se for esse o caso, deverá usar o bloqueio de domínio.
     learn_more: Saber mais
+    logged_in_as_html: Está de momento ligado como %{username}.
+    logout_before_registering: Já tem sessão iniciada.
     privacy_policy: Política de privacidade
     rules: Regras da instância
     rules_html: 'Abaixo está um resumo das regras que precisa seguir se pretender ter uma conta nesta instância do Mastodon:'
@@ -69,7 +72,6 @@ pt-PT:
     media: Media
     moved_html: "%{name} mudou-se para %{new_profile_link}:"
     network_hidden: Esta informação não está disponível
-    never_active: Nunca
     nothing_here: Não há nada aqui!
     people_followed_by: Pessoas seguidas por %{name}
     people_who_follow: Pessoas que seguem %{name}
@@ -448,21 +450,6 @@ pt-PT:
       reject_media_hint: Remove arquivos de media armazenados localmente e rejeita descarregar novos arquivos no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar denúncia
       reject_reports_hint: Ignorar todos as denúncias provenientes deste domínio. Irrelevante para suspensões
-      rejecting_media: a rejeitar ficheiros de media
-      rejecting_reports: a rejeitar denúncias
-      severity:
-        silence: silenciado
-        suspend: suspenso
-      show:
-        affected_accounts:
-          one: Uma conta na base de dados afetada
-          other: "%{count} contas na base de dados afetadas"
-          zero: Nenhuma conta na base de dados é afetada
-        retroactive:
-          silence: Não silenciar contas afetadas existentes deste domínio
-          suspend: Não suspender todas as contas existentes nesse domínio
-        title: Remover o bloqueio de domínio de %{domain}
-        undo: Anular
       undo: Anular
       view: Ver domínios bloqueados
     email_domain_blocks:
@@ -493,23 +480,47 @@ pt-PT:
       title: Seguir recomendações
       unsuppress: Restaurar recomendações de contas a seguir
     instances:
+      availability:
+        description_html:
+          one: Se a transmissão ao domínio falhar <strong>%{count} dia</strong> sem sucesso, nenhuma tentativa de transmissão será feita a menos que uma transmissão <em>proveniente</em> do domínio seja recebida.
+          other: Se a transmissão ao domínio falhar em <strong>%{count} dias diferentes</strong> sem sucesso, nenhuma tentativa de transmissão será feita a menos que uma transmissão <em>proveniente</em> do domínio seja recebida.
+        failure_threshold_reached: Limite de falhas atingido em %{date}.
+        failures_recorded:
+          one: Tentativa falhada em %{count} dia.
+          other: Tentativas em %{count} dias diferentes.
+        no_failures_recorded: Sem falhas registadas.
+        title: Disponibilidade
       back_to_all: Todas
       back_to_limited: Limitadas
       back_to_warning: Aviso
       by_domain: Domínio
       confirm_purge: Tem a certeza que deseja eliminar permanentemente os dados deste domínio?
+      content_policies:
+        comment: Nota interna
+        description_html: Pode definir políticas de conteúdo que serão aplicadas a todas as contas deste domínio e a qualquer um dos seus subdomínios.
+        policies:
+          reject_media: Rejeitar media
+          reject_reports: Rejeitar denúncias
+          silence: Limitar
+          suspend: Suspender
+        policy: Política
+        reason: Justificação pública
+        title: Políticas de conteúdo
+      dashboard:
+        instance_accounts_dimension: Contas mais seguidas
+        instance_accounts_measure: contas armazenadas
+        instance_followers_measure: nossos seguidores lá
+        instance_follows_measure: os seus seguidores aqui
+        instance_languages_dimension: Idiomas mais populares
+        instance_media_attachments_measure: anexos de media armazenados
+        instance_reports_measure: denúncias sobre eles
+        instance_statuses_measure: publicações armazenadas
       delivery:
         all: Todas
         clear: Limpar erros de entrega
         restart: Reiniciar entrega
         stop: Parar entrega
-        title: Entrega
         unavailable: Indisponível
-        unavailable_message: Entrega indisponível
-        warning: Aviso
-        warning_message:
-          one: Falhou entrega %{count} dia
-          other: Falhou entrega %{count} dias
       delivery_available: Entrega disponível
       delivery_error_days: Dias de erro de entrega
       delivery_error_hint: Se a entrega não for possível durante %{count} dias, será automaticamente marcada como não realizável.
@@ -526,12 +537,14 @@ pt-PT:
       private_comment: Comentários privados
       public_comment: Comentários públicos
       purge: Purgar
+      purge_description_html: Se acredita que este domínio está definitivamente offline, pode excluir todos os registos de contas e dados associados a ele do seu armazenamento. Isso pode demorar algum tempo.
       title: Instâncias conhecidas
       total_blocked_by_us: Bloqueadas por nós
       total_followed_by_them: Seguidas por eles
       total_followed_by_us: Seguidas por nós
       total_reported: Denúncias sobre eles
       total_storage: Anexos de media
+      totals_time_period_hint_html: Os totais exibidos abaixo incluem dados referentes ao tempo total.
     invites:
       deactivate_all: Desativar todos
       filter:
@@ -586,6 +599,7 @@ pt-PT:
       action_taken_by: Ação tomada por
       actions:
         delete_description_html: As publicações denunciadas serão eliminadas e uma punição será registada para ajudá-lo a escalar ações em futuras infrações pela mesma conta.
+        mark_as_sensitive_description_html: A media nas publicações denunciadas será marcada como sensível e uma punição será registada para ajudá-lo a escalar ações em futuras infrações pela mesma conta.
         other_description_html: Ver mais opções para controlar o comportamento da conta e personalizar a comunicação para a conta denunciada.
         resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, nenhuma punição será registada, e a denuncia será fechada.
         silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando severamente o seu alcance. Pode sempre ser revertido.
@@ -606,6 +620,7 @@ pt-PT:
       forwarded: Encaminhado
       forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
+      mark_as_sensitive: Marcar como sensível
       mark_as_unresolved: Marcar como não resolvido
       no_one_assigned: Ninguém
       notes:
@@ -749,6 +764,7 @@ pt-PT:
       actions:
         delete_statuses: "%{name} eliminou a publicação de %{target}"
         disable: "%{name} congelou a conta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcou as publicações de %{target} como sensíveis"
         none: "%{name} enviou uma advertência a %{target}"
         sensitive: "%{name} marcou a conta de %{target} como sensível"
         silence: "%{name} limitou a conta de %{target}"
@@ -774,6 +790,7 @@ pt-PT:
       links:
         allow: Permitir link
         allow_provider: Permitir editor
+        description_html: Estes são links que atualmente estão a ser frequentemente partilhados por contas visiveis pelo seu servidor. Eles podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhum link é exibido publicamente até que aprove o editor. Também pode permitir ou rejeitar links individualmente.
         disallow: Não permitir link
         disallow_provider: Não permitir editor
         shared_by_over_week:
@@ -785,14 +802,17 @@ pt-PT:
       pending_review: Pendente de revisão
       preview_card_providers:
         allowed: Links deste editor poderão ser incluídos nos destaques
+        description_html: Estes são domínios a partir dos quais links são frequentemente partilhados no seu servidor. Estes links não serão colocados em destaque a menos que o seu domínio de origem seja aprovado. A sua aprovação (ou rejeição) estende-se a subdomínios.
         rejected: Links deste editor não serão incluídos nos destaques
         title: Editores
       rejected: Rejeitado
       statuses:
         allow: Permitir publicação
         allow_account: Permitir autor
+        description_html: Estas são publicações que o seu servidor conhece e que atualmente estão a ser frequentemente partilhadas e adicionadas aos favoritos. Isto pode ajudar os seus utilizadores, novos e retornados, a encontrar mais pessoas para seguir. Nenhuma publicação será exibida publicamente até que aprove o autor, e o autor permita que a sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individualmente.
         disallow: Não permitir publicação
         disallow_account: Não permitir autor
+        not_discoverable: O autor optou por não permitir que a sua conta seja sugerida a outros
         shared_by:
           one: Partilhado ou adicionado aos favoritos uma vez
           other: Partilhado e adicionado aos favoritos %{friendly_count} vezes
@@ -805,6 +825,7 @@ pt-PT:
           tag_servers_dimension: Servidores mais populares
           tag_servers_measure: servidores diferentes
           tag_uses_measure: utilizações totais
+        description_html: Estas são hashtags que aparecem atualmente com frequência em publicações visíveis pelo seu servidor. Isto pode ajudar os seus utilizadores a descobrir o que está ser mais falado no momento. Nenhuma hashtag é exibida publicamente até que a aprove.
         listable: Pode ser sugerida
         not_listable: Não será sugerida
         not_trendable: Não aparecerá nas tendências
@@ -831,6 +852,7 @@ pt-PT:
       actions:
         delete_statuses: para elimintar as suas publicações
         disable: para congelar a sua conta
+        mark_statuses_as_sensitive: marcar as suas publicações como sensíveis
         none: uma advertência
         sensitive: marcação da sua conta como sensível
         silence: limitação da sua conta
@@ -933,8 +955,10 @@ pt-PT:
     status:
       account_status: Estado da conta
       confirming: A aguardar que conclua a confirmação do e-mail.
+      functional: A sua conta está totalmente operacional.
       pending: A sua inscrição está pendente de revisão pela nossa equipa. Isso pode demorar algum tempo. Receberá um e-mail se a sua conta for aprovada.
       redirecting_to: A sua conta está inativa porque está atualmente a ser redirecionada para %{acct}.
+      view_strikes: Veja as punições anteriores contra a sua conta
     too_fast: Formulário enviado muito rapidamente, tente novamente.
     trouble_logging_in: Problemas em iniciar sessão?
     use_security_key: Usar chave de segurança
@@ -1010,6 +1034,7 @@ pt-PT:
         submit: Submeter recurso
       associated_report: Denúncia associada
       created_at: Data
+      description_html: Estas são ações tomadas contra a sua conta e avisos que lhe foram enviados pela equipa de %{instance}.
       recipient: Endereçado a
       status: 'Publicação #%{id}'
       status_removed: Publicação já eliminada do sistema
@@ -1017,6 +1042,7 @@ pt-PT:
       title_actions:
         delete_statuses: Remoção de publicação
         disable: Congelamento da conta
+        mark_statuses_as_sensitive: Marcação das publicações como sensíveis
         none: Advertência
         sensitive: Marcação da conta como sensível
         silence: Limitação da conta
@@ -1390,6 +1416,7 @@ pt-PT:
     profile: Perfil
     relationships: Seguindo e seguidores
     statuses_cleanup: Remoção automática da publicação
+    strikes: Punições de moderação
     two_factor_authentication: Autenticação em duas etapas
     webauthn_authentication: Chaves de segurança
   statuses:
@@ -1469,6 +1496,7 @@ pt-PT:
       '2629746': 1 mês
       '31556952': 1 ano
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Limite de idade
@@ -1616,26 +1644,28 @@ pt-PT:
         spam: Spam
         violation: O conteúdo infringe as seguintes diretrizes da comunidade
       explanation:
-        delete_statuses: Algumas das suas publicações foram consideradas como a infringir uma ou mais diretrizes da comunidade e foram subsequentemente removidas pelos moderadores de %{instance}. Futuras infrações podem resultar em acções punitivas mais severas contra a sua conta.
+        delete_statuses: Algumas das suas publicações foram consideradas como a infringir uma ou mais diretrizes da comunidade e foram subsequentemente removidas pelos moderadores de %{instance}.
         disable: Não pode mais utilizar a sua conta, mas o seu perfil e outros dados permanecem intactos. Pode solicitar uma cópia dos seus dados, alterar as definições da conta ou apagá-la.
+        mark_statuses_as_sensitive: Algumas das suas publicações foram marcadas como sensíveis pelos moderadores de %{instance}. Isto significa que as pessoas terão de clicar na media nas publicações, antes de ser exibida uma pré-visualização. No futuro, quando publicar, lembre-se que pode você mesmo marcar a media como sensível.
         sensitive: A partir de agora, todos os ficheiros de media que carregue serão marcados como sensíveis e escondidos atrás de um aviso de "clicar-para-continuar".
         silence: Pode ainda utilizar a sua conta mas apenas as pessoas que já o seguem poderão ver as suas mensagens neste servidor, e poderá ser excluído de várias funcionalidades de divulgação. No entanto, outros poderão ainda segui-lo manualmente.
         suspend: Não pode mais utilizar a sua conta, e o seu perfil e outros dados já não se encontram acessíveis. Poderá ainda iniciar sessão para solicitar uma cópia dos seus dados até os mesmos serem totalmente removidos em cerca de 30 dias, porém reteremos alguns dados básicos para o impedir evitar a suspensão.
-      get_in_touch: Se acredita tratar-se de um erro, pode responder a este e-mail para entrar em contacto com os colaboradores de %{instance}.
       reason: 'Motivo:'
-      statuses: 'Publicações que foram consideradas em infracção:'
+      statuses: 'Publicações citadas:'
       subject:
         delete_statuses: As suas publicações em %{acct} foram removidas
         disable: A tua conta %{acct} foi congelada
+        mark_statuses_as_sensitive: As suas publicações em %{acct} foram marcadas como sensíveis
         none: Aviso para %{acct}
-        sensitive: Os seus ficheiros de media em %{acct} serão marcados como sensiveis de agora em diante
+        sensitive: As suas publicações em %{acct} serão a partir de agora marcadas como sensíveis
         silence: A tua conta %{acct} foi limitada
         suspend: A tua conta %{acct} foi suspensa
       title:
         delete_statuses: Publicações removidas
         disable: Conta congelada
+        mark_statuses_as_sensitive: Publicações marcadas como sensíveis
         none: Aviso
-        sensitive: Media escondida
+        sensitive: Conta marcada como sensível
         silence: Conta limitada
         suspend: Conta suspensa
     welcome:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index daed79c8c..d6a37f8c4 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -72,7 +72,6 @@ ro:
     media: Media
     moved_html: "%{name} s-a mutat la %{new_profile_link}:"
     network_hidden: Aceste informaţii nu sunt disponibile
-    never_active: Niciodată
     nothing_here: Nu există nimic aici!
     people_followed_by: Persoane pe care %{name} le urmărește
     people_who_follow: Persoane care urmăresc pe %{name}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 745ef5430..aa0c47f55 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -16,6 +16,7 @@ ru:
     contact: Связаться
     contact_missing: не указан
     contact_unavailable: неизв.
+    continue_to_web: Продолжить в веб-приложении
     discover_users: Найдите пользователей
     documentation: Документация
     federation_hint_html: С учётной записью на %{instance} вы сможете подписываться на людей с любого сервера Mastodon и не только.
@@ -25,6 +26,8 @@ ru:
       Эта учетная запись является виртуальным персонажем, используемым для представления самого сервера, а не какого-либо пользователя.
       Используется для целей федерации и не должен быть заблокирован, если вы не хотите заблокировать всю инстанцию, вместо этого лучше использовать доменную блокировку.
     learn_more: Узнать больше
+    logged_in_as_html: Вы вошли в систему как %{username}.
+    logout_before_registering: Вы уже вошли.
     privacy_policy: Политика конфиденциальности
     rules: Правила сервера
     rules_html: 'Ниже приведена сводка правил, которых вам нужно придерживаться, если вы хотите иметь учётную запись на этом сервере Мастодона:'
@@ -75,7 +78,6 @@ ru:
     media: Медиафайлы
     moved_html: "%{name} переехал(а) на %{new_profile_link}:"
     network_hidden: Эта информация недоступна
-    never_active: Никогда
     nothing_here: Здесь ничего нет!
     people_followed_by: Люди, на которых подписан(а) %{name}
     people_who_follow: Подписчики %{name}
@@ -446,21 +448,15 @@ ru:
       reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки.
       reject_reports: Отклонять жалобы
       reject_reports_hint: Игнорировать все жалобы с этого домена. Не имеет значения в случае блокировки.
-      rejecting_media: отклонение медиафайлов
-      rejecting_reports: отклонение жалоб
-      severity:
-        silence: скрывается
-        suspend: заблокирован
-      show:
-        retroactive:
-          silence: Убрать скрытие постов учётных записей с этого узла
-          suspend: Снять блокировку со всех существующих учётных записей этого домена
-        title: Снять блокировку с домена %{domain}
-        undo: Отменить
       undo: Отменить блокировку домена
       view: Посмотреть доменные блокировки
     email_domain_blocks:
       add_new: Добавить новую
+      attempts_over_week:
+        few: "%{count} попытки за последнюю неделю"
+        many: "%{count} попыток за последнюю неделю"
+        one: "%{count} попытка за последнюю неделю"
+        other: "%{count} попыток регистрации за последнюю неделю"
       created_msg: E-mail домен внесён в список блокировки
       delete: Удалить
       dns:
@@ -481,6 +477,9 @@ ru:
       title: Рекомендации подписок
       unsuppress: Восстановить рекомендацию
     instances:
+      availability:
+        no_failures_recorded: Сбоев в записи нет.
+        title: Доступность
       back_to_all: Все узлы
       back_to_limited: Все ограниченные узлы
       back_to_warning: Все узлы требующие внимания
@@ -491,15 +490,7 @@ ru:
         clear: Очистить ошибки доставки
         restart: Перезапустить доставку
         stop: Остановить доставку
-        title: По доступности
         unavailable: Недоступные
-        unavailable_message: Доставка невозможна
-        warning: Требующие внимания
-        warning_message:
-          few: Доставка невозможна %{count} дня
-          many: Доставка невозможна %{count} дней
-          one: Доставка невозможна %{count} день
-          other: Доставка невозможна %{count} дня
       delivery_available: Доставка возможна
       delivery_error_days: Дней ошибок доставки
       delivery_error_hint: Если доставка доставка не удастся в течение %{count} дней, он будет автоматически отмечен недоступным для доставки.
@@ -595,6 +586,7 @@ ru:
       forwarded: Переслано
       forwarded_to: Переслано на %{domain}
       mark_as_resolved: Отметить как решённую
+      mark_as_sensitive: Отметить как деликатное
       mark_as_unresolved: Отметить как нерешённую
       no_one_assigned: Никто
       notes:
@@ -736,6 +728,10 @@ ru:
     strikes:
       actions:
         delete_statuses: "%{name} удалил(а) посты %{target}"
+        disable: "%{name} заморозил(а) учётную запись %{target}"
+        mark_statuses_as_sensitive: "%{name} отметил(а) %{target} посты как деликатные"
+        none: "%{name} отправил(а) предупреждение %{target}"
+        silence: "%{name} ограничил(а) учетную запись %{target}"
       appeal_pending: Обжалование в обработке
     system_checks:
       database_schema_check:
@@ -758,14 +754,22 @@ ru:
         allow_provider: Разрешить издание
         disallow: Запретить ссылку
         disallow_provider: Отклонить издание
+        shared_by_over_week:
+          one: Поделился один человек за последнюю неделю
+          other: Поделилось %{count} людей за последнюю неделю
+          zero: Никто не поделился за последнюю неделю
         title: Актуальные ссылки
+        usage_comparison: Поделились %{today} раз сегодня, по сравнению с %{yesterday} вчера
       pending_review: Ожидает рассмотрения
       preview_card_providers:
         allowed: Ссылки этого издания могут отображаться в «актуальном»
         rejected: Ссылки этого издания не будут отображаться в «актуальном»
         title: Издатели
       rejected: Отклонённые
+      statuses:
+        title: Популярные посты
       tags:
+        current_score: Текущий счет %{score}
         dashboard:
           tag_accounts_measure: уникальных использований
           tag_languages_dimension: Популярные языки
@@ -779,6 +783,12 @@ ru:
         title: Актуальные хэштеги
         trendable: Может появляться в списке «актуального»
         usable: Может использоваться
+        usage_comparison: Использовано %{today} сегодня, для сравнения вчера %{yesterday}
+        used_by_over_week:
+          one: За последнюю неделю использовано одним человеком
+          other: За последнюю неделю использовано %{count} людьми
+          zero: За последнюю неделю никто не использовал
+      title: Популярное
     warning_presets:
       add_new: Добавить
       delete: Удалить
@@ -793,6 +803,14 @@ ru:
       body: "%{reporter} подал(а) жалобу на %{target}"
       body_remote: Кто-то с узла %{domain} пожаловался на %{target}
       subject: Новая жалоба, узел %{instance} (№%{id})
+    new_trends:
+      body: 'Прежде чем можно будет опубликовать, проверьте следующие элементы:'
+      new_trending_links:
+        title: Популярные ссылки
+      new_trending_statuses:
+        title: Популярные посты
+      new_trending_tags:
+        title: Популярные хэштеги
   aliases:
     add_new: Создать псевдоним
     created_msg: Новый псевдоним установлен. Теперь мы можете начать миграцию со старой учётной записи.
@@ -866,6 +884,7 @@ ru:
     status:
       account_status: Статус учётной записи
       confirming: Ожидание подтверждения e-mail.
+      functional: Ваша учётная запись в полном порядке.
       pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
       redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
     too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
@@ -935,12 +954,22 @@ ru:
     strikes:
       action_taken: Предпринятые меры
       appeal_approved: Это замечание было успешно обжаловано и более не действительно
+      appeal_rejected: Апелляция была отклонена
+      appeal_submitted_at: Апелляция отправлена
+      appealed_msg: Ваша апелляция была отправлена. Если она будет одобрена, вы будете уведомлены.
       appeals:
         submit: Подать обжалование
+      associated_report: Связанные обращения
       created_at: Дата
       recipient: Адресовано
       status: 'Пост #%{id}'
+      status_removed: Пост уже удален из системы
       title: "%{action} от %{date}"
+      title_actions:
+        delete_statuses: Удаление поста
+        mark_statuses_as_sensitive: Помечать посты как деликатные
+        sensitive: Отметить учетную запись как деликатную
+        silence: Ограничение учетной записи
       your_appeal_approved: Ваша апелляция одобрена
       your_appeal_pending: Вы подали апелляцию
       your_appeal_rejected: Ваша апелляция отклонена
@@ -1012,6 +1041,7 @@ ru:
     changes_saved_msg: Изменения успешно сохранены!
     copy: Копировать
     delete: Удалить
+    none: Ничего
     order_by: Сортировка
     save_changes: Сохранить изменения
     today: сегодня
@@ -1408,6 +1438,7 @@ ru:
       '2629746': 1 месяц
       '31556952': 1 год
       '5259492': 2 месяца
+      '604800': 1 неделя
       '63113904': 2 года
       '7889238': 3 месяца
     min_age_label: Возрастной порог
@@ -1527,11 +1558,11 @@ ru:
   user_mailer:
     appeal_approved:
       action: Перейти к своему профилю
-      subject: Ваша апелляция от %{date} была одобрена
-      title: Апелляция одобрена
+      subject: Ваше обжалование от %{date} была одобрено
+      title: Обжалование одобрено
     appeal_rejected:
-      subject: Ваша апелляция от %{date} отклонена
-      title: Апелляция отклонена
+      subject: Ваше обжалование от %{date} отклонено
+      title: Обжалование отклонено
     backup_ready:
       explanation: Вы запросили архив всех данных вашей учётной записи Mastodon. Что ж, он готов к скачиванию.
       subject: Ваш архив готов к загрузке
@@ -1543,31 +1574,30 @@ ru:
       subject: Пожалуйста, подтвердите попытку входа
       title: Попытка входа
     warning:
-      appeal: Подать апелляцию
+      appeal: Обжаловать
       categories:
         spam: Спам
         violation: Содержимое нарушает следующие правила сообщества
       explanation:
-        delete_statuses: Некоторые из ваших постов нарушают одно или несколько правил сообщества, и, как следствие, были удалены модераторами %{instance}. Повторные нарушения могут привести к более суровым санкциям относительно вашей учётной записи.
+        delete_statuses: Было обнаружено, что некоторые из ваших постов нарушают одно или несколько правил сообщества, и они были удалены модераторами %{instance}.
         disable: Вы не можете использовать свою учётную запись, однако ваш профиль и данные остаются нетронутыми. Вы можете запросить выгрузку своих данных, менять настройки, либо полностью удалить свою учётную запись.
         sensitive: С этого момента, все прикрепляемые вами файлы будут отмечаться как «деликатного характера» и скрыты за предупреждением, требующими клика.
         silence: Вы по-прежнему можете использовать свою учётную запись, но только пользователи, которые подписаны на вас, смогут видеть ваши публикации на данном узле. Вы также будете исключены из различных поисковых функций, однако пользователи всё ещё могут вручную подписаться на вас.
         suspend: Вы больше не сможете использовать эту учётную запись и ваш профиль более недоступен к просмотру. Вы по-прежнему можете войти в учётную запись, чтобы запросить выгрузку своих данных, до тех пор, пока они не будут удалены спустя 30 дней (за исключением информации, которая не позволит вам обойти эту блокировку).
-      get_in_touch: Если вы считаете, что это ошибка, вы можете ответить на это сообщение или связаться с руководством %{instance}.
       reason: 'Причина:'
-      statuses: 'Следующие публикации были отмечены как нарушающие правила:'
+      statuses: 'Цитируемые посты:'
       subject:
         delete_statuses: Опубликованные вами с учётной записи %{acct} посты были удалены
         disable: Ваша учётная запись %{acct} заморожена
         none: "%{acct} вынесено предупреждение"
-        sensitive: Публикуемое с учётной записи %{acct} медиа-содержимое с этого момента будет помечаться как «деликатного характера»
         silence: На учётную запись %{acct} наложены ограничения
         suspend: Ваша учётная запись %{acct} была заблокирована
       title:
         delete_statuses: Ваши посты удалены
         disable: Учётная запись заморожена
+        mark_statuses_as_sensitive: Посты, отмеченные как деликатные
         none: Предупреждение
-        sensitive: Ваши медиафайлы скрыты
+        sensitive: Учетная запись отмечена как деликатная
         silence: На учётную запись наложены ограничения
         suspend: Учётная запись заблокирована
     welcome:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 15e305cb5..09e5487c9 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -69,7 +69,6 @@ sc:
     media: Elementos multimediales
     moved_html: "%{name} est istadu trasferidu a %{new_profile_link}:"
     network_hidden: Custa informatzione no est a disponimentu
-    never_active: Mai
     nothing_here: Nudda inoghe.
     people_followed_by: Gente sighida dae %{name}
     people_who_follow: Gente chi sighit a %{name}
@@ -386,17 +385,6 @@ sc:
       reject_media_hint: Cantzellat elementos multimediales sarvados in locale e refudat iscarrigamentos in su benidore. Non rilevante pro is suspensiones
       reject_reports: Refuda informes
       reject_reports_hint: Iscarta informes chi benint de custu domìniu. Non rilevante pro is suspensiones
-      rejecting_media: refudende documentos multimediales
-      rejecting_reports: refudende informes
-      severity:
-        silence: a sa muda
-        suspend: suspèndidu
-      show:
-        retroactive:
-          silence: Boga de is contos a sa muda is contos de custu domìniu implicados
-          suspend: Boga sa suspensione de is contos de custu domìniu implicados
-        title: Iscontza su blocu de domìniu de %{domain}
-        undo: Iscontza
       undo: Iscontza su blocu de domìniu
       view: Bide su blocu de domìniu
     email_domain_blocks:
@@ -1179,6 +1167,7 @@ sc:
       '2629746': 1 mese
       '31556952': 1 annu
       '5259492': 2 meses
+      '604800': 1 week
       '63113904': 2 annos
       '7889238': 3 meses
   stream_entries:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 3ebd25341..de029aa50 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -148,12 +148,6 @@ si:
       private_comment: පුද්ගලික අදහස
       public_comment: ප්‍රසිද්ධ අදහස
       reject_reports: වාර්තා ප්‍රතික්ෂේප කරන්න
-      rejecting_media: මාධ්‍ය වාර්තා ප්‍රතික්ෂේප කරමින්
-      rejecting_reports: වාර්තා ප්‍රතික්ෂේප කරමින්
-      severity:
-        suspend: අත්හිටුවන ලදි
-      show:
-        undo: පෙරසේ
     email_domain_blocks:
       domain: වසම
       new:
@@ -168,7 +162,6 @@ si:
       by_domain: වසම
       delivery:
         all: සියල්ල
-        warning: අවවාදයයි
       moderation:
         all: සියල්ල
       private_comment: පුද්ගලික අදහස
@@ -306,7 +299,7 @@ si:
       '3600': හෝරා 1
       '43200': හෝරා 12
       '604800': සති 1
-      '86400': දින 1
+      '86400': දවස් 1
     title: මිනිසුන්ට ආරාධනා කරන්න
   login_activities:
     authentication_methods:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 643ee8891..cf8140278 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -27,6 +27,8 @@ ar:
         scheduled_at: اتركه فارغا لنشر الإعلان في الحين
         starts_at: اختياري. في حالة ما كان إعلانك ذو صلة بنطاق زمني مخصّص
         text: يمكنك استخدام نسق التبويق. يجب الأخذ في الحسبان المساحة التي سيُغطّيها الإعلان على شاشة المستخدم
+      appeal:
+        text: يمكنك الطعن في عقوبة مرة واحدة فقط
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
         avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
@@ -35,8 +37,6 @@ ar:
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
-        discoverable: سِجل الملفات التعريفية للمستخدمين هو طريقة أخرى لبلوغ جمهور أوسع
-        discoverable_no_directory: السماح باكتشاف حسابك من قبل الغرباء من خلال التوصيات والميزات الأخرى
         email: سوف تتلقى رسالة إلكترونية للتأكيد
         fields: يُمكنك عرض 4 عناصر على شكل جدول في صفحتك التعريفية
         header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
@@ -118,6 +118,8 @@ ar:
         scheduled_at: جَدوِل المنشور
         starts_at: بداية الفعالية
         text: إعلان
+      appeal:
+        text: اشرح لماذا يجب إلغاء هذا القرار
       defaults:
         autofollow: إرسال دعوة لمتابعة حسابك
         avatar: الصورة الرمزية
@@ -196,6 +198,7 @@ ar:
           sign_up_requires_approval: حد التسجيلات
         severity: قانون
       notification_emails:
+        appeal: شخص ما طعن في قرار لأحد المنسقين
         digest: إرسال ملخصات عبر البريد الإلكتروني
         favourite: ابعث بريداً إلكترونيًا عندما يُعجَب أحدهم بمنشورك
         follow: ابعث بريداً إلكترونيًا عندما يتبعك أحد
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 93b88a618..ae7cf5217 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -6,7 +6,6 @@ ast:
         autofollow: La xente que se rexistre pente la invitación va siguite automáticamente
         bot: Esta cuenta fai principalmente aiciones automatizaes y podría nun supervisase
         digest: Namái s'unvia dempués d'un periodu llargu d'inactividá y namái si recibiesti cualesquier mensaxe personal na to ausencia
-        discoverable: El direutoru de perfiles ye otru mou de facer qu'una cuenta llegué a una audiencia más amplia
         email: Vamos unviate un corréu de confirmación
         irreversible: Los barritos peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués
         password: Usa 8 caráuteres polo menos
@@ -23,6 +22,7 @@ ast:
         text: Esto va ayudanos a revisar la to aplicación
       ip_block:
         comment: Opcional. Acuérdate por qué amestesti esta regla.
+        expires_in: Les direiciones IP son un recursu finitu, suelen compartise y cambiar de manes. Por esti motivu, nun s'aconseyen los bloqueos de direiciones IP indefiníos.
       sessions:
         otp: 'Introduz el códigu de dos pasos xeneráu pola aplicación autenticadora o usa unu de los códigos de recuperación:'
     labels:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7f9d838ba..b1b87ff89 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -37,8 +37,7 @@ ca:
         current_password: Per motius de seguretat si us plau entra la contrasenya del compte actual
         current_username: Per a confirmar, si us plau entra el nom d'usuari del compte actual
         digest: Només s'envia després d'un llarg període d'inactivitat amb un resum de les mencions que has rebut en la teva absència
-        discoverable: El directori de perfils és una altra manera per quin el teu compte pot assolir una audiència més àmplia
-        discoverable_no_directory: Permet que el teu compte sigui descobert per estranys grácies a les sugerències i altres característiques
+        discoverable: Permet que el teu compte sigui descobert per estranys grácies a les sugerències, etiquetes i altres característiques
         email: Se t'enviarà un correu electrònic de confirmació
         fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil
         header: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index cf938f0c7..576feb031 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -29,7 +29,6 @@ co:
         current_password: Per ragione di sicurità, entrate a chjave d'accessu di stu contu
         current_username: Per cunfirmà, entrate u cugnome di questu contu
         digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti
-        discoverable: L'annuariu di i prufili hè un'altra manera per u vostru contu di tuccà un'audienza più larga
         email: Avete da riceve un'e-mail di cunfirmazione
         fields: Pudete avè fin’à 4 elementi mustrati cum’un tavulone nant’à u vostru prufile
         header: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 74bfa1bfb..3276b4843 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -35,8 +35,6 @@ cs:
         current_password: Z bezpečnostních důvodů prosím zadejte heslo současného účtu
         current_username: Potvrďte prosím tuto akci zadáním uživatelského jména aktuálního účtu
         digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste při své nepřítomnosti obdrželi osobní zprávy
-        discoverable: Umožnit objevení vašeho účtu neznámými uživateli skrze doporučení, adresář profilů a další funkce
-        discoverable_no_directory: Umožnit objevení vašeho účtu neznámými uživateli skrze doporučení a další funkce
         email: Bude vám poslán potvrzovací e-mail
         fields: Na profilu můžete mít až 4 položky zobrazené jako tabulka
         header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 6cdada6f3..38d27cd4d 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -29,7 +29,6 @@ cy:
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
-        discoverable: Mae'r cyfeirlyfr proffil yn ffordd arall y gall eich cyfrif gyrraedd cynulleidfa ehangach
         email: Byddwch yn derbyn e-bost i gadarnhau
         fields: Mae modd i chi arddangos hyd at 4 eitem fel tabl ar eich proffil
         header: PNG, GIF neu JPG. %{size} ar y mwyaf. Ceith ei israddio i %{dimensions}px
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index f55d63912..beadb32fd 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -35,8 +35,7 @@ da:
         current_password: Angiv af sikkerhedsårsager adgangskoden til den aktuelle konto
         current_username: For at bekræfte, angiv brugernavnet for den aktuelle konto
         digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder i dit fravær
-        discoverable: Tillad din konto at blive fundet af fremmede via anbefalinger og øvrige funktioner
-        discoverable_no_directory: Tillad din konto at blive fundet af fremmede via anbefalinger og øvrige funktioner
+        discoverable: Tillad kontoen at blive fundet af fremmede via anbefalinger og øvrige funktioner
         email: Du tilsendes en bekræftelsese-mail
         fields: Du kan have op til 4 elementer vist som en tabel på din profil
         header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 8b7a02b18..5595059b1 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -37,8 +37,7 @@ de:
         current_password: Aus Sicherheitsgründen gib bitte das Passwort des aktuellen Kontos ein
         current_username: Um das zu bestätigen, gib den Benutzernamen des aktuellen Kontos ein
         digest: Wenn du eine lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen zugeschickt, die du in deiner Abwesenheit empfangen hast
-        discoverable: Das Profilverzeichnis ist eine andere Möglichkeit, mit der dein Konto ein größeres Publikum erreichen kann
-        discoverable_no_directory: Erlaube deinem Konto durch Empfehlungen und andere Funktionen von Fremden entdeckt zu werden
+        discoverable: Erlaube deinem Konto durch Empfehlungen, Trends und andere Funktionen von Fremden entdeckt zu werden
         email: Du wirst eine Bestätigungs-E-Mail erhalten
         fields: Du kannst bis zu 4 Elemente auf deinem Profil anzeigen lassen, die als Tabelle dargestellt werden
         header: PNG, GIF oder JPG. Maximal %{size}. Wird auf %{dimensions} px herunterskaliert
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 3396a32a9..39dbef161 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -35,7 +35,6 @@ el:
         current_password: Για λόγους ασφαλείας παρακαλώ γράψε τον κωδικό του τρέχοντος λογαριασμού
         current_username: Για επιβεβαίωση, παρακαλώ γράψε το όνομα χρήστη του τρέχοντος λογαριασμού
         digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
-        discoverable: Ο κατάλογος λογαριασμών είναι ένας ακόμα τρόπος ώστε ο λογαριασμός σου να βρει μεγαλύτερο κοινό
         email: Θα σου σταλεί email επιβεβαίωσης
         fields: Μπορείς να έχεις έως 4 σημειώσεις σε μορφή πίνακα στο προφίλ σου
         header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index cc7db0207..db191a091 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -35,8 +35,6 @@ eo:
         current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
         current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
-        discoverable: Montru ĉi tiun profilon en la profilujon por ke la konto estos pli-vaste vidata
-        discoverable_no_directory: Permesi vian konton esti malkovrita de fremduloj per rekomendoj kaj aliaj funkcioj
         email: Vi ricevos konfirman retmesaĝon
         fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo
         header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
@@ -133,7 +131,7 @@ eo:
         honeypot: "%{label} (ne plenigi)"
         inbox_url: URL de la ripetila enirkesto
         irreversible: Forĵeti anstataŭ kaŝi
-        locale: Interfaca lingvo
+        locale: Lingvo de la fasado
         locked: Ŝlosi konton
         max_uses: Maksimuma nombro de uzoj
         new_password: Nova pasvorto
@@ -158,7 +156,7 @@ eo:
         setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
         setting_noindex: Ellistiĝi de retserĉila indeksado
-        setting_reduce_motion: Malrapidigi animaciojn
+        setting_reduce_motion: Redukti moviĝon en la animacioj
         setting_show_application: Publikigi la aplikaĵon uzatan por sendi mesaĝojn
         setting_system_font_ui: Uzi la dekomencan tiparon de la sistemo
         setting_theme: Reteja etoso
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 17a7594f5..00d4ce897 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -37,8 +37,7 @@ es-AR:
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
         current_username: Para confirmar, por favor, ingresá el nombre de usuario de la cuenta actual
         digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
-        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones y otras funciones
-        discoverable_no_directory: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones y otras funciones
+        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras funciones
         email: Se te enviará un correo electrónico de confirmación
         fields: Podés tener hasta 4 elementos mostrados en una tabla en tu perfil
         header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles'
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 9c06e59ba..d02e97a3a 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -5,7 +5,7 @@ es-MX:
       account_alias:
         acct: Especifique el nombre de usuario@dominio de la cuenta desde la cual se desea migrar
       account_migration:
-        acct: Especifique el nombre de usuario@dominio de la cuenta a la cual se desea migrar
+        acct: Especifique el nombre de usuario@dominio de la cuenta a la cual desea migrar
       account_warning_preset:
         text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
         title: Opcional. No visible para el destinatario
@@ -28,7 +28,7 @@ es-MX:
         starts_at: Opcional. En caso de que su anuncio esté vinculado a un intervalo de tiempo específico
         text: Puedes usar la sintaxis toot. Por favor ten en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
       appeal:
-        text: Sólo puedes apelar una amonestación una vez
+        text: Sólo puede apelar una amonestación a la vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
         avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -37,8 +37,7 @@ es-MX:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: El directorio del perfil es otra forma en la que su cuenta puede llegar a un público más amplio
-        discoverable_no_directory: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas
+        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -64,6 +63,7 @@ es-MX:
       domain_allow:
         domain: Este dominio podrá obtener datos de este servidor y los datos entrantes serán procesados y archivados
       email_domain_block:
+        domain: Este puede ser el nombre de dominio que se muestra en al dirección de correo o el registro MX que utiliza. Se comprobarán al registrarse.
         with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en lista negra
       featured_tag:
         name: 'Puede que quieras usar uno de estos:'
@@ -208,8 +208,8 @@ es-MX:
         mention: Enviar correo electrónico cuando alguien te mencione
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
-        report: Nuevo informe enviado
-        trending_tag: Una nueva tendencia requiere revisión
+        report: Nuevo reporte enviado
+        trending_tag: La nueva tendencia requiere de revisión
       rule:
         text: Norma
       tag:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 0663571ab..274f54a08 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -37,8 +37,7 @@ es:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas
-        discoverable_no_directory: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas
+        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 96a1ed3e4..d2e51b209 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -29,7 +29,6 @@ et:
         current_password: Turvalisuse huvides palun sisestage praeguse konto salasõna
         current_username: Kinnitamiseks palun sisestage oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka perioodi tegevusetust ja ainult siis, kui Teile on saadetud privaatseid sõnumeid
-        discoverable: Profiilikataloog on veel üks viis, kuidas Teie konto saab jõuda laiema publikuni
         email: Teile saadetakse kinnituskiri e-posti teel
         fields: Te saate oma profiilil tabelina kuvada kuni 4 asja
         header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 09bf37920..99a27e4e6 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -35,8 +35,6 @@ eu:
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
         digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
-        discoverable: Profilen direktorioa zure kontua jende gehiagok irakurtzeko modu bat da
-        discoverable_no_directory: Baimendu zure kontua ezezagunek aurkitu ahal izatea gomendio eta beste ezaugarrien bidez
         email: Baieztapen e-mail bat bidaliko zaizu
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index b5f023d86..679d7d8fd 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -35,8 +35,6 @@ fa:
         current_password: به دلایل امنیتی لطفاً رمز این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
-        discoverable: فهرست گزیدهٔ کاربران، راهی دیگر برای رسیدن به مخاطبان گسترده‌تری برای حسابتان است
-        discoverable_no_directory: اجازه دهید که حساب‌تان از طریق پیشنهادات و سایر قابلیت‌ها، توسط افراد غریبه قابل کشف باشد
         email: به شما ایمیل تأییدی فرستاده خواهد شد
         fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 279d55d8c..678ce7291 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -37,8 +37,6 @@ fi:
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjätunnus
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
-        discoverable: Profiilihakemisto on toinen tapa, jolla tilisi voi tavoittaa laajemman yleisön
-        discoverable_no_directory: Salli tuntemattomien löytää tilisi suositusten ja muiden ominaisuuksien kautta
         email: Sinulle lähetetään vahvistussähköposti
         fields: Sinulla voi olla korkeintaan 4 asiaa profiilissasi taulukossa
         header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 0e44dad0a..52e4ceb2a 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -37,8 +37,7 @@ fr:
         current_password: Pour des raisons de sécurité, veuillez saisir le mot de passe du compte courant
         current_username: Pour confirmer, veuillez saisir le nom d'utilisateur du compte courant
         digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence
-        discoverable: L’annuaire des profils est une autre façon pour votre compte d’atteindre une plus grande audience
-        discoverable_no_directory: Permettre à des inconnu·e·s de découvrir votre compte par le biais des recommandations et autres fonctionnalités
+        discoverable: Permettre à votre compte d’être découvert par des inconnus par le biais de recommandations, de tendances et d’autres fonctionnalités
         email: Vous recevrez un courriel de confirmation
         fields: Vous pouvez avoir jusqu’à 4 éléments affichés en tant que tableau sur votre profil
         header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
@@ -55,7 +54,7 @@ fr:
         setting_display_media_hide_all: Toujours masquer les médias
         setting_display_media_show_all: Toujours montrer les médias
         setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
-        setting_noindex: Affecte votre profil public ainsi que vos statuts
+        setting_noindex: Affecte votre profil public ainsi que vos messages
         setting_show_application: Le nom de l’application que vous utilisez pour publier sera affichée dans la vue détaillée de vos messages
         setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
         setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 2ca13642a..ac71f8307 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -35,8 +35,6 @@ gd:
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
-        discoverable: Ceadaich gun lorg coigrich an cunntas agad le taic o mholaidhean, eòlaire nam pròifil is gleusan eile
-        discoverable_no_directory: Ceadaich gun lorg coigrich an cunntas agad le taic o mholaidhean is gleusan eile
         email: Thèid post-d dearbhaidh a chur thugad
         fields: Faodaidh tu suas ri 4 nithean a shealltainn mar chlàr air a’ phròifil agad
         header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 4d7f79dfd..e120c2c8b 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -28,7 +28,7 @@ gl:
         starts_at: Opcional. No caso de que o teu anuncio estea vinculado a un intre de tempo específico
         text: Podes empregar a sintaxe na publicación. Ten en conta o espazo que ocupará o anuncio na pantalla da usuaria
       appeal:
-        text: Só podes apelar a decesión unha vez
+        text: Só podes apelar a decisión unha vez
       defaults:
         autofollow: As persoas que se conectaron a través dun convite seguirante automáticamente
         avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
@@ -37,8 +37,7 @@ gl:
         current_password: Por razóns de seguridade, introduce o contrasinal da conta actual
         current_username: Para confirmar, introduce o nome de usuaria da conta actual
         digest: Enviar só tras un longo período de inactividade e só se recibiches algunha mensaxe directa na tua ausencia
-        discoverable: Permite que a túa conta poida ser descuberta por persoas descoñecidas a través de recomendacións, directorio de perfil e outras ferramentas
-        discoverable_no_directory: Permitir que a túa conta poida ser descuberta por persoas descoñecidas a través das recomendacións e outras ferramentas
+        discoverable: Permite que a túa conta poida ser descuberta por persoas descoñecidas a través de recomendacións, tendencias e outras ferramentas
         email: Ímosche enviar un correo de confirmación
         fields: Podes ter ate 4 elementos no teu perfil mostrados como unha táboa
         header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index fc4613104..0b9451db8 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -37,8 +37,7 @@ hu:
         current_password: Biztonsági okok miatt kérlek, írd be a jelenlegi fiók jelszavát
         current_username: A jóváhagyáshoz írd be a jelenlegi fiók felhasználói nevét
         digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
-        discoverable: A profil adatbázis egy újabb mód, ahogyan a fiókod szélesebb tömegeket érhet el
-        discoverable_no_directory: Engedélyezzük, hogy a fiókod idegenek által megtalálható legyen javaslatokon és más funkciókon keresztül
+        discoverable: Engedélyezzük, hogy a fiókod idegenek által megtalálható legyen javaslatokon, trendeken és más funkciókon keresztül
         email: Kapsz egy megerősítő e-mailt
         fields: A profilodon legfeljebb 4 bejegyzés szerepelhet táblázatos formában
         header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 5bf178013..94b0096fa 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -29,7 +29,6 @@ hy:
         current_password: Անվտանգութեան նկատառումներից ելնելով, խնդրում ենք մուտքագրել տուել հաշուի ծածկագիրը
         current_username: Հաստատելու համար խնդրում ենք մուտքագրել տուել հաշուի օգտանունը
         digest: Ուղարկուում է պասիւութեան երկար շրջանից յետոյ եւ միայն այն դէպքում, երբ բացակայութեանդ ժամանակ որեւէ անձնական հաղորդագրութիւն ես ստացել
-        discoverable: Էջի մատեանն այլ եղանակ է հաշիւդ լայն շրջանակներին հասանելի դարձնելու
         email: Քեզ ուղարկուել է հաստատման իմակ
         fields: Կարող ես ունենալ մինչեւ 4 կէտ հաշուիդ աղիւսակում ցուցադրելու
         header: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 832e32c56..6254d915b 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -37,8 +37,6 @@ id:
         current_password: Untuk tujuan keamanan mohon masukkan kata sandi akun ini
         current_username: Untuk konfirmasi, mohon masukkan nama pengguna akun ini
         digest: Hanya kirim setelah lama tidak aktif dan hanya jika Anda menerima pesan personal atas absensi Anda
-        discoverable: Direktori profil adalah cara lain agar akun Anda menyentuh audiens yang lebih luas
-        discoverable_no_directory: Izinkan akun Anda ditemukan orang lain lewat rekomendasi dan fitur lain
         email: Anda akan dikirimi email konfirmasi
         fields: Anda bisa memiliki hingga 4 item utk ditampilkan sebagai tabel di profil Anda
         header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 38f44564f..c04660f22 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -37,8 +37,7 @@ is:
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
-        discoverable: Persónusniðamappan er önnur leið til að láta notandaaðganginn þinn ná til fleiri lesenda
-        discoverable_no_directory: Gerðu öðrum kleift að finna aðganginn þinn í gegnum meðmæli og annað slíkt
+        discoverable: Gerðu öðrum kleift að finna aðganginn þinn í gegnum meðmæli, vinsældir og annað slíkt
         email: Þú munt fá sendan staðfestingarpóst
         fields: Þú getur birt allt að 4 atriði sem töflu á notandasniðinu þínu
         header: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index d23391361..7e44489b5 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -37,8 +37,7 @@ it:
         current_password: Per motivi di sicurezza inserisci la password dell'account attuale
         current_username: Per confermare, inserisci il nome utente dell'account attuale
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
-        discoverable: La directory dei profili è un altro modo in cui il tuo account può raggiungere un pubblico più ampio
-        discoverable_no_directory: Consenti al tuo profilo di esser scoperto da sconosciuti tramite consigli e altre funzionalità
+        discoverable: Consenti al tuo account di essere scoperto da sconosciuti tramite consigli, tendenze e altre funzionalità
         email: Ti manderemo una email di conferma
         fields: Puoi avere fino a 4 voci visualizzate come una tabella sul tuo profilo
         header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index d2e48faa2..c6a52ce78 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -35,8 +35,6 @@ ja:
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
-        discoverable: ディレクトリはあなたのアカウントをより多くの人に見つけてもらうためのひとつの手段です
-        discoverable_no_directory: ディレクトリ機能を使用して、あなたのアカウントを他の人から見つけられるようにします
         email: 確認のメールが送信されます
         fields: プロフィールに表として4つまでの項目を表示することができます
         header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 2a33929a7..cd73cdb47 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -11,7 +11,6 @@ kab:
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
-        discoverable: Tabdert n yimaγnuten d udem-nniḍen i umiḍan-ik akken ad yettwassen ugar
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
diff --git a/config/locales/simple_form.kmr.yml b/config/locales/simple_form.kmr.yml
index bf1ffa7db..dc3416145 100644
--- a/config/locales/simple_form.kmr.yml
+++ b/config/locales/simple_form.kmr.yml
@@ -37,8 +37,7 @@ kmr:
         current_password: Ji bo ewlehiyê ji kerema xwe şîfreya ajimêrê xwe niha têkevin
         current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
         digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
-        discoverable: Mafê biden ku ajimêra te bi pêşniyar, peldanka profîlê û taybetmendiyên din ji aliyê bîyaniyan ve bê vedîtin
-        discoverable_no_directory: Mafê biden ku ajimêra te bi pêşniyar û taybetmendiyên din ji aliyê bîyaniyan ve bê vedîtin
+        discoverable: Mafê biden ku ajimêra te bi pêşniyar û taybetmendiyên din ji aliyê biyaniyan ve bê vedîtin
         email: Ji te re e-name ya pejirandinê were
         fields: Tu dikarî heya 4 hêmanan wekî tabloyek li ser profîla xwe nîşan bidî
         header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 8648cab82..7ca16089e 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -37,8 +37,7 @@ ko:
         current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
         current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
         digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
-        discoverable: 당신의 계정을 추천과 기타 기능들에 의해 다른 사람들이 발견할 수 있게 허용합니다
-        discoverable_no_directory: 당신의 계정을 추천과 기타 기능들에 의해 다른 사람들이 발견할 수 있도록 허용합니다
+        discoverable: 추천, 트렌드 및 기타 기능을 통해 낯선 사람이 귀하의 계정을 찾을 수 있도록 허용합니다
         email: 당신은 확인 메일을 받게 됩니다
         fields: 당신의 프로파일에 최대 4개까지 표 형식으로 나타낼 수 있습니다
         header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
@@ -64,6 +63,7 @@ ko:
       domain_allow:
         domain: 이 도메인은 이 서버에서 데이터를 가져갈 수 있고 이 도메인에서 보내진 데이터는 처리되고 저장 됩니다
       email_domain_block:
+        domain: 이메일에 표시되는 도메인 네임이거나 그것이 사용하는 MX 레코드일 수 있습니다. 가입시에 검증됩니다.
         with_dns_records: 입력한 도메인의 DNS를 조회를 시도하여 나온 값도 차단됩니다
       featured_tag:
         name: '이것들을 사용하면 좋을 것 같습니다:'
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index 3ccce01c3..76440ee95 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -29,7 +29,6 @@ ku:
         current_password: بۆ مەبەستی پاراستن تکایە تێپەروشەی هەژمارەی ئێستاکەت بنووسە
         current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
         digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
-        discoverable: پێرستی هەڵبژاردەی بەکارهێنەران،تەنها ڕیگایەکی دیکەیە بۆ گەیشتنی بەکارهێنەری فرەتر بۆ هەژمارەکەت
         email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
         fields: دەتوانیت تا ٤بڕگەت هەبێت کە وەک خشتەیەک لەسەر پرۆفایلەکەت پیشان بدرێت
         header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index ee844e166..6f466fba8 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -37,8 +37,7 @@ lv:
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
         digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
-        discoverable: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem, profila direktoriju un citām iespējām
-        discoverable_no_directory: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem un citām iespējām
+        discoverable: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem, tendencēm un citām iespējām
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
         fields: Savā profilā kā tabulu vari parādīt līdz 4 vienumiem
         header: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 20388b90b..13d86443c 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -35,7 +35,6 @@ nl:
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
-        discoverable: De gebruikersgids is een andere manier waarmee jouw account een groter publiek kan bereiken
         email: Je krijgt een bevestigingsmail
         fields: Je kan maximaal 4 items als een tabel op je profiel weergeven
         header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 04c92e92e..0e9988654 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -35,7 +35,6 @@ nn:
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: Profilmappen er en annen måte for kontoen din å nå et bredere publikum på
         email: Du får snart ein stadfestings-e-post
         fields: Du kan ha opptil 4 gjenstander vist som en tabell på profilsiden din
         header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 34fa2859c..7f1b8cbac 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -35,7 +35,6 @@
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: Profilmappen er en annen måte for kontoen din å nå et bredere publikum på
         email: Du vil bli tilsendt en bekreftelses-E-post
         fields: Du kan ha opptil 4 gjenstander vist som en tabell på profilsiden din
         header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index beb0fa8f4..0ae0bb365 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -29,7 +29,6 @@ oc:
         current_password: Per de rasons de seguretat volgatz picar lo senhal del compte actual
         current_username: Per confirmar, volgatz picar lo nom d’utilizaire del compte actual
         digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia
-        discoverable: L’annuari de perfiles es un biais mai per que vòstre compte aja una audiéncia mai granda
         email: Vos mandarem un corrièl de confirmacion
         fields: Podètz far veire cap a 4 elements sus vòstre perfil
         header: PNG, GIF o JPG. Maximum %{size}. Serà retalhada en %{dimensions}px
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index c69be55ae..8aa8626f9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -35,8 +35,6 @@ pl:
         current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
         current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
-        discoverable: Katalog profilu jest jednym ze sposobów, dzięki którym Twoje konto dotrze do szerszego grona
-        discoverable_no_directory: Pozwól na odkrywanie Twojego konta przez nieznajomych poprzez rekomendacje i inne funkcje
         email: Otrzymasz e-mail potwierdzający
         fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
         header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index f60c886af..b96952e96 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -35,8 +35,6 @@ pt-BR:
         current_password: Para fins de segurança, por favor, digite a senha da conta atual
         current_username: Para confirmar, por favor, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
-        discoverable: O diretório de perfis é outra maneira de sua conta alcançar um público maior
-        discoverable_no_directory: Permitir que sua conta seja visível para desconhecidos através de recomendações e outras funcionalidades
         email: Você receberá um e-mail de confirmação
         fields: Você pode ter até 4 itens mostrados em forma de tabela no seu perfil
         header: PNG, GIF or JPG. Arquivos de até %{size}. Serão redimensionados para %{dimensions}px
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 635b55b35..7e75b96e5 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -37,8 +37,7 @@ pt-PT:
         current_password: Para fins de segurança, por favor, introduza a palavra-passe da conta atual
         current_username: Para confirmar, por favor, introduza o nome de utilizador da conta atual
         digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência
-        discoverable: O diretório de perfis é outra maneira da sua conta alcançar um público mais vasto
-        discoverable_no_directory: Permitir que a sua conta seja descoberta por estranhos através de recomendações e outras funções
+        discoverable: Permitir que a sua conta seja descoberta por outros através de recomendações, destaques e outras funções
         email: Será enviado um e-mail de confirmação
         fields: Pode ter até 4 itens expostos, em forma de tabela, no seu perfil
         header: PNG, GIF or JPG. Arquivos até %{size}. Vão ser reduzidos para %{dimensions}px
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 31da7e2eb..1f0fee419 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -29,7 +29,6 @@ ro:
         current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
         current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
         digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
-        discoverable: Directorul de profil este un alt mod prin care contul tău poate ajunge la un public mai larg
         email: Vei primi un e-mail de confirmare
         fields: Poti afișa pană la maxim 4 adrese sub formă de tabel pe pofilul tău
         header: PNG, GIF sau JPG. Cel mult %{size}. Vor fi redimensionate la %{dimensions}px
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 83a1979ec..ef3bf4ad3 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -37,8 +37,7 @@ ru:
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
-        discoverable: Каталог профилей это один из способов получить охват вашего профиля более обширной аудиторией.
-        discoverable_no_directory: Разрешить сторонним людям находить ваш профиль через рекомендации и прочие функции
+        discoverable: Разрешить другим людям находить ваш профиль через рекомендации, тренды и другие функции
         email: Вам будет отправлено электронное письмо с подтверждением.
         fields: В профиле можно отобразить до 4 пунктов в виде таблицы.
         header: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшена до %{dimensions}px.
@@ -201,6 +200,7 @@ ru:
           sign_up_requires_approval: Ограничить регистрации
         severity: Правило
       notification_emails:
+        appeal: Кто-то обжалует решение модератора
         digest: Присылать дайджест по e-mail
         favourite: Ваш пост добавили в избранное
         follow: Новый подписчик
@@ -208,6 +208,8 @@ ru:
         mention: Новое упоминание
         pending_account: Новая заявка на создание аккаунта
         reblog: Ваш пост продвинули
+        report: Новое обращение отправлено
+        trending_tag: Новый тренд требует рассмотрения
       rule:
         text: Правило
       tag:
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 2a36c92c2..b894bc912 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -35,7 +35,6 @@ sc:
         current_password: Pro chistiones de seguresa inserta sa crae de intrada de su contu atuale
         current_username: Pro cunfirmare inserta su nòmine utente de su contu atuale
         digest: Imbiadu isceti a pustis de unu perìodu longu de inatividade, e isceti si as retzidu calicunu messàgiu personale cando non bi fias
-        discoverable: Permite chi su contu tuo potzat èssere iscobertu dae persones disconnotas pro mèdiu de cussìgios e àteras optziones
         email: As a retzire unu messàgiu eletrònicu de cunfirma
         fields: Podes tènnere finas a 4 elementos ammustrados in una tabella in su profilu tuo
         header: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index b2b555dff..847a68e0f 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -22,7 +22,6 @@ sk:
         current_password: Z bezpečtnostných dôvodov prosím zadaj heslo súčasného účtu
         current_username: Pre potvrdenie prosím zadaj prezývku súčasného účtu
         digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdržal/a nejaké osobné správy kým si bol/a preč
-        discoverable: Zoznam profilov predstavuje ďalšiu cestu akou tvoj účet môže dosiahnúť väčšie publikum
         email: Bude ti odoslaný potvrdzujúci email
         fields: Až štyri položky môžeš mať na svojom profile zobrazené vo forme tabuľky
         header: PNG, GIF, alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index c6be72de2..dbb8c80f7 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -37,8 +37,7 @@ sq:
         current_password: Për qëllime sigurie, ju lutemi, jepni fjalëkalimin e llogarisë së tanishme
         current_username: Që ta ripohoni, ju lutemi, jepni emrin e përdoruesit të llogarisë së tanishme
         digest: I dërguar vetëm pas një periudhe të gjatë pasiviteti dhe vetëm nëse keni marrë ndonjë mesazh personal gjatë mungesës tuaj
-        discoverable: Drejtoria e profileve është një rrugë tjetër përmes së cilës llogaria juaj mund të mbërrijë te një publik më i gjerë
-        discoverable_no_directory: Lejojeni llogarinë tuaj të zbulohet nga të panjohur përmes rekomandimesh dhe veçorish të tjera
+        discoverable: Lejoni që llogaria juaj të zbulohet nga të huaj përmes rekomandimesh, gjërash në modë dhe veçorish të tjera
         email: Do t’ju dërgohet një email ripohimi
         fields: Te profili juaj mund të keni deri në 4 objekte të shfaqur si tabelë
         header: PNG, GIF ose JPG. E shumta %{size}. Do të ripërmasohet në %{dimensions}px
@@ -210,6 +209,7 @@ sq:
         pending_account: Llogaria e re lyp shqyrtim
         reblog: Dikush përforcoi gjendjen tuaj
         report: Parashtrohet raportim i ri
+        trending_tag: Për gjëra të reja në modë lypset shqyrtim
       rule:
         text: Rregull
       tag:
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 5a276e635..c311eb189 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -31,7 +31,6 @@ sv:
         avatar: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
         bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
-        discoverable_no_directory: Tillåt att ditt konto kan ses genom rekommendationer och andra funktioner
         email: Du kommer att få ett bekräftelsemeddelande via e-post
         fields: Du kan ha upp till 4 objekt visade som en tabell på din profil
         header: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 09b5d1cd9..303a684e2 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -37,8 +37,7 @@ th:
         current_password: เพื่อวัตถุประสงค์ด้านความปลอดภัย โปรดป้อนรหัสผ่านของบัญชีปัจจุบัน
         current_username: เพื่อยืนยัน โปรดป้อนชื่อผู้ใช้ของบัญชีปัจจุบัน
         digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
-        discoverable: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำ, ไดเรกทอรีโปรไฟล์ และคุณลักษณะอื่น ๆ
-        discoverable_no_directory: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำและคุณลักษณะอื่น ๆ
+        discoverable: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำ, แนวโน้ม และคุณลักษณะอื่น ๆ
         email: คุณจะได้รับอีเมลยืนยัน
         fields: คุณสามารถมีได้มากถึง 4 รายการแสดงเป็นตารางในโปรไฟล์ของคุณ
         header: PNG, GIF หรือ JPG สูงสุด %{size} จะถูกย่อขนาดเป็น %{dimensions}px
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 4c9c9df89..4a2115742 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -37,8 +37,7 @@ tr:
         current_password: Güvenlik nedeniyle lütfen şu anki hesabın parolasını girin
         current_username: Onaylamak için lütfen şu anki hesabın kullanıcı adını girin
         digest: Sadece uzun bir süre hareketsiz kaldıktan sonra ve yalnızca yokluğunuzda herhangi bir kişisel mesaj aldıysanız gönderilir
-        discoverable: Profil dizini, hesabınızın daha geniş bir kitleye ulaşmasının başka bir yoludur
-        discoverable_no_directory: Hesabınızın, öneriler ve diğer özellikler aracılığıyla yabancılar tarafından keşfedilmesine izin verin
+        discoverable: Hesabınızın öneriler, trendler ve diğer özellikler aracılığıyla yabancılar tarafından keşfedilmesine izin verin
         email: Onay e-postası gönderilir
         fields: Profilinizde tablo olarak görüntülenen en fazla 4 ögeye sahip olabilirsiniz
         header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index a5cef9a0f..339af8ffb 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -35,8 +35,6 @@ uk:
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
-        discoverable: Ще один шлях, за яким про вас можуть дізнатися користувачі — каталог профілів
-        discoverable_no_directory: Дозволити знаходити ваш обліковий запис стороннім людям за допомогою рекомендацій та інших можливостей
         email: Вам надійде електронний лист з підтвердженням
         fields: До 4 елементів може бути відображено як таблиця у вашому профілі
         header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index d40ff8372..75c0c8338 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -37,8 +37,7 @@ vi:
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
-        discoverable: Cho phép tài khoản của bạn xuất hiện trong gợi ý theo dõi và những tính năng khác
-        discoverable_no_directory: Cho phép mọi người tìm thấy tài khoản của bạn thông qua gợi ý theo dõi và các tính năng khác
+        discoverable: Cho phép tài khoản của bạn xuất hiện trong gợi ý theo dõi, xu hướng và những tính năng khác
         email: Bạn sẽ được gửi một email xác nhận
         fields: Được phép tạo tối đa 4 mục trên trang cá nhân của bạn
         header: PNG, GIF hoặc JPG. Kích cỡ tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 3d63343cb..a612f02cd 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -37,8 +37,6 @@ zh-CN:
         current_password: 为了安全起见,请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录,且收到了私信时发送
-        discoverable: 用户目录能够让你的帐号广为人知
-        discoverable_no_directory: 允许别人通过推荐和其他途径发现你的账户
         email: 我们会向你发送一封确认邮件
         fields: 这将会在个人资料页上以表格的形式展示,最多 4 个项目
         header: 文件大小限制 %{size},只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 8b8f17c22..412b1a769 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -35,8 +35,6 @@ zh-HK:
         current_password: 基於保安緣故,請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄,且收到了私信時發送
-        discoverable: 個人資料目錄可以讓你的帳號更廣為人知
-        discoverable_no_directory: 允許他人通過推薦與其他功能探索你的賬號
         email: 你將收到一封確認電郵
         fields: 個人資料頁可顯示多至 4 個項目
         header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 %{size},會縮裁成 %{dimensions}px
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 59d90128d..9501533f1 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -37,8 +37,7 @@ zh-TW:
         current_password: 因安全因素,請輸入目前帳戶的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登入且在未登入期間收到私訊時傳送
-        discoverable: 加入個人資料目錄能接觸更多閱聽眾
-        discoverable_no_directory: 允許陌生人透過推薦與其他功能發現您的帳號
+        discoverable: 允許陌生人透過推薦、熱門趨勢及其他功能發現您的帳號
         email: 您將收到一封確認電子郵件
         fields: 您可在個人資料上有至多 4 個以表格形式顯示的項目
         header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 %{size},會按比例縮小成 %{dimensions} 像素
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f16283e2e..6574d0dcf 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -24,6 +24,7 @@ sk:
       Tento účet je virtuálnym aktérom, ktorý predstavuje samotný server a nie žiadného jedného užívateľa.
       Je využívaný pre potreby federovania a nemal by byť blokovaný, pokiaľ nechceš zablokovať celý server, čo ide lepšie dosiahnúť cez blokovanie domény.
     learn_more: Zisti viac
+    logout_before_registering: Už si prihlásený/á.
     privacy_policy: Zásady súkromia
     rules: Serverové pravidlá
     see_whats_happening: Pozoruj, čo sa deje
@@ -71,7 +72,6 @@ sk:
     media: Médiá
     moved_html: "%{name} účet bol presunutý na %{new_profile_link}:"
     network_hidden: Táto informácia nieje k dispozícii
-    never_active: Nikdy
     nothing_here: Nič tu nie je!
     people_followed_by: Ľudia, ktorých %{name} sleduje
     people_who_follow: Ľudia sledujúci %{name}
@@ -345,17 +345,6 @@ sk:
       reject_media_hint: Vymaže miestne uložené súbory médií a odmietne ich sťahovanie v budúcnosti. Nepodstatné pri vylúčení
       reject_reports: Zamietni hlásenia
       reject_reports_hint: Ignoruj všetky hlásenia prichádzajúce z tejto domény. Nevplýva na blokovania
-      rejecting_media: odmietanie médiálnych súborov
-      rejecting_reports: odmietanie hlásení
-      severity:
-        silence: stíšené
-        suspend: vylúčené
-      show:
-        retroactive:
-          silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény
-          suspend: Zruš suspendáciu všetkých momentálne ovplyvnených účtov z tejto domény
-        title: Zruš blokovanie domény %{domain}
-        undo: Vráť späť
       undo: Odvolaj blokovanie domény
       view: Ukáž blokovanie domén
     email_domain_blocks:
@@ -383,7 +372,6 @@ sk:
       delivery:
         all: Všetko
         unavailable: Nedostupné
-        warning: Upozornenie
       delivery_available: Je v dosahu doručovania
       moderation:
         all: Všetky
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index fea123d0b..9fc570610 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -66,7 +66,6 @@ sl:
     media: Mediji
     moved_html: "%{name} se je prestavil na %{new_profile_link}:"
     network_hidden: Ta informacija ni na voljo
-    never_active: Nikoli
     nothing_here: Tukaj ni ničesar!
     people_followed_by: Ljudje, ki jim sledi %{name}
     people_who_follow: Ljudje, ki sledijo %{name}
@@ -303,17 +302,6 @@ sl:
       reject_media_hint: Odstrani lokalno shranjene predstavnostne datoteke in zavrača prenašanje le-teh v prihodnosti. Za suspenzije ni pomembno
       reject_reports: Zavrnjene prijave
       reject_reports_hint: Prezri vse prijave, ki pridejo iz te domene. Za suspenzije ni pomembno
-      rejecting_media: zavrnitev predstavnostnih datotek
-      rejecting_reports: zavrnitev prijav
-      severity:
-        silence: utišani
-        suspend: suspendirani
-      show:
-        retroactive:
-          silence: Prekliči utišanje za vse obstoječe račune iz te domene
-          suspend: Aktiviraj vse obstoječe račune iz te domene
-        title: Razveljavi domenski blok za %{domain}
-        undo: Razveljavi
       undo: Razveljavi domenski blok
     email_domain_blocks:
       add_new: Dodaj novo
@@ -334,17 +322,39 @@ sl:
       language: Za jezik
       status: Stanje
     instances:
+      availability:
+        failure_threshold_reached: Prag neuspelih poskusov dosežen %{date}.
+        no_failures_recorded: Ni zabeleženih neuspelih poskusov.
+        title: Razpoložljivost
       back_to_all: Vse
       back_to_limited: Omejeno
       back_to_warning: Opozorilo
       by_domain: Domena
+      content_policies:
+        comment: Interna opomba
+        description_html: Določite lahko pravila (t.i. politike), ki bodo veljale za vse račune te domene ter vseh njenih poddomen.
+        policies:
+          reject_media: Zavrni večpredstavnost
+          reject_reports: Zarvni poročila
+          silence: Omeji
+          suspend: Suspendiraj
+        policy: Pravila
+        reason: Javni razlog
+        title: Pravila glede vsebine
+      dashboard:
+        instance_accounts_dimension: Najpogosteje sledeni računi
+        instance_accounts_measure: shranjenih računov
+        instance_followers_measure: naših sledilcev tukaj
+        instance_follows_measure: njihovih sledilcev tukaj
+        instance_languages_dimension: Naj jeziki
+        instance_media_attachments_measure: shranjenih predstavnostnih priponk
+        instance_reports_measure: poročil o njih
+        instance_statuses_measure: shanjenih objav
       delivery:
         all: Vse
         clear: Počisti napake dostave
         stop: Ustavi dostavo
-        title: Dostava
         unavailable: Ni na voljo
-        warning: Opozorilo
       delivery_available: Na voljo je dostava
       moderation:
         all: Vse
@@ -352,12 +362,14 @@ sl:
         title: Moderiranje
       private_comment: Zasebni komentar
       public_comment: Javni komentar
+      purge_description_html: Če menite, da je ta domena trajno nedosegljiva, lahko v svoji shrambi izbrišete vse zapise računov in povezane podatke iz te domene. To lahko vzame nekaj časa.
       title: Federacija
       total_blocked_by_us: Blokirano iz naše strani
       total_followed_by_them: Oni ti sledijo
       total_followed_by_us: Mi ti sledimo
       total_reported: Poročila o njih
       total_storage: Predstavnostne priloge
+      totals_time_period_hint_html: Spodaj prikazani seštevki vključujejo podatke za celotno obdobje.
     invites:
       deactivate_all: Onemogoči vse
       filter:
@@ -603,6 +615,7 @@ sl:
     status:
       account_status: Stanje računa
       confirming: Čakanje na potrditev e-pošte.
+      functional: Vaš račun je polno opravilen.
       pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
     trouble_logging_in: Težave pri prijavi?
     use_security_key: Uporabi varnostni ključ
@@ -986,6 +999,7 @@ sl:
       '2629746': 1 mesec
       '31556952': 1 leto
       '5259492': 2 meseca
+      '604800': 1 week
       '63113904': 2 leti
       '7889238': 3 mesece
     min_age_label: Starostna meja
@@ -1110,7 +1124,6 @@ sl:
         delete_statuses: Objave odstranjene
         disable: Račun je zamrznjen
         none: Opozorilo
-        sensitive: Mediji so skriti
         silence: Račun je omejen
         suspend: Račun je suspendiran
     welcome:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 2f1336336..1f65211ea 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -16,6 +16,7 @@ sq:
     contact: Kontakt
     contact_missing: I parregulluar
     contact_unavailable: N/A
+    continue_to_web: Vazhdoni te aplikacioni web
     discover_users: Zbuloni përdorues
     documentation: Dokumentim
     federation_hint_html: Me një llogari në %{instance}, do të jeni në gjendje të ndiqni persona në çfarëdo shërbyesi Mastodon dhe më tej.
@@ -25,6 +26,8 @@ sq:
       Kjo llogari është një aktor virtual i përdorur për të përfaqësuar vetë shërbyesin dhe jo ndonjë përdorues individual.
       Përdoret për qëllime federimi dhe s’duhet bllokuar, veç në daçi të bllokoni krejt instancën, me ç’rast do të duhej të përdornit bllokim përkatësie.
     learn_more: Mësoni më tepër
+    logged_in_as_html: Aktualisht jeni i futur si %{username}.
+    logout_before_registering: Jeni i futur tashmë.
     privacy_policy: Rregulla privatësie
     rules: Rregulla shërbyesi
     rules_html: 'Më poshtë keni një përmbledhje të rregullave që duhet të ndiqni, nëse doni të keni një llogari në këtë shërbyes Mastodon:'
@@ -69,7 +72,6 @@ sq:
     media: Media
     moved_html: "%{name} ka kaluar te %{new_profile_link}:"
     network_hidden: Këto të dhëna s’janë të passhme
-    never_active: Kurrë
     nothing_here: S’ka gjë këtu!
     people_followed_by: Persona të ndjekur nga %{name}
     people_who_follow: Persona që ndjekin %{name}
@@ -448,21 +450,6 @@ sq:
       reject_media_hint: Heq kartela media të depozituara lokalisht dhe nuk pranon të shkarkohen të tilla në të ardhmen. Pa peshë për pezullimet
       reject_reports: Hidh tej raportimet
       reject_reports_hint: Shpërfillini krejt raportimet e ardhura nga kjo përkatësi. Pa peshë për pezullimet
-      rejecting_media: mospranim kartelash media
-      rejecting_reports: mospranim raportimesh
-      severity:
-        silence: e heshtuar
-        suspend: e pezulluar
-      show:
-        affected_accounts:
-          one: Pat ndikim te një llogari në bazën e të dhënave
-          other: Pat ndikim te %{count} llogari në bazën e të dhënave
-          zero: S’pat ndikim te ndonjë llogari në bazën e të dhënave
-        retroactive:
-          silence: Hiqu heshtimin krejt llogarive ekzistuese nga kjo përkatësi
-          suspend: Hiqu pezullimin krejt llogarive ekzistuese nga kjo përkatësi
-        title: Zhbëje bllokimin e përkatësisë për %{domain}
-        undo: Zhbëje
       undo: Zhbëje bllokimin e përkatësisë
       view: Shihni bllokim përkatësie
     email_domain_blocks:
@@ -492,23 +479,46 @@ sq:
       title: Rekomandime ndjekjeje
       unsuppress: Rikthe rekomandime ndjekjeje
     instances:
+      availability:
+        description_html:
+          one: Nëse dhënia e mesazheve te përkatësia dështon për <strong>%{count} ditë</strong> pa sukses, s’do të bëhen përpjekje të tjera për dhënie, veç në u marrtë një dërgim <em>prej</em> përkatësisë.
+          other: Nëse dhënia e mesazheve te përkatësia dështon për <strong>%{count} ditë</strong> pa sukses, s’do të bëhen përpjekje të tjera për dhënie, veç në u marrtë një dërgim <em>prej</em> përkatësisë.
+        failure_threshold_reached: U mbërrit në prag dështimesh më %{date}.
+        failures_recorded:
+          one: Përpjekje e dështuar në %{count} ditë.
+          other: Përpjekje e dështuar në %{count} ditë të ndryshme.
+        no_failures_recorded: S’ka dështime të regjistruara.
       back_to_all: Krejt
       back_to_limited: E kufizuar
       back_to_warning: Kujdes
       by_domain: Përkatësi
       confirm_purge: Jeni i sigurt se doni të fshihen përgjithmonë të dhënat prej kësaj përkatësie?
+      content_policies:
+        comment: Shënim i brendshëm
+        description_html: Mund të përkufizoni rregulla lënde që do të zbatohen mbi krejt llogaritë prej kësaj përkatësie dhe cilësdo nënpërkatësi të saj.
+        policies:
+          reject_media: Mos prano media
+          reject_reports: Hidh tej raportimet
+          silence: Kufizoje
+          suspend: Pezulloje
+        policy: Rregulla
+        reason: Arsye publike
+        title: Rregulla lënde
+      dashboard:
+        instance_accounts_dimension: Llogaritë më të ndjekura
+        instance_accounts_measure: llogari të depozituara
+        instance_followers_measure: ndjekës tanët atje
+        instance_follows_measure: ndjekës të tyre këtu
+        instance_languages_dimension: Gjuhë kryesuese
+        instance_media_attachments_measure: bashkëngjitje media të depozituara
+        instance_reports_measure: raportime rreth tyre
+        instance_statuses_measure: postime të depozituara
       delivery:
         all: Krejt
         clear: Spastro gabime dërgimi
         restart: Rinis dërgimin
         stop: Ndale dërgimin
-        title: Dërgim
         unavailable: Jo i passhëm
-        unavailable_message: Dërgim jo i passhëm
-        warning: Kujdes
-        warning_message:
-          one: Dështim dërgimi %{count} ditë
-          other: Dështim dërgimi %{count} ditë
       delivery_available: Ka shpërndarje të mundshme
       delivery_error_days: Ditë gabimi dështimi
       delivery_error_hint: Nëse dërgimi s’është i mundshëm për %{count} ditë, do t’i vihet shenjë automatikisht si i padërgueshëm.
@@ -525,12 +535,14 @@ sq:
       private_comment: Koment privat
       public_comment: Koment publik
       purge: Spastroje
+      purge_description_html: Nëse besoni se kjo përkatësi është përgjithnjë e mbyllur, mund të fshini prej hapësirës tuaj të depozitimit krejt regjistrimet dhe të dhëna të përshoqëruara me llogarinë. Kjo mund të zgjasë ca.
       title: Federim
       total_blocked_by_us: Bllokuar nga ne
       total_followed_by_them: Ndjekur prej tyre
       total_followed_by_us: Ndjekur nga ne
       total_reported: Raportime rreth tyre
       total_storage: Bashkëngjitje media
+      totals_time_period_hint_html: Vlerat e shfaqura më poshtë përfshijnë të dhënat për krejt kohën.
     invites:
       deactivate_all: Çaktivizoji krejt
       filter:
@@ -585,6 +597,7 @@ sq:
       action_taken_by: Veprimi i ndërmarrë nga
       actions:
         delete_description_html: Postimet e raportuara do të fshihen dhe do të regjistrohet një paralajmërim, për t’ju ndihmuar të përshkallëzoni hapat në rast shkeljesh të ardhme nga e njëjta llogari.
+        mark_as_sensitive_description_html: Media në postimet e raportuar do të shënohet si rezervat dhe do të regjistrohet një paralajmërim për t’ju ndihmuar ta shpini çështjen më tej, në rast shkeljesh të ardhshme nga e njëjta llogari.
         other_description_html: Shihni më tepër mundësi për kontroll të sjelljes së një llogari dhe përshtatni komunikimin me llogarinë e raportuar.
         resolve_description_html: Ndaj llogarisë së raportuar nuk do të ndërmerret ndonjë veprim, s’do të regjistrohet ndonjë paralajmërim dhe raporti do të mbyllet.
         silence_description_html: Profili do të jetë i dukshëm vetëm për ata që e ndjekin tashmë, ose që e kërkojnë dorazi, duke reduktuar rëndë përhapjen e tij. Mundet përherë të prapakthehet.
@@ -605,6 +618,7 @@ sq:
       forwarded: U përcoll
       forwarded_to: U përcoll te %{domain}
       mark_as_resolved: Vëri shenjë si i zgjidhur
+      mark_as_sensitive: Vëri shenjë si rezervat
       mark_as_unresolved: Vëri shenjë si të pazgjidhur
       no_one_assigned: Askush
       notes:
@@ -748,6 +762,7 @@ sq:
       actions:
         delete_statuses: "%{name} fshiu postime të %{target}"
         disable: "%{name} ngriu postime të %{target}"
+        mark_statuses_as_sensitive: "%{name} u vuri shenjë postimeve të %{target} si rezervat"
         none: "%{name} dërgoi një sinjalizim për %{target}"
         sensitive: "%{name} i vuri shenjë llogarisë së %{target} si rezervat"
         silence: "%{name} e kufizoi llogarinë %{target}"
@@ -773,6 +788,7 @@ sq:
       links:
         allow: Lejoje lidhjen
         allow_provider: Lejoje botuesin
+        description_html: Këto janë lidhje që ndahen aktualisht shumë me llogari prej të cilave shërbyesi juaj sheh postime. Mund të ndihmojë përdoruesit tuaj të gjejnë se ç’po ndodh në botë. S’shfaqen lidhje publikisht, deri sa të miratoni botuesin. Mundeni edhe të lejoni ose hidhni poshtë lidhje individuale.
         disallow: Hiq lejimin e lidhjes
         disallow_provider: Mos e lejo botuesin
         shared_by_over_week:
@@ -784,14 +800,21 @@ sq:
       pending_review: Në pritje të shqyrtimit
       preview_card_providers:
         allowed: Lidhje prej këtij botuesi mund të përdoren
+        description_html: Këto janë përkatësi prej të cilave ndahen shpesh lidhje në shërbyesin tuaj. Lidhjet nuk do të ofrohen publikisht, veç në u miratoftë përkatësia e lidhjes. Miratimi (ose hedhja poshtë) shtrihet edhe te nënpërkatësitë.
         rejected: Lidhje prej këtij botuesi s’do të përdoren
         title: Botues
       rejected: Hedhur poshtë
       statuses:
         allow: Lejo postim
         allow_account: Lejo autor
+        description_html: Këto janë postime të cilat shërbyesi juaj di se po ndahen shumë dhe po zgjidhen si të parapëlqyera për çastin. Mund të ndihmojnë përdoruesit tuaj të rinj dhe të riardhur të gjejnë më tepër vetë për të ndjekur. S’shfaqen postime publikisht, pa miratuar ju autorin dhe autori lejon që llogaria e tij t’u sugjerohet të tjerëve. Mundeni edhe të lejoni, ose hidhni, poshtë postime individuale.
         disallow: Mos lejo postim
         disallow_account: Mos lejo autor
+        not_discoverable: Autori s’ka zgjedhur të jetë i zbulueshëm
+        shared_by:
+          one: Ndarë me të tjerë, ose shënuar si e parapëlqyer një herë
+          other: Ndarë me të tjerë, ose shënuar si e parapëlqyer %{friendly_count} herë
+        title: Postime në modë
       tags:
         dashboard:
           tag_accounts_measure: përdorime unike
@@ -799,6 +822,7 @@ sq:
           tag_servers_dimension: Shërbyes kryesues
           tag_servers_measure: shërbyes të ndryshëm
           tag_uses_measure: përdorime gjithsej
+        description_html: Këta hashtag-ë aktualisht po shfaqen në një numër të madh postimesh që sheh shërbyesi juaj. Kjo mund të ndihmojë përdoruesit tuaj të gjejnë se për çfarë po flasin më shumë njerëzit aktualisht. Pa i miratuar ju, nuk shfaqen publikisht hashtag-ë.
         listable: Mund të sugjerohet
         not_listable: S’do të sugjerohet
         not_trendable: S’do të shfaqet nën të modës
@@ -824,6 +848,7 @@ sq:
       actions:
         delete_statuses: fshirje e postimeve të tij
         disable: ngrirje e llogarisë së tij
+        mark_statuses_as_sensitive: për ’i vënë shenjë postimeve të tyre si rezervat
         none: një vërejtje
         sensitive: vënie shenjë llogarisë së tij si rezervat
         silence: kufizim i llogarisë së tij
@@ -840,6 +865,16 @@ sq:
       subject: Raportim i ri për %{instance} (#%{id})
     new_trends:
       body: 'Gjërat vijuese lypin një shqyrtim, përpara se të mund të shfaqen publikisht:'
+      new_trending_links:
+        no_approved_links: Aktualisht s’ka lidhje në modë të miratuara.
+        title: Lidhje në modë
+      new_trending_statuses:
+        no_approved_statuses: Aktualisht s’ka postime në modë të miratuar.
+        title: Postime në modë
+      new_trending_tags:
+        no_approved_tags: Aktualisht s’ka hashtag-ë në modë të miratuar.
+        title: Hashtag-ë në modë
+      subject: Gjëra të reja në modë për shqyrtim te %{instance}
   aliases:
     add_new: Krijo alias
     created_msg: U krijua me sukses alias i ri. Tani mund të filloni lëvizjen prej llogarisë së vjetër.
@@ -913,8 +948,10 @@ sq:
     status:
       account_status: Gjendje llogarie
       confirming: Po pritet që të plotësohet ripohimi i email-it.
+      functional: Llogaria juaj është tërësisht funksionale.
       pending: Aplikimi juaj është në pritje të shqyrtimit nga stafi ynë. Kjo mund të dojë ca kohë. Nëse aplikimi juaj miratohet, do të merrni një email.
       redirecting_to: Llogaria juaj është joaktive, ngaqë aktualisht ridrejton te %{acct}.
+      view_strikes: Shihni paralajmërime të dikurshme kundër llogarisë tuaj
     too_fast: Formulari u parashtrua shumë shpejt, riprovoni.
     trouble_logging_in: Probleme me hyrjen?
     use_security_key: Përdor kyç sigurie
@@ -990,6 +1027,7 @@ sq:
         submit: Parashtroni apelim
       associated_report: Raportimi i përshoqëruar
       created_at: Datuar
+      description_html: Këto janë veprime të ndërmara kundër llogarisë tuaj dhe sinjalizime që ju janë dërguar nga stafi i %{instance}.
       recipient: Drejtuar
       status: "#%{id} postimi"
       status_removed: Postim i hequr tashmë nga sistemi
@@ -997,8 +1035,9 @@ sq:
       title_actions:
         delete_statuses: Heqje postimi
         disable: Ngrirje e llogarisë
+        mark_statuses_as_sensitive: Vënie shenjë postimeve si me spec
         none: Vërejtje
-        sensitive: Vënie shenjë llogarisë si rezervat
+        sensitive: Vënie shenjë llogarive si me spec
         silence: Kufizim llogarie
         suspend: Pezullim llogarie
       your_appeal_approved: Apelimi juaj u miratua
@@ -1449,6 +1488,7 @@ sq:
       '2629746': 1 muaj
       '31556952': 1 vit
       '5259492': 2 muaj
+      '604800': 1 javë
       '63113904': 2 vjet
       '7889238': 3 muaj
     min_age_label: Prag moshe
@@ -1596,26 +1636,28 @@ sq:
         spam: I padëshiruar
         violation: Lënda cenon udhëzimet vijuese të bashkësisë
       explanation:
-        delete_statuses: Për disa nga postimet tuaja është parë se cenojnë një ose më tepër udhëzime të bashkësisë dhe për pasojë janë hequr nga moderatorët e %{instance}. Cenime të ardhshme mund të sjellin veprime ndëshkimore më të ashpra kundër llogarisë tuaj.
+        delete_statuses: Disa nga postimet tuaja janë parë të cenojnë një ose më tepër udhëzime të bashkësisë dhe për pasojë janë hequr nga moderatorët e %{instance}.
         disable: S’mund të përdorni më llogarinë tuaj, por profili juaj dhe të dhëna të tjera mbeten të paprekura. Mund të kërkoni një kopjeruajtje të të dhënave tuaja, të ndryshoni rregullime llogarie, ose të fshini llogarinë tuaj.
+        mark_statuses_as_sensitive: Disave nga postimet tuaj u është vënë shenjë si me spec nga moderatorët e %{instance}. Kjo do të thotë se njerëzve do t’u duhet të prekin median te postimet, para se të shfaqet një paraparje. Mund t’i vini vetë shenjë medias si me spec, kur postoni në të ardhmen.
         sensitive: Nga sot e tutje, krejt kartelave media të ngarkuara do t’u vihet shenjë si me spec dhe do të fshihen pas një sinjalizimi “klikojeni”.
         silence: Mundeni ende të përdorni llogarinë tuaj, por vetëm personat që tashmë ju ndjekin do të shohin postimet tuaja në këtë shërbyes dhe mund të përjashtoheni nga veçori të ndryshme për zbulim lënde. Sidoqoftë, të tjerët mund t’ju ndjekin dorazi.
         suspend: S’mund të përdorni më llogarinë tuaj dhe profili juaj, si dhe të dhëna të tjera, s’janë më të përdorshëm. Mundeni ende të bëni hyrjen në llogarinë tuaj për të kërkuar një kopjeruajtje të të dhënave tuaja, deri para se të dhënat tuaja të hiqen plotësisht brenda afërsisht 30 ditësh, por do të mbajmë ca të dhëna elementare, për t’ju penguar t’i bëni bisht pezullimin.
-      get_in_touch: Nëse besoni se këtu ka gabim, mund t’i përgjigjeni këtij email-i për t’u lidhur me stafin e %{instance}.
       reason: 'Arsye:'
-      statuses: 'Postime që janë gjetur me cenime:'
+      statuses: 'Postime të cituar:'
       subject:
         delete_statuses: Postimet tuaja në %{acct} janë hequr
         disable: Llogaria juaj %{acct} është ngrirë
+        mark_statuses_as_sensitive: Postimeve tuaj në %{acct} u është vënë shenjë si me spec
         none: Sinjalizim për %{acct}
-        sensitive: Nga sot e tutje, kartelave tuaja media në %{acct} do t’u vihet shenjë si me spec
+        sensitive: Tani e tutje, postimeve tuaj në %{acct} do t’u vihet shenjë si me spec
         silence: Llogaria juaj %{acct} është kufizuar
         suspend: Llogaria juaj %{acct} është pezulluar
       title:
         delete_statuses: Postime të hequra
         disable: Llogari e ngrirë
+        mark_statuses_as_sensitive: Postimeve iu vu shenjë si me spec
         none: Sinjalizim
-        sensitive: Me media të fshehur
+        sensitive: Llogarice iu vu shenjë si me spec
         silence: Llogari e kufizuar
         suspend: Llogari e pezulluar
     welcome:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index b1a0613d5..ca4b89af5 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -137,12 +137,6 @@ sr-Latn:
         title: Novo blokiranje domena
       reject_media: Odbaci multimediju
       reject_media_hint: Uklanja lokalno uskladištene multimedijske fajlove i odbija da ih skida na dalje. Nebitno je za suspenziju
-      show:
-        retroactive:
-          silence: Ugasi ućutkivanje za sve postojeće naloge sa ovog domena
-          suspend: Ugasi suspenzije za sve postojeće naloge sa ovog domena
-        title: Poništi blokadu domena za domen %{domain}
-        undo: Poništi
       undo: Poništi
     email_domain_blocks:
       add_new: Dodaj novuAdd new
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 194111e73..5734cd35d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -204,17 +204,6 @@ sr:
       reject_media_hint: Уклања локално ускладиштене мултимедијске фајлове и одбија да их скида убудуће. Небитно је за суспензију
       reject_reports: Одбаци извештај
       reject_reports_hint: Игнориши све извештаје који долазе са овог домена. Небитно је за суспензије
-      rejecting_media: одбацивање медијских датотека
-      rejecting_reports: одбацивање пријава
-      severity:
-        silence: ућуткани
-        suspend: суспендовани
-      show:
-        retroactive:
-          silence: Угаси ућуткивање за све постојеће налоге са овог домена
-          suspend: Уклони суспензије за све постојеће налоге са овог домена
-        title: Поништи блокаду домена за %{domain}
-        undo: Поништи
       undo: Поништи блок домена
     email_domain_blocks:
       add_new: Додај нови
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 011a0d385..db59e75e7 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -16,6 +16,7 @@ sv:
     contact: Kontakt
     contact_missing: Inte inställd
     contact_unavailable: Ej tillämplig
+    continue_to_web: Fortsätt till webbtjänst
     discover_users: Upptäck användare
     documentation: Dokumentation
     federation_hint_html: Med ett konto på %{instance} kommer du att kunna följa personer på alla Mastodon-servers och mer än så.
@@ -23,6 +24,8 @@ sv:
     hosted_on: Mastodon-värd på %{domain}
     instance_actor_flash: "Detta konto är en virtuell agent som används för att representera servern själv och inte någon individuell användare. Det används av sammanslutningsskäl och ska inte blockeras såvitt du inte vill blockera hela instansen, och för detta fall ska domänblockering användas. \n"
     learn_more: Lär dig mer
+    logged_in_as_html: Inloggad som %{username}.
+    logout_before_registering: Du är redan inloggad.
     privacy_policy: Integritetspolicy
     rules: Serverns regler
     rules_html: 'Nedan en sammanfattning av kontoreglerna för denna Mastodonserver:'
@@ -67,7 +70,6 @@ sv:
     media: Media
     moved_html: "%{name} har flyttat till %{new_profile_link}:"
     network_hidden: Denna information är inte tillgänglig
-    never_active: Aldrig
     nothing_here: Det finns inget här!
     people_followed_by: Personer som %{name} följer
     people_who_follow: Personer som följer %{name}
@@ -387,17 +389,6 @@ sv:
       reject_media_hint: Raderar lokalt lagrade mediefiler och förhindrar möjligheten att ladda ner något i framtiden. Irrelevant för suspensioner
       reject_reports: Avvisa rapporter
       reject_reports_hint: Ignorera alla rapporter som kommer från den här domänen. Gäller inte för avstängningar
-      rejecting_media: avvisar media-filer
-      rejecting_reports: avvisar rapporter
-      severity:
-        silence: tystad
-        suspend: avstängd
-      show:
-        retroactive:
-          silence: Ta bort tysta ner från alla befintliga konton på den här domänen
-          suspend: Ta bort suspendering från alla befintliga konton på den här domänen
-        title: Ångra domänblockering för %{domain}
-        undo: Ångra
       undo: Ångra
       view: Visa domänblock
     email_domain_blocks:
@@ -423,10 +414,7 @@ sv:
         clear: Rensa leverans-fel
         restart: Starta om leverans
         stop: Stoppa leverans
-        title: Leverans
         unavailable: Ej tillgänglig
-        unavailable_message: Leverans otillgängligt
-        warning: Varning
       delivery_available: Leverans är tillgängligt
       empty: Inga domäner hittades.
       moderation:
@@ -1155,6 +1143,7 @@ sv:
       '2629746': 1 månad
       '31556952': 1 år
       '5259492': 2 månader
+      '604800': 1 vecka
       '63113904': 2 år
       '7889238': 3 månader
     min_age_label: Åldersgräns
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 805781598..d5ba7603d 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -55,7 +55,6 @@ ta:
     media: படங்கள்
     moved_html: "%{name} %{new_profile_link}க்கு மாறியுள்ளது:"
     network_hidden: இத்தகவல் கிடைக்கவில்லை
-    never_active: எப்போதுமில்லை
     nothing_here: இங்கு எதுவும் இல்லை!
     people_followed_by: "%{name} பின்தொடரும் நபர்கள்"
     people_who_follow: "%{name}ஐ பின்தொடரும் நபர்கள்"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 9203aec15..11441da96 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -16,12 +16,15 @@ th:
     contact: ติดต่อ
     contact_missing: ไม่ได้ตั้ง
     contact_unavailable: ไม่มี
+    continue_to_web: ดำเนินการต่อไปยังแอปเว็บ
     discover_users: ค้นพบผู้ใช้
     documentation: เอกสารประกอบ
     federation_hint_html: ด้วยบัญชีที่ %{instance} คุณจะสามารถติดตามผู้คนในเซิร์ฟเวอร์ Mastodon และอื่น ๆ
     get_apps: ลองแอปมือถือ
     hosted_on: Mastodon ที่โฮสต์ที่ %{domain}
     learn_more: เรียนรู้เพิ่มเติม
+    logged_in_as_html: คุณกำลังเข้าสู่ระบบเป็น %{username}
+    logout_before_registering: คุณได้เข้าสู่ระบบอยู่แล้ว
     privacy_policy: นโยบายความเป็นส่วนตัว
     rules: กฎของเซิร์ฟเวอร์
     rules_html: 'ด้านล่างคือข้อมูลสรุปของกฎที่คุณจำเป็นต้องปฏิบัติตามหากคุณต้องการมีบัญชีในเซิร์ฟเวอร์ Mastodon นี้:'
@@ -60,7 +63,6 @@ th:
     media: สื่อ
     moved_html: "%{name} ได้ย้ายไปยัง %{new_profile_link}:"
     network_hidden: ไม่มีข้อมูลนี้
-    never_active: ไม่เลย
     nothing_here: ไม่มีสิ่งใดที่นี่!
     people_followed_by: ผู้คนที่ %{name} ติดตาม
     people_who_follow: ผู้คนที่ติดตาม %{name}
@@ -421,21 +423,6 @@ th:
       reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเซิร์ฟเวอร์ออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
       reject_reports: ปฏิเสธรายงาน
       reject_reports_hint: เพิกเฉยรายงานทั้งหมดที่มาจากโดเมนนี้ ไม่เกี่ยวข้องกับการระงับ
-      rejecting_media: กำลังปฏิเสธไฟล์สื่อ
-      rejecting_reports: กำลังปฏิเสธรายงาน
-      severity:
-        silence: จำกัดอยู่
-        suspend: ระงับอยู่
-      show:
-        affected_accounts:
-          one: หนึ่งบัญชีในฐานข้อมูลที่ได้รับผลกระทบ
-          other: "%{count} บัญชีในฐานข้อมูลที่ได้รับผลกระทบ"
-          zero: ไม่มีบัญชีในฐานข้อมูลที่ได้รับผลกระทบ
-        retroactive:
-          silence: เลิกทำการจำกัดบัญชีที่มีผลที่มีอยู่จากโดเมนนี้
-          suspend: เลิกระงับบัญชีที่มีผลที่มีอยู่จากโดเมนนี้
-        title: เลิกทำการปิดกั้นโดเมนสำหรับ %{domain}
-        undo: เลิกทำ
       undo: เลิกทำการปิดกั้นโดเมน
       view: ดูการปิดกั้นโดเมน
     email_domain_blocks:
@@ -471,10 +458,7 @@ th:
         clear: ล้างข้อผิดพลาดการจัดส่ง
         restart: เริ่มการจัดส่งใหม่
         stop: หยุดการจัดส่ง
-        title: การจัดส่ง
         unavailable: ไม่พร้อมใช้งาน
-        unavailable_message: การจัดส่งไม่พร้อมใช้งาน
-        warning: คำเตือน
       delivery_available: มีการจัดส่ง
       delivery_error_days: วันที่มีข้อผิดพลาดการจัดส่ง
       empty: ไม่พบโดเมน
@@ -557,6 +541,7 @@ th:
       forwarded: ส่งต่อแล้ว
       forwarded_to: ส่งต่อไปยัง %{domain} แล้ว
       mark_as_resolved: ทำเครื่องหมายว่าแก้ปัญหาแล้ว
+      mark_as_sensitive: ทำเครื่องหมายว่าละเอียดอ่อน
       mark_as_unresolved: ทำเครื่องหมายว่ายังไม่ได้แก้ปัญหา
       no_one_assigned: ไม่มีใคร
       notes:
@@ -694,6 +679,7 @@ th:
       actions:
         delete_statuses: "%{name} ได้ลบโพสต์ของ %{target}"
         disable: "%{name} ได้อายัดบัญชีของ %{target}"
+        mark_statuses_as_sensitive: "%{name} ได้ทำเครื่องหมายโพสต์ของ %{target} ว่าละเอียดอ่อน"
         none: "%{name} ได้ส่งคำเตือนไปยัง %{target}"
         sensitive: "%{name} ได้ทำเครื่องหมายบัญชีของ %{target} ว่าละเอียดอ่อน"
         silence: "%{name} ได้จำกัดบัญชีของ %{target}"
@@ -742,7 +728,7 @@ th:
           tag_accounts_measure: การใช้งานที่ไม่ซ้ำกัน
           tag_languages_dimension: ภาษายอดนิยม
           tag_servers_dimension: เซิร์ฟเวอร์ยอดนิยม
-          tag_servers_measure: เซิร์ฟเวอร์อื่น
+          tag_servers_measure: เซิร์ฟเวอร์ต่าง ๆ
           tag_uses_measure: การใช้งานทั้งหมด
         listable: สามารถแนะนำ
         not_listable: จะไม่แนะนำ
@@ -770,6 +756,7 @@ th:
       actions:
         delete_statuses: เพื่อลบโพสต์ของเขา
         disable: เพื่ออายัดบัญชีของเขา
+        mark_statuses_as_sensitive: เพื่อทำเครื่องหมายโพสต์ของเขาว่าละเอียดอ่อน
         sensitive: เพื่อทำเครื่องหมายบัญชีของเขาว่าละเอียดอ่อน
         silence: เพื่อจำกัดบัญชีของเขา
         suspend: เพื่อระงับบัญชีของเขา
@@ -860,6 +847,7 @@ th:
     status:
       account_status: สถานะบัญชี
       confirming: กำลังรอการยืนยันอีเมลให้เสร็จสมบูรณ์
+      functional: บัญชีของคุณทำงานได้อย่างเต็มที่
       pending: ใบสมัครของคุณกำลังรอดำเนินการตรวจทานโดยพนักงานของเรา นี่อาจใช้เวลาสักครู่ คุณจะได้รับอีเมลหากใบสมัครของคุณได้รับการอนุมัติ
     too_fast: ส่งแบบฟอร์มเร็วเกินไป ลองอีกครั้ง
     trouble_logging_in: มีปัญหาในการเข้าสู่ระบบ?
@@ -925,6 +913,7 @@ th:
   disputes:
     strikes:
       action_taken: การกระทำที่ใช้
+      appeal: อุทธรณ์
       appeal_submitted_at: ส่งการอุทธรณ์แล้ว
       appeals:
         submit: ส่งการอุทธรณ์
@@ -932,13 +921,18 @@ th:
       created_at: ลงวันที่
       recipient: ส่งถึง
       status: 'โพสต์ #%{id}'
+      title: "%{action} จาก %{date}"
       title_actions:
         delete_statuses: การเอาโพสต์ออก
         disable: การอายัดบัญชี
+        mark_statuses_as_sensitive: การทำเครื่องหมายโพสต์ว่าละเอียดอ่อน
         none: คำเตือน
         sensitive: การทำเครื่องหมายบัญชีว่าละเอียดอ่อน
         silence: การจำกัดบัญชี
         suspend: การระงับบัญชี
+      your_appeal_approved: อนุมัติการอุทธรณ์ของคุณแล้ว
+      your_appeal_pending: คุณได้ส่งการอุทธรณ์
+      your_appeal_rejected: ปฏิเสธการอุทธรณ์ของคุณแล้ว
   domain_validator:
     invalid_domain: ไม่ใช่ชื่อโดเมนที่ถูกต้อง
   errors:
@@ -1332,6 +1326,7 @@ th:
       '2629746': 1 เดือน
       '31556952': 1 ปี
       '5259492': 2 เดือน
+      '604800': 1 สัปดาห์
       '63113904': 2 ปี
       '7889238': 3 เดือน
     min_age_label: ค่าเกณฑ์อายุ
@@ -1372,8 +1367,10 @@ th:
   user_mailer:
     appeal_approved:
       action: ไปยังบัญชีของคุณ
+      subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
       title: อนุมัติการอุทธรณ์แล้ว
     appeal_rejected:
+      subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
       title: ปฏิเสธการอุทธรณ์แล้ว
     backup_ready:
       explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
@@ -1391,19 +1388,22 @@ th:
       categories:
         spam: สแปม
         violation: เนื้อหาละเมิดหลักเกณฑ์ชุมชนดังต่อไปนี้
-      get_in_touch: หากคุณเชื่อว่านี่เป็นข้อผิดพลาด คุณสามารถตอบกลับอีเมลนี้เพื่อติดต่อกับพนักงานของ %{instance}
       reason: 'เหตุผล:'
-      statuses: 'โพสต์ที่พบว่ามีการละเมิด:'
+      statuses: 'โพสต์ที่อ้างถึง:'
       subject:
-        disable: บัญชีของคุณ %{acct} ถูกอายัด
+        delete_statuses: เอาโพสต์ของคุณใน %{acct} ออกแล้ว
+        disable: อายัดบัญชีของคุณ %{acct} แล้ว
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์ของคุณใน %{acct} ว่าละเอียดอ่อนแล้ว
         none: คำเตือนสำหรับ %{acct}
-        silence: บัญชีของคุณ %{acct} ถูกจำกัด
-        suspend: บัญชีของคุณ %{acct} ถูกระงับ
+        sensitive: จะทำเครื่องหมายโพสต์ของคุณใน %{acct} ว่าละเอียดอ่อนนับจากนี้ไป
+        silence: จำกัดบัญชีของคุณ %{acct} แล้ว
+        suspend: ระงับบัญชีของคุณ %{acct} แล้ว
       title:
         delete_statuses: เอาโพสต์ออกแล้ว
         disable: อายัดบัญชีอยู่
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์ว่าละเอียดอ่อนแล้ว
         none: คำเตือน
-        sensitive: ซ่อนสื่ออยู่
+        sensitive: ทำเครื่องหมายบัญชีว่าละเอียดอ่อนแล้ว
         silence: จำกัดบัญชีอยู่
         suspend: ระงับบัญชีอยู่
     welcome:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ade2a77fb..ff7bd9cbf 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -16,6 +16,7 @@ tr:
     contact: İletişim
     contact_missing: Ayarlanmadı
     contact_unavailable: Yok
+    continue_to_web: Web uygulamasına git
     discover_users: Kullanıcıları keşfet
     documentation: Belgeler
     federation_hint_html: "%{instance} hesabınızla, herhangi bir Mastodon sunucusundaki ve haricindeki kişileri takip edebilirsiniz."
@@ -25,6 +26,8 @@ tr:
       Bu hesap, herhangi bir kullanıcıyı değil sunucunun kendisini temsil etmek için kullanılan sanal bir aktördür.
       Federasyon amaçlı kullanılır ve tüm yansıyı engellemek istemediğiniz sürece engellenmemelidir; bu durumda bir etki alanı bloğu kullanmanız gerekir.
     learn_more: Daha fazla bilgi edinin
+    logged_in_as_html: Şu an %{username} olarak oturum açmışsınız.
+    logout_before_registering: Zaten oturumunuz açık.
     privacy_policy: Gizlilik politikası
     rules: Sunucu kuralları
     rules_html: 'Aşağıda, bu Mastodon sunucusu üzerinde bir hesap açmak istiyorsanız uymanız gereken kuralların bir özeti var:'
@@ -69,7 +72,6 @@ tr:
     media: Medya
     moved_html: "%{name}, %{new_profile_link} adresine taşındı:"
     network_hidden: Bu bilgi mevcut değil
-    never_active: Asla
     nothing_here: Burada henüz hiçbir gönderi yok!
     people_followed_by: Kullanıcı %{name}'in takip ettikleri
     people_who_follow: Kullanıcı %{name}'i takip edenler
@@ -433,7 +435,7 @@ tr:
         create: Yeni blok oluştur
         hint: Domain bloğu, veri tabanında hesap kayıtlarının oluşturulmasını engellemez, fakat o hesapların üzerine otomatik olarak belirli yönetim metodlarını olarak uygular.
         severity:
-          desc_html: "<strong>Susturma</strong>, uygulanan hesabın gönderilerini, o hesabı takip etmeyen diğer herkese gizler. <strong>Uzaklaştırma</strong> hesabın bütün içeriğini, ortam dosyalarını ve profil verisini siler."
+          desc_html: "<strong>Susturma</strong>, uygulanan hesabın gönderilerini, o hesabı takip etmeyen diğer herkese gizler. <strong>Uzaklaştırma</strong> hesabın bütün içeriğini, medya dosyalarını ve profil verisini siler. Sadece medya dosyalarını reddetmek için <strong>Hiçbiri</strong> kullanın."
           noop: Yok
           silence: Sustur
           suspend: Uzaklaştır
@@ -444,25 +446,10 @@ tr:
       private_comment_hint: Denetleyiciler tarafından dahili kullanım için bu alan adı sınırlaması hakkında yorum.
       public_comment: Genel yorum
       public_comment_hint: Eğer alan adı sınırlamaları listesinin tanıtılması etkinleştirilmişse, genel kullanım için bu alan adı sınırlaması hakkında yorum.
-      reject_media: Ortam dosyalarını reddetme
-      reject_media_hint: Yerel olarak depolanmış ortam dosyalarını ve gelecekte indirilecek olanları reddeder. Uzaklaştırma için uygun değildir
+      reject_media: Medya dosyalarını reddet
+      reject_media_hint: Yerel olarak depolanmış medya dosyalarını ve gelecekte indirilecek olanları reddeder. Uzaklaştırmalarla ilgisizdir
       reject_reports: Raporları reddet
       reject_reports_hint: Bu alan adından gelen tüm şikayetleri yok sayın. Uzaklaştırmalar için mevzu dışıdır
-      rejecting_media: ortam dosyalarını reddet
-      rejecting_reports: şikayetleri reddet
-      severity:
-        silence: susturulmuş
-        suspend: uzaklaştırılmış
-      show:
-        affected_accounts:
-          one: Veritabanındaki bir hesap etkilendi
-          other: Veritabanındaki %{count} hesap etkilendi
-          zero: Veritabanındaki hiç bir hesap etkilenmedi
-        retroactive:
-          silence: Bu domaindeki tüm hesapların üzerindeki susturulma işlemini kaldır
-          suspend: Bu domaindeki tüm hesapların üzerindeki uzaklaştırma işlemini kaldır
-        title: "%{domain} domain'i için yapılan işlemi geri al"
-        undo: Geri al
       undo: Geri al
       view: Alan adı bloğunu görüntüle
     email_domain_blocks:
@@ -493,23 +480,47 @@ tr:
       title: Takip önerileri
       unsuppress: Takip önerisini geri getir
     instances:
+      availability:
+        description_html:
+          one: Eğer alan adına teslimat <strong>%{count} gün</strong> boyunca başarısız olursa, alan adından bir teslimat <em>gelmedikçe</em> yeni bir iletim denemesi yapılmayacak.
+          other: Eğer alan adına teslimat <strong>%{count} farklı gün</strong> boyunca başarısız olursa, alan adından bir teslimat <em>gelmedikçe</em> yeni bir iletim denemesi yapılmayacak.
+        failure_threshold_reached: Başarısızlık eşiğine %{date} tarihinde ulaşıldı.
+        failures_recorded:
+          one: "%{count} gün başarısız girişim."
+          other: "%{count} farklı gün başarısız girişim."
+        no_failures_recorded: Kayıtlı başarısızlık yok.
+        title: Ulaşılabilirlik
       back_to_all: Tümü
       back_to_limited: Sınırlı
       back_to_warning: Uyarı
       by_domain: Alan adı
       confirm_purge: Bu alan adından verileri kalıcı olarak silmek istediğinizden emin misin?
+      content_policies:
+        comment: İç not
+        description_html: Bu alan adındaki ve alt alan adlarındaki tüm hesaplara uygulanacak içerik ilkeleri belirleyebilirsiniz.
+        policies:
+          reject_media: Medyayı reddet
+          reject_reports: Şikayetleri reddet
+          silence: Sınırla
+          suspend: Askıya al
+        policy: İlke
+        reason: Kamuya açık gerekçe
+        title: İçerik ilkeleri
+      dashboard:
+        instance_accounts_dimension: En çok takip edilen hesaplar
+        instance_accounts_measure: kayıtlı hesaplar
+        instance_followers_measure: oradaki takipçilerimiz
+        instance_follows_measure: buradaki takipçileri
+        instance_languages_dimension: En gözde diller
+        instance_media_attachments_measure: kayıtlı medya ekleri
+        instance_reports_measure: haklarındaki şikayetler
+        instance_statuses_measure: kayıtlı gönderiler
       delivery:
         all: Tümü
         clear: Teslimat hatalarını temizle
         restart: Teslimatı yeniden başlat
         stop: Teslimatı durdur
-        title: Teslimat
         unavailable: Mevcut Değil
-        unavailable_message: Teslimat mevcut değil
-        warning: Uyarı
-        warning_message:
-          one: Teslimat %{count} gündür başarısız
-          other: Teslimat %{count} gündür başarısız
       delivery_available: Teslimat mevcut
       delivery_error_days: Teslimat hatası günleri
       delivery_error_hint: Eğer teslimat %{count} gün boyunca mümkün olmazsa, otomatik olarak teslim edilemiyor olarak işaretlenecek.
@@ -526,12 +537,14 @@ tr:
       private_comment: Özel yorum
       public_comment: Genel yorum
       purge: Temizle
+      purge_description_html: Eğer bu alan adının temelli çevrimdışı olduğunu düşünüyorsanız, bu alanda adına ait tüm hesap kayıtlarını ve ilişkili tüm veriyi depolama alanınızdan kaldırabilirsiniz. Bu işlem uzun sürebilir.
       title: Bilinen Sunucular
       total_blocked_by_us: Tarafımızca engellenen
       total_followed_by_them: Onlar tarafından takip edilen
       total_followed_by_us: Tarafımızca takip edilen
       total_reported: Onlar hakkında şikayetler
       total_storage: Medya ekleri
+      totals_time_period_hint_html: Aşağıdaki gösterilen toplamlar, gelmiş geçmiş tüm veriyi içeriyor.
     invites:
       deactivate_all: Tümünü devre dışı bırak
       filter:
@@ -586,6 +599,7 @@ tr:
       action_taken_by: tarafından gerçekleştirilen eylem
       actions:
         delete_description_html: Bildirilen gönderiler silinecek ve aynı hesapla ileride yaşabileceğiniz etkileşimlerde çoğaltmanız için bir eylem kaydedilecek.
+        mark_as_sensitive_description_html: Bildirilen gönderilerdeki medya dosyaları hassas olarak işaretlenecek ve aynı hesapla ileride yaşayabileceğiniz etkileşimlerde kullanabilmeniz için bir eylem kaydedilecek.
         other_description_html: Hesabın davranışını denetlemek ve bildirilen hesabın iletişimini yapılandırmak için daha fazla seçenek görün.
         resolve_description_html: Bildirilen hesap için bir şey yapılmayacak, eylem kaydedilmeyecek ve bildirim kapatılacak.
         silence_description_html: Profil sadece halihazırda takip edenler ve elle bakanlarca görünecek, böylece erişimi ciddi bir şekilde kısıtlanacak. Her zaman geri alınabilir.
@@ -606,6 +620,7 @@ tr:
       forwarded: İletildi
       forwarded_to: "%{domain}'e iletildi"
       mark_as_resolved: Giderildi olarak işaretle
+      mark_as_sensitive: Hassas olarak işaretle
       mark_as_unresolved: Çözümlenmemiş olarak işaretle
       no_one_assigned: Hiç kimse
       notes:
@@ -749,6 +764,7 @@ tr:
       actions:
         delete_statuses: "%{name}, %{target} kullanıcısının gönderilerini sildi"
         disable: "%{name}, %{target} kullanıcısının hesabını dondurdu"
+        mark_statuses_as_sensitive: "%{name}, %{target} kullanıcısının gönderilerini hassas olarak işaretledi"
         none: "%{name}, %{target} kullanıcısına bir uyarı gönderdi"
         sensitive: "%{name}, %{target} kullanıcısının hesabını hassas olarak işaretledi"
         silence: "%{name}, %{target} kullanıcısının hesabını kısıtladı"
@@ -774,6 +790,7 @@ tr:
       links:
         allow: Bağlantıya izin ver
         allow_provider: Yayıncıya izin ver
+        description_html: Bu bağlantılar şu anda sunucunuzun gönderilerini gördüğü hesaplarca bolca paylaşılıyor. Kullanıcılarınızın dünyada neler olduğunu görmesine yardımcı olabilir. Yayıncıyı onaylamadığınız sürece hiçbir bağlantı herkese açık yayınlanmaz. Tekil bağlantıları onaylayabilir veya reddedebilirsiniz.
         disallow: Bağlantıya izin verme
         disallow_provider: Yayıncıya izin verme
         shared_by_over_week:
@@ -785,14 +802,17 @@ tr:
       pending_review: İnceleme bekliyor
       preview_card_providers:
         allowed: Bu yayıncının bağlantıları öne çıkabilir
+        description_html: Sunucunuzda bağlantıları sıklıkla paylaşılan alan adları var. Bağlantının alan adı onaylanmadıkça, bağlantılar öne çıkmayacaktır. Onayınız (veya reddiniz) alt alan adlarını kapsar.
         rejected: Bu yayıncının bağlantıları öne çıkmayacak
         title: Yayıncılar
       rejected: Reddedildi
       statuses:
         allow: Gönderiye izin ver
         allow_account: Yazara izin ver
+        description_html: Bunlar, sunucunuzca bilinen, şu an sıklıkla paylaşılan ve beğenilen gönderilerdir. Yeni ve geri dönen kullanıcılarınızın takip etmesi için daha fazla kullanıcı bulmasına yararlar. Siz yazarı onaylamadığınız ve yazar hesabının başkalarına önerilmesine izin vermediği sürece gönderileri herkese açık olarak gösterilmez. Tekil gönderileri de onaylayabilir veya reddedebilirsiniz.
         disallow: Gönderi iznini kaldır
         disallow_account: Yazar iznini kaldır
+        not_discoverable: Yazar keşfedilebilir olmamayı seçiyor
         shared_by:
           one: Bir defa paylaşıldı veya favorilendi
           other: "%{friendly_count} defa paylaşıldı veya favorilendi"
@@ -805,6 +825,7 @@ tr:
           tag_servers_dimension: En gözde sunucular
           tag_servers_measure: farklı sunucular
           tag_uses_measure: toplam kullanım
+        description_html: Bunlar sunucunuzun gördüğü gönderilerde sıklıkla gözüken etiketlerdir. Kullanıcılarınızın, şu an en çok ne hakkında konuşulduğunu görmesine yardımcı olurlar. Onaylamadığınız sürece etiketler herkese açık görünmez.
         listable: Önerilebilir
         not_listable: Önerilmeyecek
         not_trendable: Öne çıkanlar altında görünmeyecek
@@ -831,6 +852,7 @@ tr:
       actions:
         delete_statuses: gönderilerini silme
         disable: hesaplarını dondurma
+        mark_statuses_as_sensitive: gönderilerini hassas olarak işaretleme
         none: uyarı
         sensitive: hesaplarını hassas olarak işaretleme
         silence: hesaplarını kısıtlama
@@ -933,8 +955,10 @@ tr:
     status:
       account_status: Hesap durumu
       confirming: E-posta doğrulamasının tamamlanması bekleniyor.
+      functional: Hesabınız tamamen kullanıma hazır.
       pending: Başvurunuz personelimiz tarafından gözden geçirilmeyi beklemektedir. Bu biraz zaman alabilir. Başvurunuz onaylanırsa bir e-posta alacaksınız.
       redirecting_to: Hesabınız aktif değil çünkü şu anda %{acct} adresine yönlendirilmektedir.
+      view_strikes: Hesabınıza yönelik eski eylemleri görüntüleyin
     too_fast: Form çok hızlı gönderildi, tekrar deneyin.
     trouble_logging_in: Oturum açarken sorun mu yaşıyorsunuz?
     use_security_key: Güvenlik anahtarını kullan
@@ -1010,6 +1034,7 @@ tr:
         submit: İtirazı gönder
       associated_report: İlişkili rapor
       created_at: Tarih
+      description_html: Bunlar hesabınıza yönelik eylemler ve %{instance} yönetimi tarafından size gönderilen uyarılardır.
       recipient: Kime
       status: 'Gönderi #%{id}'
       status_removed: Gönderi zaten sistemden kaldırıldı
@@ -1017,8 +1042,9 @@ tr:
       title_actions:
         delete_statuses: Gönderi kaldırma
         disable: Hesabın dondurulması
+        mark_statuses_as_sensitive: Gönderileri hassas olarak işaretleme
         none: Uyarı
-        sensitive: Hassas hesap olarak işaretleme
+        sensitive: Hesabı hassas olarak işaretleme
         silence: Hesabın kısıtlanması
         suspend: Hesabın askıya alınması
       your_appeal_approved: İtirazınız onaylandı
@@ -1048,7 +1074,7 @@ tr:
     archive_takeout:
       date: Tarih
       download: Arşivinizi indirin
-      hint_html: "<strong>Tootlarınızın ve yüklediğiniz ortamların</strong> bir arşivini talep edebilirsiniz. Dışa aktarılan veriler, herhangi bir uyumlu yazılım tarafından okunabilen ActivityPub formatında olacaktır. Her 7 günde bir arşiv talep edebilirsiniz."
+      hint_html: "<strong>Gönderileriniz ve yüklediğiniz medya dosyalarının</strong> bir arşivini talep edebilirsiniz. Dışa aktarılan veriler, herhangi bir uyumlu yazılım tarafından okunabilen ActivityPub biçiminde olacaktır. Her 7 günde bir arşiv talep edebilirsiniz."
       in_progress: Arşivinizi derliyoruz...
       request: Arşivinizi isteyin
       size: Boyut
@@ -1390,6 +1416,7 @@ tr:
     profile: Profil
     relationships: Takip edilenler ve takipçiler
     statuses_cleanup: Otomatik gönderi silme
+    strikes: Moderasyon eylemleri
     two_factor_authentication: İki adımlı doğrulama
     webauthn_authentication: Güvenlik anahtarları
   statuses:
@@ -1469,6 +1496,7 @@ tr:
       '2629746': 1 ay
       '31556952': 1 yıl
       '5259492': 2 ay
+      '604800': 1 hafta
       '63113904': 2 yıl
       '7889238': 3 ay
     min_age_label: Zaman eşiği
@@ -1616,26 +1644,28 @@ tr:
         spam: İstenmeyen
         violation: İçerik aşağıdaki topluluk ilkelerini ihlal ediyor
       explanation:
-        delete_statuses: Bazı gönderilerinizin bir veya daha topluluk ilkemizi ihlal ettiği bulundu ve dolayısıyla %{instance} sunucusu moderatörleri tarafından kaldırıldı. Gelecekteki ihlaller hesabınıza karşı daha sert cezalandırmayla sonuçlanabilir.
+        delete_statuses: Bazı gönderilerinizin, topluluk ilkelerimizden bir veya daha fazlasını ihlal ettiği görüldü ve daha sonra %{instance} moderatörleri tarafından kaldırıldılar.
         disable: Artık hesabınızı kullanamazsınız, ancak profil ve diğer veri sağlam. Verinizin bir yedeğini isteyebilir, hesap ayarlarınızı değiştirebilir veya hesabınızı silebilirsiniz.
-        sensitive: Artık tüm yüklenmiş ortam dosyalarınız hassas olarak işaretlenecek ve üzerine tıklanarak açılacak şekilde bir uyarının ardına gizlenecektir.
+        mark_statuses_as_sensitive: Gönderilerinizin bazıları %{instance} moderatörleri tarafından hassas olarak işaretlendi. Bu nedenle bir önizleme görüntülenmeden önce insanların gönderilerinizdeki medya dosyalarına dokunması gerekiyor. Gelecekte gönderimde bulunurken medya dosyalarını hassas olarak işaretleyebilirsiniz.
+        sensitive: Artık tüm yüklenmiş medya dosyalarınız hassas olarak işaretlenecek ve üzerine tıklanarak açılacak şekilde bir uyarının ardına gizlenecektir.
         silence: Hesabınız sınırlı iken, yalnızca sizi takip eden kişiler bu sunucudaki gönderilenizi görecek ve çeşitli keşif özelliklerinin dışında bırakılabilirsiniz. Ancak, başkaları sizi manuel olarak hala takip edebilir.
         suspend: Hesabınızı artık kullanamazsınız ve profiliniz ve diğer veri artık erişilebilir değil. Yaklaşık 30 gün içinde silinene kadar verinizin bir yedeğini istemek için giriş yapabilirsiniz, ancak askıdan kaçınmanızı önlemek için bazı temel veriyi saklayabiliriz.
-      get_in_touch: Bunun bir hata olduğunu düşünüyorsanız, %{instance} yönetimiyle bağlantıya geçmek için bu e-postaya yanıt verebilirsiniz.
       reason: 'Gerekçe:'
-      statuses: 'İhlal içeren gönderiler:'
+      statuses: 'Sözü geçen gönderiler:'
       subject:
         delete_statuses: "%{acct} hesabınızdaki gönderiler kaldırıldı"
         disable: "%{acct} hesabınız donduruldu"
+        mark_statuses_as_sensitive: "%{acct} hesabındaki gönderiler hassas olarak işaretlendi"
         none: "%{acct} için uyarı"
-        sensitive: "%{acct} hesabınızdaki ortam dosyaları artık hassas olarak işaretlenecek"
+        sensitive: "%{acct} hesabınızdaki gönderiler artık hassas olarak işaretlenecek"
         silence: "%{acct} hesabınız sınırlandırıldı"
         suspend: "%{acct} hesabınız askıya alındı"
       title:
         delete_statuses: Kaldırılan gönderiler
         disable: Hesap donduruldu
+        mark_statuses_as_sensitive: Gönderiler hassas olarak işaretlendi
         none: Uyarı
-        sensitive: Gizlenmiş ortam dosyaları
+        sensitive: Hesap hassas olarak işaretlendi
         silence: Hesap sınırlandırıldı
         suspend: Hesap askıya alındı
     welcome:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 40bf65ac5..3e80dfcaf 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -13,7 +13,6 @@ tt:
     follow: Языл
     following: Язылгансыз
     media: Медиа
-    never_active: Беркайчан да
     roles:
       admin: Админ
       bot: Бот
@@ -63,8 +62,6 @@ tt:
         severity:
           noop: Бернинди дә
           suspend: Искә алмау
-      show:
-        undo: Кире алу
     email_domain_blocks:
       delete: Бетерү
       domain: Домен
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 152962bfc..3658b2dea 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -73,7 +73,6 @@ uk:
     media: Медіа
     moved_html: "%{name} переїхав до %{new_profile_link}:"
     network_hidden: Ця інформація недоступна
-    never_active: Ніколи
     nothing_here: Тут нічого немає!
     people_followed_by: Люди, на яких підписаний(-а) %{name}
     people_who_follow: Підписники %{name}
@@ -434,21 +433,6 @@ uk:
       reject_media_hint: Видаляє медіаконтент, збережений локально, і забороняє його завантаження у майбутньому. Не має значення у випадку блокування
       reject_reports: Відхилити скарги
       reject_reports_hint: Ігнорувати всі скарги з цього домену. Не має значення у випадку блокування
-      rejecting_media: відхилення медіафайлів
-      rejecting_reports: відхилення скарг
-      severity:
-        silence: заглушені
-        suspend: призупинені
-      show:
-        affected_accounts:
-          one: Впливає на один обліковий запис у базі даних
-          other: Впливає на %{count} облікових записів у базі даних
-          zero: Не впливає на жоден обліковий запис у базі даних
-        retroactive:
-          silence: Зняти глушення з усіх існуючих заглушених облікових записів цього домену
-          suspend: Розморозити існуючі заморожені облікові записи з цього домену
-        title: Зняти блокування з домена %{domain}
-        undo: Відмінити
       undo: Відмінити
       view: Переглянути заблоковані домени
     email_domain_blocks:
@@ -479,15 +463,7 @@ uk:
         clear: Очистити помилки доставляння
         restart: Перезапустити доставляння
         stop: Припинити доставляння
-        title: Доставляння
         unavailable: Недоступно
-        unavailable_message: Доставлення недоступне
-        warning: Попередження
-        warning_message:
-          few: Збій доставляння %{count} дні
-          many: Збій доставляння %{count} днів
-          one: Збій доставляння %{count} день
-          other: Збій доставляння %{count} днів
       delivery_available: Доставлення доступне
       delivery_error_days: Днів помилок доставляння
       delivery_error_hint: Якщо доставляння неможливе впродовж %{count} днів, воно автоматично позначиться недоставленим.
@@ -953,7 +929,6 @@ uk:
         delete_statuses: Вилучення допису
         disable: Заморожування облікового запису
         none: Попередження
-        sensitive: Позначити обліковим записом з делікатним вмістом
         silence: Обмеження облікового запису
         suspend: Призупинення облікового запису
       your_appeal_approved: Вашу апеляцію було схвалено
@@ -1421,6 +1396,7 @@ uk:
       '2629746': 1 місяць
       '31556952': 1 рік
       '5259492': 2 місяці
+      '604800': 1 week
       '63113904': 2 роки
       '7889238': 3 місяці
     min_age_label: Поріг давності
@@ -1484,26 +1460,21 @@ uk:
         spam: Спам
         violation: Вміст порушує такі правила спільноти
       explanation:
-        delete_statuses: Деякі з ваших дописів порушили одне або кілька правил спільноти, і модератори %{instance} видалили їх. Майбутні порушення можуть призвести до жорсткіших дій щодо вашого облікового запису.
         disable: Ви можете більше не використовувати свій обліковий запис, але ваш профіль та інші дані залишаються недоторканими. Ви можете надіслати запит на створення резервної копії ваших даних, змінити налаштування облікового запису або видалити свій обліковий запис.
         sensitive: Відтепер усі ваші завантажені медіафайли будуть позначені делікатними й приховані за попередженням.
         silence: Ви й надалі можете користуватися своїм обліковим записом, але ваші дописи на цьому сервері бачитимуть лише ті люди, які вже стежать за вами, а вас може бути виключено з різних можливостей виявлення. Проте, інші можуть почати стежити за вами вручну.
         suspend: Ви більше не можете користуватися своїм обліковим записом, а ваші інші дані більше недоступні. Ви досі можете увійти, щоб надіслати запит на отримання резервної копії своїх даних до повного видалення впродовж приблизно 30 днів, але ми збережемо деякі основні дані, щоб унеможливити ухилення вами від призупинення.
-      get_in_touch: Якщо ви вважаєте, що це помилка, ви можете відповісти на цей електронний лист, щоб зв'язатися з персоналом %{instance}.
       reason: 'Причина:'
-      statuses: 'Дописи, які порушили правила:'
       subject:
         delete_statuses: Ваші дописи на %{acct} були вилучені
         disable: Ваш обліковий запис %{acct} було заморожено
         none: Попередження для %{acct}
-        sensitive: Ваші медіафайли на %{acct} відтепер будуть позначені делікатними
         silence: Ваш обліковий запис %{acct} було обмежено
         suspend: Ваш обліковий запис %{acct} було призупинено
       title:
         delete_statuses: Дописи вилучено
         disable: Обліковий запис заморожено
         none: Попередження
-        sensitive: Медіа приховано
         silence: Ообліковий запис обмежено
         suspend: Обліковий запис призупинено
     welcome:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2410f9500..e9129640f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -16,6 +16,7 @@ vi:
     contact: Liên lạc
     contact_missing: Chưa thiết lập
     contact_unavailable: N/A
+    continue_to_web: Xem trong web
     discover_users: Thành viên
     documentation: Tài liệu
     federation_hint_html: Đăng ký tài khoản %{instance} là bạn có thể giao tiếp với bất cứ ai trên bất kỳ máy chủ Mastodon nào và còn hơn thế nữa.
@@ -23,6 +24,8 @@ vi:
     hosted_on: "%{domain} vận hành nhờ Mastodon"
     instance_actor_flash: "Đây là một tài khoản ảo được sử dụng để đại diện cho máy chủ chứ không phải bất kỳ người dùng cá nhân nào. Nó được sử dụng cho mục đích liên kết và không nên chặn trừ khi bạn muốn chặn toàn bộ máy chủ. \n"
     learn_more: Tìm hiểu
+    logged_in_as_html: Bạn đã đăng nhập %{username}.
+    logout_before_registering: Bạn đã đăng nhập.
     privacy_policy: Chính sách bảo mật
     rules: Quy tắc máy chủ
     rules_html: 'Bên dưới là những quy tắc của máy chủ Mastodon này, bạn phải đọc kỹ trước khi đăng ký:'
@@ -64,7 +67,6 @@ vi:
     media: Media
     moved_html: "%{name} đã đổi thành %{new_profile_link}:"
     network_hidden: Dữ liệu đã bị ẩn
-    never_active: Chưa có
     nothing_here: Trống trơn!
     people_followed_by: Những người %{name} theo dõi
     people_who_follow: Những người theo dõi %{name}
@@ -438,21 +440,6 @@ vi:
       reject_media_hint: Xóa ảnh và video đang được lưu trữ và không cho phép tải xuống trong tương lai. Không liên quan tới việc vô hiệu hóa
       reject_reports: Từ chối báo cáo
       reject_reports_hint: Bỏ qua tất cả các báo cáo từ máy chủ này. Không liên quan việc vô hiệu hóa
-      rejecting_media: từ chối các tập tin phương tiện truyền thông
-      rejecting_reports: từ chối báo cáo
-      severity:
-        silence: bị hạn chế
-        suspend: bị vô hiệu hóa
-      show:
-        affected_accounts:
-          one: Ảnh hưởng một người dùng trong cơ sở dữ liệu
-          other: Ảnh hưởng %{count} người dùng trong cơ sở dữ liệu
-          zero: Không ảnh hưởng người dùng nào trong cơ sở dữ liệu
-        retroactive:
-          silence: Bỏ hạn chế những tài khoản ở máy chủ này
-          suspend: Ngưng vô hiệu hóa các tài khoản ở máy chủ này
-        title: Hủy chặn máy chủ %{domain}
-        undo: Hủy bỏ
       undo: Hủy chặn máy chủ
       view: Xem máy chủ chặn
     email_domain_blocks:
@@ -482,22 +469,45 @@ vi:
       title: Gợi ý theo dõi
       unsuppress: Mở lại gợi ý theo dõi
     instances:
+      availability:
+        description_html:
+          other: Nếu chuyển đến tên miền <strong>%{count} ngày</strong> mà không thành công, không chuyển gì nữa cho tới khi sự tiếp nhận <em>từ</em> máy chủ được nhận.
+        failure_threshold_reached: Thất bại đạt ngưỡng vào %{date}.
+        failures_recorded:
+          other: Thất bại tạm thời vào %{count} ngày khác.
+        no_failures_recorded: Chưa bao giờ thất bại.
+        title: Khả dụng
       back_to_all: Toàn bộ
       back_to_limited: Hạn chế
       back_to_warning: Cảnh báo
       by_domain: Máy chủ
       confirm_purge: Bạn có chắc chắn muốn xóa dữ liệu từ máy chủ này vĩnh viễn?
+      content_policies:
+        comment: Lưu ý nội bộ
+        description_html: Bạn có thể xác định các chính sách nội dung sẽ được áp dụng cho tất cả các tài khoản trên máy chủ này và bất kỳ tên miền phụ nào của nó.
+        policies:
+          reject_media: Từ chối media
+          reject_reports: Từ chối báo cáo
+          silence: Hạn chế
+          suspend: Vô hiệu hóa
+        policy: Chính sách
+        reason: Lý do công khai
+        title: Chính sách nội dung
+      dashboard:
+        instance_accounts_dimension: Những tài khoản được theo dõi nhiều nhất
+        instance_accounts_measure: tài khoản đã lưu trữ
+        instance_followers_measure: người theo dõi của chúng ta ở đó
+        instance_follows_measure: người theo dõi của họ ở đây
+        instance_languages_dimension: Top ngôn ngữ
+        instance_media_attachments_measure: tệp đính kèm
+        instance_reports_measure: báo cáo về họ
+        instance_statuses_measure: tút đã lưu trữ
       delivery:
         all: Toàn bộ
         clear: Xóa phân phối lỗi
         restart: Khởi động lại phân phối
         stop: Ngưng phân phối
-        title: Phân phối
         unavailable: Không khả dụng
-        unavailable_message: Không thể phân phối
-        warning: Cảnh báo
-        warning_message:
-          other: Phân phối thất bại %{count} ngày
       delivery_available: Cho phép liên kết
       delivery_error_days: Ngày lỗi phân phối
       delivery_error_hint: Nếu không thể phân phối sau %{count} ngày, nó sẽ tự dộng đánh dấu là không thể phân phối.
@@ -514,12 +524,14 @@ vi:
       private_comment: Bình luận riêng
       public_comment: Bình luận công khai
       purge: Thanh trừng
+      purge_description_html: Nếu bạn tin rằng máy chủ này đã chết, bạn có thể xóa tất cả các bản ghi tài khoản và dữ liệu đã liên kết khỏi bộ nhớ của mình. Việc này có thể mất một lúc.
       title: Mạng liên hợp
       total_blocked_by_us: Bị chặn bởi chúng ta
       total_followed_by_them: Được họ theo dõi
       total_followed_by_us: Được quản trị viên theo dõi
       total_reported: Toàn bộ báo cáo
       total_storage: Media
+      totals_time_period_hint_html: Tổng số được hiển thị bên dưới bao gồm dữ liệu cho mọi thời điểm.
     invites:
       deactivate_all: Vô hiệu hóa tất cả
       filter:
@@ -573,6 +585,7 @@ vi:
       action_taken_by: Hành động được thực hiện bởi
       actions:
         delete_description_html: Những tút bị báo cáo sẽ được xóa và 1 thẹo sẽ được ghi lại để giúp bạn lưu ý về tài khoản này trong tương lai.
+        mark_as_sensitive_description_html: Media trong báo cáo sẽ bị đánh dấu nhạy cảm và bạn nhận 1 lần cảnh cáo.
         other_description_html: Những tùy chọn để kiểm soát tài khoản và giao tiếp với tài khoản bị báo cáo.
         resolve_description_html: Không có hành động nào áp dụng đối với tài khoản bị báo cáo, không có thẹo, và báo cáo sẽ được đóng.
         silence_description_html: Trang cá nhân sẽ chỉ hiển thị với những người đã theo dõi hoặc tìm kiếm thủ công, hạn chế tối đa tầm ảnh hưởng của nó. Có thể đổi lại bình thường sau.
@@ -593,6 +606,7 @@ vi:
       forwarded: Chuyển tiếp
       forwarded_to: Chuyển tiếp tới %{domain}
       mark_as_resolved: Đã xử lý xong!
+      mark_as_sensitive: Đánh dấu là nhạy cảm
       mark_as_unresolved: Mở lại
       no_one_assigned: Chưa có
       notes:
@@ -736,6 +750,7 @@ vi:
       actions:
         delete_statuses: "%{name} đã xóa tút của %{target}"
         disable: "%{name} đã ẩn %{target}"
+        mark_statuses_as_sensitive: "%{name} đã đánh dấu tút của %{target} là nhạy cảm"
         none: "%{name} đã gửi cảnh cáo %{target}"
         sensitive: "%{name} đã đánh dấu người dùng %{target} là nhạy cảm"
         silence: "%{name} đã ẩn %{target}"
@@ -761,6 +776,7 @@ vi:
       links:
         allow: Liên kết cho phép
         allow_provider: Nguồn đăng cho phép
+        description_html: Đây là những liên kết được chia sẻ nhiều trên máy chủ của bạn. Nó có thể giúp người dùng của bạn tìm hiểu những gì đang xảy ra trên thế giới. Không có liên kết nào được hiển thị công khai cho đến khi bạn duyệt nguồn. Bạn cũng có thể cho phép hoặc từ chối các liên kết riêng lẻ.
         disallow: Liên kết cấm
         disallow_provider: Nguồn đăng bị cấm
         shared_by_over_week:
@@ -772,14 +788,17 @@ vi:
       pending_review: Đang chờ
       preview_card_providers:
         allowed: Liên kết từ nguồn đăng này có thể thành xu hướng
+        description_html: Đây là những nguồn mà từ đó các liên kết thường được chia sẻ trên máy chủ của bạn. Các liên kết sẽ không được trở thành xu hướng trừ khi bạn cho phép nguồn. Sự cho phép (hoặc từ chối) của bạn mở rộng đến các tên miền phụ.
         rejected: Liên kết từ nguồn đăng không thể thành xu hướng
         title: Nguồn đăng
       rejected: Đã cấm
       statuses:
         allow: Cho phép tút
         allow_account: Cho phép người đăng
+        description_html: Đây là những tút hiện đang được chia sẻ và yêu thích rất nhiều trên máy chủ của bạn ở thời điểm hiện tại. Nó có thể giúp người dùng mới và người dùng cũ của bạn tìm thấy nhiều người hơn để theo dõi. Không có bài viết nào được hiển thị công khai cho đến khi bạn cho phép tác giả và tác giả cho phép đề xuất tài khoản của họ cho người khác. Bạn cũng có thể cho phép hoặc từ chối các tút riêng lẻ.
         disallow: Không cho phép tút
         disallow_account: Không cho phép người đăng
+        not_discoverable: Tác giả đã chọn không tham gia mục khám phá
         shared_by:
           other: Đã chia sẻ và thích %{friendly_count} lần
         title: Tút xu hướng
@@ -791,6 +810,7 @@ vi:
           tag_servers_dimension: Top máy chủ
           tag_servers_measure: máy chủ khác
           tag_uses_measure: tổng người dùng
+        description_html: Đây là những hashtag hiện đang xuất hiện trong rất nhiều tút trên máy chủ của bạn. Nó có thể giúp người dùng của bạn tìm ra những gì mọi người đang nói nhiều nhất vào lúc này. Không có hashtag nào được hiển thị công khai cho đến khi bạn cho phép chúng.
         listable: Có thể đề xuất
         not_listable: Không thể đề xuất
         not_trendable: Không xuất hiện xu hướng
@@ -817,6 +837,7 @@ vi:
       actions:
         delete_statuses: xóa tút của họ
         disable: hạn chế tài khoản của họ
+        mark_statuses_as_sensitive: đánh dấu tút của họ là nhạy cảm
         none: một cảnh báo
         sensitive: đánh dấu tài khoản của họ là nhạy cảm
         silence: hạn chế tài khoản của họ
@@ -919,8 +940,10 @@ vi:
     status:
       account_status: Trạng thái tài khoản
       confirming: Đang chờ xác thực email.
+      functional: Tài khoản của bạn đã được xác thực.
       pending: Đơn đăng ký của bạn đang chờ phê duyệt. Điều này có thể mất một thời gian. Bạn sẽ nhận được email nếu đơn đăng ký của bạn được chấp thuận.
       redirecting_to: Tài khoản của bạn không hoạt động vì hiện đang chuyển hướng đến %{acct}.
+      view_strikes: Xem những lần cảnh cáo cũ
     too_fast: Nghi vấn đăng ký spam, xin thử lại.
     trouble_logging_in: Quên mật khẩu?
     use_security_key: Dùng khóa bảo mật
@@ -996,6 +1019,7 @@ vi:
         submit: Gửi khiếu nại
       associated_report: Báo cáo đính kèm
       created_at: Ngày
+      description_html: Đây là những cảnh cáo và áp đặt kiểm duyệt đối với bạn bởi đội ngũ %{instance}.
       recipient: Người nhận
       status: 'Tút #%{id}'
       status_removed: Tút này đã được xóa khỏi hệ thống
@@ -1003,8 +1027,9 @@ vi:
       title_actions:
         delete_statuses: Xóa tút
         disable: Đóng băng tài khoản
+        mark_statuses_as_sensitive: Đánh dấu tút là nhạy cảm
         none: Cảnh cáo
-        sensitive: Đánh dấu nhạy cảm
+        sensitive: Đánh dấu người dùng là nhạy cảm
         silence: Hạn chế tài khoản
         suspend: Vô hiệu hóa tài khoản
       your_appeal_approved: Khiếu nại của bạn được chấp nhận
@@ -1372,6 +1397,7 @@ vi:
     profile: Trang cá nhân
     relationships: Quan hệ
     statuses_cleanup: Tự động xóa tút cũ
+    strikes: Lần cảnh cáo
     two_factor_authentication: Xác thực hai bước
     webauthn_authentication: Khóa bảo mật
   statuses:
@@ -1445,6 +1471,7 @@ vi:
       '2629746': 1 tháng
       '31556952': 1 năm
       '5259492': 2 tháng
+      '604800': 1 tuần
       '63113904': 2 năm
       '7889238': 3 tháng
     min_age_label: Thời điểm
@@ -1559,26 +1586,28 @@ vi:
         spam: Spam
         violation: Nội dung vi phạm quy tắc cộng đồng
       explanation:
-        delete_statuses: Một số bài đăng của bạn đã vi phạm một hoặc nhiều quy tắc cộng đồng và bị gỡ bỏ bởi kiểm duyệt viên %{instance}. Các vi phạm trong tương lai có thể dẫn đến các hành động trừng phạt khắc nghiệt hơn so với tài khoản của bạn.
+        delete_statuses: Vài tút của bạn đã vi phạm quy tắc máy chủ và tạm thời bị ẩn bởi kiểm duyệt viên của %{instance}.
         disable: Bạn không còn có thể sử dụng tài khoản của mình, nhưng hồ sơ của bạn và dữ liệu khác vẫn còn nguyên. Bạn có thể yêu cầu sao lưu dữ liệu của mình, thay đổi cài đặt tài khoản hoặc xóa tài khoản của bạn.
+        mark_statuses_as_sensitive: Vài tút của bạn đã bị kiểm duyệt viên %{instance} đánh dấu nhạy cảm. Mọi người cần nhấn vào media để xem nó. Bạn có thể tự đánh dấu tài khoản của bạn là nhạy cảm.
         sensitive: Từ giờ trở đi, tất cả các media của bạn bạn tải lên sẽ được đánh dấu là nhạy cảm và ẩn đằng sau cảnh báo nhấp chuột.
         silence: Bạn vẫn có thể sử dụng tài khoản của mình, nhưng chỉ những người đang theo dõi bạn mới thấy bài đăng của bạn. Bạn cũng bị loại khỏi các tính năng khám phá khác. Tuy nhiên, những người khác vẫn có thể theo dõi bạn.
         suspend: Bạn không còn có thể sử dụng tài khoản của bạn, hồ sơ và các dữ liệu khác không còn có thể truy cập được. Bạn vẫn có thể đăng nhập để yêu cầu sao lưu dữ liệu của mình cho đến khi dữ liệu bị xóa hoàn toàn trong khoảng 30 ngày, nhưng chúng tôi sẽ giữ lại một số dữ liệu cơ bản để ngăn bạn tránh bị đình chỉ.
-      get_in_touch: Nếu bạn tin rằng đây là lỗi, bạn có thể trả lời e-mail này để liên lạc với các nhân viên của %{instance}.
       reason: 'Lý do:'
-      statuses: 'Đây là những tút vi phạm:'
+      statuses: 'Tút lưu ý:'
       subject:
         delete_statuses: Những tút %{acct} của bạn đã bị xóa bỏ
         disable: Tài khoản %{acct} của bạn đã bị vô hiệu hóa
+        mark_statuses_as_sensitive: Tút của bạn trên %{acct} bị đánh dấu nhạy cảm
         none: Cảnh báo cho %{acct}
-        sensitive: Những tập tin media %{acct} sẽ bị đánh dấu nhạy cảm kể từ bây giờ
+        sensitive: Tút của bạn trên %{acct} sẽ bị đánh dấu nhạy cảm kể từ bây giờ
         silence: Tài khoản %{acct} của bạn đã bị hạn chế
         suspend: Tài khoản %{acct} của bạn đã bị vô hiệu hóa
       title:
         delete_statuses: Tút đã bị xóa
         disable: Tài khoản bị đóng băng
+        mark_statuses_as_sensitive: Tút đã bị đánh dấu nhạy cảm
         none: Cảnh báo
-        sensitive: Media đã bị ẩn
+        sensitive: Tài khoản đã bị đánh dấu nhạy cảm
         silence: Tài khoản bị hạn chế
         suspend: Toài khoản bị vô hiệu hóa
     welcome:
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index da1376dac..83b5866df 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -16,7 +16,6 @@ zgh:
       one: ⴰⵎⴹⴼⴰⵕ
       other: ⵉⵎⴹⴼⴰⵕⵏ
     media: ⵉⵙⵏⵖⵎⵉⵙⵏ
-    never_active: ⵓⵙⴰⵔ
     roles:
       bot: ⴰⴱⵓⵜ
       group: ⵜⴰⵔⴰⴱⴱⵓⵜ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 240daade4..5fdc8037f 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -64,7 +64,6 @@ zh-CN:
     media: 媒体
     moved_html: "%{name} 已经迁移到 %{new_profile_link}:"
     network_hidden: 此信息不可用
-    never_active: 从未活跃
     nothing_here: 这里什么都没有!
     people_followed_by: "%{name} 关注的人"
     people_who_follow: 关注 %{name} 的人
@@ -438,21 +437,6 @@ zh-CN:
       reject_media_hint: 删除本站已缓存的媒体文件,并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
       reject_reports: 拒绝接收举报
       reject_reports_hint: 忽略来自此域名的所有举报。这和封禁无关。
-      rejecting_media: 拒绝接收媒体文件
-      rejecting_reports: 拒绝接收举报
-      severity:
-        silence: 已隐藏
-        suspend: 已封禁
-      show:
-        affected_accounts:
-          one: 数据库中的 1 个帐户受到影响
-          other: 数据库中的 %{count} 个帐户受到影响
-          zero: 数据库中没有帐户受到影响
-        retroactive:
-          silence: 对此域名的所有帐户解除隐藏
-          suspend: 对此域名的所有帐户解除封禁
-        title: 撤销对 %{domain} 的域名屏蔽
-        undo: 撤销
       undo: 撤销屏蔽域名
       view: 查看域名屏蔽
     email_domain_blocks:
@@ -492,12 +476,7 @@ zh-CN:
         clear: 清理投递错误
         restart: 重新投递
         stop: 停止投递
-        title: 投递
         unavailable: 不可用
-        unavailable_message: 投递不可用
-        warning: 警告
-        warning_message:
-          other: 投递已失败 %{count} 天
       delivery_available: 可投递
       delivery_error_days: 投递错误天数
       delivery_error_hint: 如果投递已不可用 %{count} 天,它将被自动标记为无法投递。
@@ -593,6 +572,7 @@ zh-CN:
       forwarded: 已转发
       forwarded_to: 转发举报至 %{domain}
       mark_as_resolved: 标记为“已处理”
+      mark_as_sensitive: 标记为敏感内容
       mark_as_unresolved: 标记为“未处理”
       no_one_assigned: 未分派
       notes:
@@ -736,6 +716,7 @@ zh-CN:
       actions:
         delete_statuses: "%{name} 刪除了 %{target} 的嘟文"
         disable: "%{name} 冻结了用户 %{target}"
+        mark_statuses_as_sensitive: "%{name} 已将 %{target} 的嘟文标记为敏感内容"
         none: "%{name} 向 %{target} 发送了警告"
         sensitive: "%{name} 将 %{target} 的帐号标记为敏感内容"
         silence: "%{name} 限制了用户 %{target}"
@@ -776,6 +757,10 @@ zh-CN:
         title: 发布者
       rejected: 已拒绝
       statuses:
+        allow: 允许嘟文
+        allow_account: 允许作者
+        disallow: 禁止本嘟文
+        disallow_account: 禁止本作者
         title: 热门嘟文
       tags:
         current_score: 当前 %{score} 分
@@ -834,6 +819,7 @@ zh-CN:
         title: 热门嘟文
       new_trending_tags:
         no_approved_tags: 目前没有经批准的热门标签。
+        requirements: '这些候选人都可能会超过#%{rank} 批准的热门标签,目前是 #%{lowest_tag_name} ,分数为 %{lowest_tag_score}。'
         title: 热门标签
       subject: "%{instance} 上的新趋势供审核"
   aliases:
@@ -909,8 +895,10 @@ zh-CN:
     status:
       account_status: 帐户状态
       confirming: 等待电子邮件确认完成。
+      functional: 你的帐号可以正常使用了。
       pending: 工作人员正在审核你的申请。这需要花点时间。在申请被批准后,你将收到一封电子邮件。
       redirecting_to: 你的帐户无效,因为它已被设置为跳转到 %{acct}
+      view_strikes: 查看针对你帐号的记录
     too_fast: 表单提交过快,请重试。
     trouble_logging_in: 登录有问题?
     use_security_key: 使用安全密钥
@@ -986,6 +974,7 @@ zh-CN:
         submit: 提交申诉
       associated_report: 相关举报
       created_at: 日期
+      description_html: 这些是针对您的帐户采取的行动和警告,已经由 %{instance} 的工作人员发送给您。
       recipient: 发送至
       status: '嘟文 #%{id}'
       status_removed: 嘟文已从系统中删除
@@ -993,8 +982,9 @@ zh-CN:
       title_actions:
         delete_statuses: 嘟文删除
         disable: 帐号冻结
+        mark_statuses_as_sensitive: 标记嘟文有敏感内容
         none: 警告
-        sensitive: 标记帐号为敏感内容
+        sensitive: 标记帐号有敏感内容
         silence: 帐号限制
         suspend: 帐号封禁
       your_appeal_approved: 你的申诉已被批准
@@ -1362,6 +1352,7 @@ zh-CN:
     profile: 个人资料
     relationships: 关注管理
     statuses_cleanup: 自动删除嘟文
+    strikes: 操作记录
     two_factor_authentication: 双重认证
     webauthn_authentication: 安全密钥
   statuses:
@@ -1435,6 +1426,7 @@ zh-CN:
       '2629746': 1个月
       '31556952': 1年
       '5259492': 2个月
+      '604800': 一周
       '63113904': 两年
       '7889238': 3个月
     min_age_label: 过期阈值
@@ -1582,26 +1574,28 @@ zh-CN:
         spam: 垃圾信息
         violation: 内容违反了以下社区准则
       explanation:
-        delete_statuses: 你的某些嘟文被发现违反了一项或多项社区准则,随后被 %{instance} 的监察员删除。继续违规将可能导致你的帐号受到更严厉的惩罚。
+        delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则,并已被 %{instance} 的监察员删除。
         disable: 你不能再使用你的帐户,但你的个人资料和其他数据保持不变。你可以请求数据备份,更改账户设置或删除账户。
+        mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 检察员标记为敏感内容。这意味着人们需要在嘟文中点击媒体,才能显示媒体预览。你可以在今后发嘟时自行将媒体标记为敏感内容。
         sensitive: 即刻起,你上传的所有媒体文件都将被标记为敏感内容并隐藏,在点击警告后才能查看。
         silence: 你可以继续使用你的帐号,但只有已关注你的人才能在看到你在此服务器上的嘟文,并且你会被排除在各类公共列表之外。其他用户仍可以手动关注你。
         suspend: 你不能再使用你的帐户,并且你的个人资料和其他数据都将无法访问。在大约30天内,你仍可以登录并请求数据备份,之后相关数据将被完全删除。我们会保留一些基础数据以避免封禁失效。
-      get_in_touch: 如果你认为此操作有误,可回复此邮件以与 %{instance} 的工作人员取得联系。
       reason: 理由:
-      statuses: 被发现有违规行为的嘟文:
+      statuses: 被引用的嘟文:
       subject:
         delete_statuses: 你在 %{acct} 的嘟文已被删除
         disable: 你的帐户 %{acct} 已被冻结
+        mark_statuses_as_sensitive: 你在 %{acct} 的嘟文已被标记为敏感内容
         none: 对 %{acct} 的警告
-        sensitive: 你在 %{acct} 的媒体文件将被标记为敏感内容
+        sensitive: 你在 %{acct} 的嘟文将从此被标记为敏感内容
         silence: 你的帐户 %{acct} 已被隐藏
         suspend: 你的帐户 %{acct} 已被封禁。
       title:
         delete_statuses: 嘟文已删除
         disable: 账号已冻结
+        mark_statuses_as_sensitive: 嘟文已被标记为敏感内容
         none: 警示
-        sensitive: 已隐藏的媒体内容
+        sensitive: 账户已被标记为敏感内容
         silence: 帐户被隐藏
         suspend: 账号被封禁
     welcome:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index b48182e8d..d137abe35 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -66,7 +66,6 @@ zh-HK:
     media: 媒體
     moved_html: "%{name} 已經轉移到 %{new_profile_link}:"
     network_hidden: 此信息不可用
-    never_active: 永不
     nothing_here: 暫時未有內容可以顯示!
     people_followed_by: "%{name} 關注的人"
     people_who_follow: 關注 %{name} 的人
@@ -396,17 +395,6 @@ zh-HK:
       reject_media_hint: 刪除本地緩存的媒體檔案,再也不在未來下載這個站點的檔案。和自動刪除無關
       reject_reports: 拒絕檢舉個案
       reject_reports_hint: 忽略所有來自此站點的檢舉。與停權無關
-      rejecting_media: 拒絕媒體檔案
-      rejecting_reports: 拒絕檢舉中
-      severity:
-        silence: 已靜音
-        suspend: 已停權
-      show:
-        retroactive:
-          silence: 對此域名的所有帳號取消靜音
-          suspend: 對此域名的所有帳號取消除名
-        title: 撤銷 %{domain} 的域名阻隔
-        undo: 撤銷
       undo: 撤銷域名阻隔
       view: 顯示正被阻隔的網域
     email_domain_blocks:
@@ -436,12 +424,7 @@ zh-HK:
         clear: 清除遞送錯誤
         restart: 重新啟動遞送
         stop: 停止遞送
-        title: 遞送
         unavailable: 離線
-        unavailable_message: 無法遞送
-        warning: 警告
-        warning_message:
-          other: 遞送失敗 %{count} 天
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 天皆無法達成遞送,將會被自動標記為離線。
@@ -1228,6 +1211,7 @@ zh-HK:
       '2629746': 1 個月
       '31556952': 1 年
       '5259492': 2 個月
+      '604800': 1 week
       '63113904': 2 年
       '7889238': 3 個月
     min_age_label: 按時間篩選
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 930f4f040..0941c1995 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -16,6 +16,7 @@ zh-TW:
     contact: 聯絡我們
     contact_missing: 未設定
     contact_unavailable: 未公開
+    continue_to_web: 於網頁程式中繼續
     discover_users: 探索使用者
     documentation: 文件
     federation_hint_html: 你只需要擁有 %{instance} 的帳戶,就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
@@ -23,6 +24,8 @@ zh-TW:
     hosted_on: 在 %{domain} 運作的 Mastodon 站點
     instance_actor_flash: "這個帳戶是個用來代表伺服器自已的虛擬角色,而不是實際的使用者。它是用來聯盟用的,除非您想要封鎖整個站台,不然不該封鎖它。但要封鎖整個站台,您可以使用網域封鎖功能。 \n"
     learn_more: 了解詳細
+    logged_in_as_html: 您目前登入使用的帳號是 %{username}
+    logout_before_registering: 您已經登入了!
     privacy_policy: 隱私權政策
     rules: 伺服器規則
     rules_html: 以下是您若想在此 Mastodon 伺服器建立帳戶必須遵守的規則總結:
@@ -64,7 +67,6 @@ zh-TW:
     media: 媒體
     moved_html: "%{name} 已經搬遷到 %{new_profile_link}:"
     network_hidden: 此訊息不可用
-    never_active: 永不
     nothing_here: 暫時沒有內容可供顯示!
     people_followed_by: "%{name} 關注的人"
     people_who_follow: 關注 %{name} 的人
@@ -438,21 +440,6 @@ zh-TW:
       reject_media_hint: 刪除本地快取的媒體檔案,並且不再接收來自該站點的任何媒體檔案。與停權無關
       reject_reports: 拒絕檢舉
       reject_reports_hint: 忽略所有來自此站點的檢舉。與停權無關
-      rejecting_media: 拒絕媒體檔案
-      rejecting_reports: 拒絕檢舉中
-      severity:
-        silence: 已靜音
-        suspend: 已停權
-      show:
-        affected_accounts:
-          one: 資料庫中的 1 個帳號受到影響
-          other: 資料庫中的 %{count} 個帳號受到影響
-          zero: 沒有影響到資料庫中的帳號
-        retroactive:
-          silence: 對此站點的所有使用者取消靜音
-          suspend: 對此站點的所有使用者取消停權
-        title: 撤銷 %{domain} 的站點封鎖
-        undo: 撤銷
       undo: 復原欲封鎖域名
       view: 顯示阻擋的網域
     email_domain_blocks:
@@ -484,22 +471,45 @@ zh-TW:
       title: 跟隨建議
       unsuppress: 回復跟隨建議
     instances:
+      availability:
+        description_html:
+          other: 若在<strong>%{count}天</strong>向某個網域遞送失敗,除非收到某個網域的遞送<em>表單</em>,否則不會繼續嘗試遞送。
+        failure_threshold_reached: 錯誤門檻於 %{date}。
+        failures_recorded:
+          other: 錯誤嘗試於 %{count} 天。
+        no_failures_recorded: 報告中沒有錯誤。
+        title: 可用狀態
       back_to_all: 所有
       back_to_limited: 受限制的
       back_to_warning: 警告
       by_domain: 站台
       confirm_purge: 您確定要永久刪除來自此網域的資料嗎?
+      content_policies:
+        comment: 內部備註
+        description_html: 您可以定義對所有此網域帳號及其子網域所實施之內容政策。
+        policies:
+          reject_media: 拒絕多媒體
+          reject_reports: 拒絕檢舉
+          silence: 限制
+          suspend: 停權
+        policy: 政策
+        reason: 公開理由
+        title: 內容政策
+      dashboard:
+        instance_accounts_dimension: 最多人跟隨之帳號
+        instance_accounts_measure: 已儲存帳號
+        instance_followers_measure: 我們那邊的跟隨者
+        instance_follows_measure: 他們這邊的跟隨者
+        instance_languages_dimension: 熱門語言
+        instance_media_attachments_measure: 已儲存多媒體附加檔案
+        instance_reports_measure: 關於他們的檢舉報告
+        instance_statuses_measure: 已儲存嘟文
       delivery:
         all: 所有
         clear: 清除遞送錯誤
         restart: 重新啟動遞送
         stop: 停止遞送
-        title: 遞送
         unavailable: 無法使用
-        unavailable_message: 無法使用遞送
-        warning: 警告
-        warning_message:
-          other: 遞送失敗 %{count} 天
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 日皆無法遞送 ,則會自動標記無法遞送。
@@ -516,12 +526,14 @@ zh-TW:
       private_comment: 私人留言
       public_comment: 公開留言
       purge: 清除
+      purge_description_html: 若您相信此網域將永久離線,您可以自儲存空間中刪除該網域所有帳號紀錄及相關資料。這可能花費一些時間。
       title: 聯邦
       total_blocked_by_us: 被我們封鎖
       total_followed_by_them: 被他們關注
       total_followed_by_us: 被我們關注
       total_reported: 關於他們的舉報
       total_storage: 多媒體附檔
+      totals_time_period_hint_html: 以下顯示之總和包含所有時間的資料。
     invites:
       deactivate_all: 全部停用
       filter:
@@ -575,6 +587,7 @@ zh-TW:
       action_taken_by: 操作執行者
       actions:
         delete_description_html: 被檢舉的嘟文將被刪除,並且會被以刪除線標記,幫助您升級同一帳號未來的違規行為。
+        mark_as_sensitive_description_html: 被檢舉的嘟文中的媒體將會被標記為敏感,並將會記錄一次警告,以協助您升級同一帳號未來的違規行為。
         other_description_html: 檢視更多控制帳號行為以及自訂檢舉帳號通知之選項。
         resolve_description_html: 被檢舉的帳號將不被採取任何行動,不會加以刪除線標記,並且此份報告將被關閉。
         silence_description_html: 個人頁面僅會對已跟隨帳號之使用者或手動查詢可見,將大幅度限制觸及範圍。此設定可隨時被還原。
@@ -595,6 +608,7 @@ zh-TW:
       forwarded: 已轉寄
       forwarded_to: 轉寄到 %{domain}
       mark_as_resolved: 標記為「已解決」
+      mark_as_sensitive: 標記為敏感內容
       mark_as_unresolved: 標記為「未解決」
       no_one_assigned: 沒有人
       notes:
@@ -738,6 +752,7 @@ zh-TW:
       actions:
         delete_statuses: "%{name} 刪除了 %{target} 的貼文"
         disable: "%{name} 凍結了 %{target} 的帳號"
+        mark_statuses_as_sensitive: "%{name} 將 %{target} 的嘟文標記為敏感內容"
         none: "%{name} 已對 %{target} 送出警告"
         sensitive: "%{name} 將 %{target} 的帳號標記為含有敏感內容"
         silence: "%{name} 限制了 %{target} 的帳號"
@@ -763,6 +778,7 @@ zh-TW:
       links:
         allow: 允許連結
         allow_provider: 允許發行者
+        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索現在世界上正在發生的事情。除非您核准該發佈者,連結將不被公開展示。您也可以核准或駁回個別連結。
         disallow: 不允許連結
         disallow_provider: 不允許發行者
         shared_by_over_week:
@@ -774,14 +790,17 @@ zh-TW:
       pending_review: 等待審核中
       preview_card_providers:
         allowed: 此發行者之連結能登上熱門
+        description_html: 這些網域來自被您伺服器常被分享的連結。除非您核准該連結,則這些連結將不會成為公開熱門標籤。您的核准或駁回將對子網域仍有效。
         rejected: 此發行者之連結不會登上熱門
         title: 發行者
       rejected: 被拒絕
       statuses:
         allow: 允許嘟文
         allow_account: 允許作者
+        description_html: 這些是您伺服器上已知被正在大量分享及加入最愛之嘟文。這些嘟文能幫助您伺服器上舊雨新知發現更多帳號來跟隨。除非您核准該作者且作者允許他們的帳號被推薦至其他人,嘟文將不被公開展示。您可以核准或駁回個別嘟文。
         disallow: 不允許嘟文
         disallow_account: 不允許作者
+        not_discoverable: 嘟文作者選擇不被發現
         shared_by:
           other: 分享過或/及收藏過 %{friendly_count} 次
         title: 熱門嘟文
@@ -793,6 +812,7 @@ zh-TW:
           tag_servers_dimension: 熱門伺服器
           tag_servers_measure: 不同伺服器
           tag_uses_measure: 總使用次數
+        description_html: 這些主題標籤正在您的伺服器上大量嘟文中出現。這些主題標籤能幫助您的使用者發現人們正集中討論的內容。除非您核准,主題標籤將不被公開展示。
         listable: 能被建議
         not_listable: 不能被建議
         not_trendable: 不會登上熱門
@@ -819,6 +839,7 @@ zh-TW:
       actions:
         delete_statuses: 要刪除他們的嘟文
         disable: 要凍結他們的帳號
+        mark_statuses_as_sensitive: 要將他們的嘟文標記為含有敏感內容
         none: 警告
         sensitive: 要將他們的帳號標記為含有敏感內容
         silence: 要限制他們的帳號
@@ -921,8 +942,10 @@ zh-TW:
     status:
       account_status: 帳戶狀態
       confirming: 等待電子郵件確認完成。
+      functional: 您的帳號可以正常使用了。
       pending: 管管們正在處理您的申請,這可能需要一點時間處理。我們將在申請通過後以電子郵件方式通知您。
       redirecting_to: 您的帳戶因目前重新導向至 %{acct} 而被停用。
+      view_strikes: 檢視針對您帳號過去的警示
     too_fast: 送出表單的速度太快跟不上,請稍後再試。
     trouble_logging_in: 登錄時遇到困難?
     use_security_key: 使用安全金鑰
@@ -998,6 +1021,7 @@ zh-TW:
         submit: 遞交申訴
       associated_report: 相關報告
       created_at: 過時的
+      description_html: 這些是 %{instance} 的管理員向您發送的針對您的帳號採取的措施與警告。
       recipient: 此致
       status: '嘟文編號 #%{id}'
       status_removed: 嘟文已從系統中移除
@@ -1005,8 +1029,9 @@ zh-TW:
       title_actions:
         delete_statuses: 嘟文移除
         disable: 凍結帳號
+        mark_statuses_as_sensitive: 將嘟文標記為敏感
         none: 警告
-        sensitive: 標記為敏感帳號
+        sensitive: 將帳號標記為敏感
         silence: 帳號限制
         suspend: 帳號停權
       your_appeal_approved: 您的申訴已被批准
@@ -1374,6 +1399,7 @@ zh-TW:
     profile: 使用者資訊
     relationships: 跟隨中與跟隨者
     statuses_cleanup: 自動貼文刪除
+    strikes: 管理警告
     two_factor_authentication: 兩階段認證
     webauthn_authentication: 安全金鑰
   statuses:
@@ -1447,6 +1473,7 @@ zh-TW:
       '2629746': 1 個月
       '31556952': 1 年
       '5259492': 2 個月
+      '604800': 一週
       '63113904': 2 年
       '7889238': 3 個月
     min_age_label: 按時間篩選
@@ -1592,26 +1619,28 @@ zh-TW:
         spam: 垃圾訊息
         violation: 該內容違反以下社群規章
       explanation:
-        delete_statuses: 您部份的貼文被認定違反一項或多項社群規章,並且已被 %{instance} 的管理員依規定移除。往後更多的違規可能導致對您帳號更嚴重的處罰。
+        delete_statuses: 您的某些嘟文被發現違反了一項或多項社群準則,隨後已被 %{instance} 的管理員刪除。
         disable: 您無法繼續使用您的帳號,但您的個人頁面及其他資料內容保持不變。您可以要求一份您的資料備份,帳號異動設定,或是刪除帳號。
+        mark_statuses_as_sensitive: 您的部份嘟文已被 %{instance} 的管理員標記為敏感。這代表了人們必須在顯示預覽前點擊嘟文中的媒體。您可以在將來嘟文時自己將媒體標記為敏感。
         sensitive: 由此刻起,您所有上傳的媒體檔案將被標記為敏感內容,並且隱藏於點擊警告之後。
         silence: 您仍然可以使用您的帳號,但僅有已追蹤您的人才能看到您在此伺服器的貼文,您也可能會從各式探索功能中被排除。但其他人仍可手動追蹤您。
         suspend: 您將不能使用您的帳號,您的個人資料頁面及其他資料將不再能被存取。您仍可於約 30 日內資料被完全刪除前要求下載你的資料,但我們仍會保留一部份基本資料,以防止有人規避停權處罰。
-      get_in_touch: 如果您認為這是個錯誤,您可回復這封 e-mail 來連繫 %{instance} 的管理員。
       reason: 原因:
-      statuses: 被判定違規之嘟文:
+      statuses: 引用的嘟文:
       subject:
         delete_statuses: 您於 %{acct} 之嘟文已被移除
         disable: 您的帳號 %{acct} 已被凍結
+        mark_statuses_as_sensitive: 您在 %{acct} 上的嘟文已被標記為敏感
         none: 對 %{acct} 的警告
-        sensitive: 您於 %{acct} 之媒體檔案即刻起已被標記為敏感內容
+        sensitive: 從現在開始,您在 %{acct} 上的嘟文將會被標記為敏感
         silence: 您的帳號 %{acct} 已被限制
         suspend: 您的帳號 %{acct} 已被停權
       title:
         delete_statuses: 嘟文已移除
         disable: 帳號已被涷結
+        mark_statuses_as_sensitive: 嘟文已標記為敏感內容
         none: 警告
-        sensitive: 隱藏媒體內容
+        sensitive: 帳號已標記為敏感內容
         silence: 帳號已被限制
         suspend: 帳號己被停用
     welcome:
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
index 366bf9aa7..652ce9752 100644
--- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
+++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
@@ -16,7 +16,7 @@ class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
       add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently
     rescue ActiveRecord::RecordNotUnique
       remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower'
-      raise CorruptionError
+      raise CorruptionError.new('index_accounts_on_username_and_domain_lower')
     end
 
     remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower' if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower')
diff --git a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
index e492c9e86..b3ee11d09 100644
--- a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
+++ b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
@@ -10,7 +10,7 @@ class AddCaseInsensitiveBtreeIndexToTags < ActiveRecord::Migration[5.2]
       safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)' }
     rescue ActiveRecord::StatementInvalid => e
       remove_index :tags, name: 'index_tags_on_name_lower_btree'
-      raise CorruptionError if e.is_a?(ActiveRecord::RecordNotUnique)
+      raise CorruptionError.new('index_tags_on_name_lower_btree') if e.is_a?(ActiveRecord::RecordNotUnique)
       raise e
     end
 
diff --git a/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb b/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb
new file mode 100644
index 000000000..9f45bec7e
--- /dev/null
+++ b/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexConversationsUri < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :conversations, 'index_conversations_on_uri', :uri, unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :conversations, 'index_conversations_on_uri', :uri, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb b/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb
new file mode 100644
index 000000000..ddb07ab5d
--- /dev/null
+++ b/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesInReplyToAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_in_reply_to_account_id', :in_reply_to_account_id, where: 'in_reply_to_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_in_reply_to_account_id', :in_reply_to_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb b/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb
new file mode 100644
index 000000000..411c86456
--- /dev/null
+++ b/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesInReplyToId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_in_reply_to_id', :in_reply_to_id, where: 'in_reply_to_id IS NOT NULL'
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_in_reply_to_id', :in_reply_to_id
+  end
+end
diff --git a/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb b/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb
new file mode 100644
index 000000000..9d86a0364
--- /dev/null
+++ b/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexMediaAttachmentsScheduledStatusId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :media_attachments, 'index_media_attachments_on_scheduled_status_id', :scheduled_status_id, where: 'scheduled_status_id IS NOT NULL'
+  end
+
+  def down
+    update_index :media_attachments, 'index_media_attachments_on_scheduled_status_id', :scheduled_status_id
+  end
+end
diff --git a/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb b/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb
new file mode 100644
index 000000000..658f3e42a
--- /dev/null
+++ b/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexMediaAttachmentsShortcode < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :media_attachments, 'index_media_attachments_on_shortcode', :shortcode, unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :media_attachments, 'index_media_attachments_on_shortcode', :shortcode, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb b/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb
new file mode 100644
index 000000000..cc5bdae96
--- /dev/null
+++ b/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexUsersResetPasswordToken < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :users, 'index_users_on_reset_password_token', :reset_password_token, unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :users, 'index_users_on_reset_password_token', :reset_password_token, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb b/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb
new file mode 100644
index 000000000..364939d3a
--- /dev/null
+++ b/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexUsersCreatedByApplicationId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :users, 'index_users_on_created_by_application_id', :created_by_application_id, where: 'created_by_application_id IS NOT NULL'
+  end
+
+  def down
+    update_index :users, 'index_users_on_created_by_application_id', :created_by_application_id
+  end
+end
diff --git a/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb b/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb
new file mode 100644
index 000000000..0fb5f6365
--- /dev/null
+++ b/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesUri < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_uri', :uri, unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_uri', :uri, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb b/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb
new file mode 100644
index 000000000..ec93a417a
--- /dev/null
+++ b/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountsMovedToAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :accounts, 'index_accounts_on_moved_to_account_id', :moved_to_account_id, where: 'moved_to_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :accounts, 'index_accounts_on_moved_to_account_id', :moved_to_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb b/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb
new file mode 100644
index 000000000..30ade8e3f
--- /dev/null
+++ b/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexOauthAccessTokensRefreshToken < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_refresh_token', :refresh_token, unique: true, where: 'refresh_token IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_refresh_token', :refresh_token, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb b/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb
new file mode 100644
index 000000000..d8bce144f
--- /dev/null
+++ b/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountsURL < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :accounts, 'index_accounts_on_url', :url, where: 'url IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :accounts, 'index_accounts_on_url', :url
+  end
+end
diff --git a/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb b/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb
new file mode 100644
index 000000000..787263bf7
--- /dev/null
+++ b/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexOauthAccessTokensResourceOwnerId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_resource_owner_id', :resource_owner_id, where: 'resource_owner_id IS NOT NULL'
+  end
+
+  def down
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_resource_owner_id', :resource_owner_id
+  end
+end
diff --git a/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb b/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb
new file mode 100644
index 000000000..4afea291a
--- /dev/null
+++ b/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAnnouncementReactionsCustomEmojiId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :announcement_reactions, 'index_announcement_reactions_on_custom_emoji_id', :custom_emoji_id, where: 'custom_emoji_id IS NOT NULL'
+  end
+
+  def down
+    update_index :announcement_reactions, 'index_announcement_reactions_on_custom_emoji_id', :custom_emoji_id
+  end
+end
diff --git a/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb b/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb
new file mode 100644
index 000000000..244b89417
--- /dev/null
+++ b/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAppealsApprovedByAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :appeals, 'index_appeals_on_approved_by_account_id', :approved_by_account_id, where: 'approved_by_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :appeals, 'index_appeals_on_approved_by_account_id', :approved_by_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb b/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb
new file mode 100644
index 000000000..cb1906e9f
--- /dev/null
+++ b/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountMigrationsTargetAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :account_migrations, 'index_account_migrations_on_target_account_id', :target_account_id, where: 'target_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :account_migrations, 'index_account_migrations_on_target_account_id', :target_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb b/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb
new file mode 100644
index 000000000..017333c26
--- /dev/null
+++ b/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAppealsRejectedByAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :appeals, 'index_appeals_on_rejected_by_account_id', :rejected_by_account_id, where: 'rejected_by_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :appeals, 'index_appeals_on_rejected_by_account_id', :rejected_by_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb b/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb
new file mode 100644
index 000000000..fc0d42a25
--- /dev/null
+++ b/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexListAccountsFollowId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :list_accounts, 'index_list_accounts_on_follow_id', :follow_id, where: 'follow_id IS NOT NULL'
+  end
+
+  def down
+    update_index :list_accounts, 'index_list_accounts_on_follow_id', :follow_id
+  end
+end
diff --git a/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb b/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb
new file mode 100644
index 000000000..fb49e33e9
--- /dev/null
+++ b/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexWebPushSubscriptionsAccessTokenId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :web_push_subscriptions, 'index_web_push_subscriptions_on_access_token_id', :access_token_id, where: 'access_token_id IS NOT NULL'
+  end
+
+  def down
+    update_index :web_push_subscriptions, 'index_web_push_subscriptions_on_access_token_id', :access_token_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3f51b85d5..8d2894236 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_03_09_213005) do
+ActiveRecord::Schema.define(version: 2022_03_10_060959) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -59,7 +59,7 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_account_migrations_on_account_id"
-    t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id"
+    t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id", where: "(target_account_id IS NOT NULL)"
   end
 
   create_table "account_moderation_notes", force: :cascade do |t|
@@ -188,9 +188,9 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "requested_review_at"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
-    t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
+    t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id", where: "(moved_to_account_id IS NOT NULL)"
     t.index ["uri"], name: "index_accounts_on_uri"
-    t.index ["url"], name: "index_accounts_on_url"
+    t.index ["url"], name: "index_accounts_on_url", opclass: :text_pattern_ops, where: "(url IS NOT NULL)"
   end
 
   create_table "accounts_tags", id: false, force: :cascade do |t|
@@ -230,7 +230,7 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "updated_at", null: false
     t.index ["account_id", "announcement_id", "name"], name: "index_announcement_reactions_on_account_id_and_announcement_id", unique: true
     t.index ["announcement_id"], name: "index_announcement_reactions_on_announcement_id"
-    t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id"
+    t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id", where: "(custom_emoji_id IS NOT NULL)"
   end
 
   create_table "announcements", force: :cascade do |t|
@@ -258,8 +258,8 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "updated_at", precision: 6, null: false
     t.index ["account_id"], name: "index_appeals_on_account_id"
     t.index ["account_warning_id"], name: "index_appeals_on_account_warning_id", unique: true
-    t.index ["approved_by_account_id"], name: "index_appeals_on_approved_by_account_id"
-    t.index ["rejected_by_account_id"], name: "index_appeals_on_rejected_by_account_id"
+    t.index ["approved_by_account_id"], name: "index_appeals_on_approved_by_account_id", where: "(approved_by_account_id IS NOT NULL)"
+    t.index ["rejected_by_account_id"], name: "index_appeals_on_rejected_by_account_id", where: "(rejected_by_account_id IS NOT NULL)"
   end
 
   create_table "backups", force: :cascade do |t|
@@ -311,7 +311,7 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.string "uri"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["uri"], name: "index_conversations_on_uri", unique: true
+    t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
   create_table "custom_emoji_categories", force: :cascade do |t|
@@ -509,7 +509,7 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.bigint "account_id", null: false
     t.bigint "follow_id"
     t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
-    t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
+    t.index ["follow_id"], name: "index_list_accounts_on_follow_id", where: "(follow_id IS NOT NULL)"
     t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
   end
 
@@ -568,8 +568,8 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "thumbnail_updated_at"
     t.string "thumbnail_remote_url"
     t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
-    t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id"
-    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true
+    t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id", where: "(scheduled_status_id IS NOT NULL)"
+    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true, opclass: :text_pattern_ops, where: "(shortcode IS NOT NULL)"
     t.index ["status_id"], name: "index_media_attachments_on_status_id"
   end
 
@@ -631,8 +631,8 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.bigint "resource_owner_id"
     t.datetime "last_used_at"
     t.inet "last_used_ip"
-    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
-    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
+    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, opclass: :text_pattern_ops, where: "(refresh_token IS NOT NULL)"
+    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", where: "(resource_owner_id IS NOT NULL)"
     t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
   end
 
@@ -902,10 +902,10 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
-    t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
-    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id", where: "(in_reply_to_account_id IS NOT NULL)"
+    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", where: "(in_reply_to_id IS NOT NULL)"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
-    t.index ["uri"], name: "index_statuses_on_uri", unique: true
+    t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
   create_table "statuses_tags", id: false, force: :cascade do |t|
@@ -999,9 +999,9 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.boolean "skip_sign_in_token"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-    t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id"
+    t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"
     t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, opclass: :text_pattern_ops, where: "(reset_password_token IS NOT NULL)"
   end
 
   create_table "web_push_subscriptions", force: :cascade do |t|
@@ -1013,7 +1013,7 @@ ActiveRecord::Schema.define(version: 2022_03_09_213005) do
     t.datetime "updated_at", null: false
     t.bigint "access_token_id"
     t.bigint "user_id"
-    t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id"
+    t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id", where: "(access_token_id IS NOT NULL)"
     t.index ["user_id"], name: "index_web_push_subscriptions_on_user_id"
   end
 
diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb
index 1e047d96c..33beec236 100644
--- a/lib/mastodon/maintenance_cli.rb
+++ b/lib/mastodon/maintenance_cli.rb
@@ -13,8 +13,8 @@ module Mastodon
       true
     end
 
-    MIN_SUPPORTED_VERSION = 2019_10_01_213028
-    MAX_SUPPORTED_VERSION = 2022_01_18_183123
+    MIN_SUPPORTED_VERSION = 2019_10_01_213028 # rubocop:disable Style/NumericLiterals
+    MAX_SUPPORTED_VERSION = 2022_03_10_060959 # rubocop:disable Style/NumericLiterals
 
     # Stubs to enjoy ActiveRecord queries while not depending on a particular
     # version of the code/database
@@ -44,6 +44,7 @@ module Mastodon
     class WebauthnCredential < ApplicationRecord; end
     class FollowRecommendationSuppression < ApplicationRecord; end
     class CanonicalEmailBlock < ApplicationRecord; end
+    class Appeal < ApplicationRecord; end
 
     class PreviewCard < ApplicationRecord
       self.inheritance_column = false
@@ -92,6 +93,7 @@ module Mastodon
         owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
         owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
         owned_classes << AccountIdentityProof if ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+        owned_classes << Appeal if ActiveRecord::Base.connection.table_exists?(:appeals)
 
         owned_classes.each do |klass|
           klass.where(account_id: other_account.id).find_each do |record|
@@ -121,6 +123,12 @@ module Mastodon
             record.update_attribute(:reference_account_id, id)
           end
         end
+
+        if ActiveRecord::Base.connection.table_exists?(:appeals)
+          Appeal.where(account_warning_id: other_account.id).find_each do |record|
+            record.update_attribute(:account_warning_id, id)
+          end
+        end
       end
     end
 
@@ -199,7 +207,7 @@ module Mastodon
       end
 
       @prompt.say 'Restoring index_accounts_on_username_and_domain_lower…'
-      if ActiveRecord::Migrator.current_version < 20200620164023
+      if ActiveRecord::Migrator.current_version < 20200620164023 # rubocop:disable Style/NumericLiterals
         ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
       else
         ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
@@ -242,7 +250,7 @@ module Mastodon
         end
       end
 
-      if ActiveRecord::Migrator.current_version < 20220118183010
+      if ActiveRecord::Migrator.current_version < 20220118183010 # rubocop:disable Style/NumericLiterals
         ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
           users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
           @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
@@ -266,7 +274,12 @@ module Mastodon
       ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
       ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
       ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if ActiveRecord::Migrator.current_version < 20220118183010
-      ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+
+      if ActiveRecord::Migrator.current_version < 20220310060641 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_account_domain_blocks!
@@ -325,7 +338,11 @@ module Mastodon
       end
 
       @prompt.say 'Restoring conversations indexes…'
-      ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+      if ActiveRecord::Migrator.current_version < 20220307083603 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_custom_emojis!
@@ -438,7 +455,11 @@ module Mastodon
       end
 
       @prompt.say 'Restoring media_attachments indexes…'
-      ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+      if ActiveRecord::Migrator.current_version < 20220310060626 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_preview_cards!
@@ -467,7 +488,11 @@ module Mastodon
       end
 
       @prompt.say 'Restoring statuses indexes…'
-      ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+      if ActiveRecord::Migrator.current_version < 20220310060706 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_tags!
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 5bc903349..e920ff88f 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -42,8 +42,14 @@
 module Mastodon
   module MigrationHelpers
     class CorruptionError < StandardError
-      def initialize(message = nil)
-        super(message.presence || 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing')
+      attr_reader :index_name
+
+      def initialize(index_name)
+        @index_name = index_name
+
+        super "The index `#{index_name}` seems to be corrupted, it contains duplicate rows. " \
+          'For information on how to fix this, see our documentation: ' \
+          'https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/'
       end
 
       def cause
@@ -802,6 +808,24 @@ module Mastodon
       columns(table).find { |column| column.name == name }
     end
 
+    # Update the configuration of an index by creating a new one and then
+    # removing the old one
+    def update_index(table_name, index_name, columns, **index_options)
+      if index_name_exists?(table_name, "#{index_name}_new") && index_name_exists?(table_name, index_name)
+        remove_index table_name, "#{index_name}_new"
+      end
+
+      begin
+        add_index table_name, columns, **index_options.merge(name: "#{index_name}_new", algorithm: :concurrently)
+      rescue ActiveRecord::RecordNotUnique
+        remove_index table_name, name: "#{index_name}_new"
+        raise CorruptionError.new(index_name)
+      end
+
+      remove_index table_name, name: index_name if index_name_exists?(table_name, index_name)
+      rename_index table_name, "#{index_name}_new", index_name
+    end
+
     # This will replace the first occurrence of a string in a column with
     # the replacement
     # On postgresql we can use `regexp_replace` for that.
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index a6b8c74cd..ca939fd1f 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -17,23 +17,10 @@ namespace :db do
     end
   end
 
-  task :post_migration_hook do
-    at_exit do
-      unless %w(C POSIX).include?(ActiveRecord::Base.connection.select_one('SELECT datcollate FROM pg_database WHERE datname = current_database();')['datcollate'])
-        warn <<~WARNING
-          Your database collation may be susceptible to index corruption.
-            (This warning does not indicate that index corruption has occurred, and it can be ignored if you've previously checked for index corruption)
-            (To learn more, visit: https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/)
-        WARNING
-      end
-    end
-  end
-
   task :pre_migration_check do
     version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    abort 'ERROR: This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon.' if version < 90_500
+    abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
   end
 
   Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])
-  Rake::Task['db:migrate'].enhance(['db:post_migration_hook'])
 end
diff --git a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb
new file mode 100644
index 000000000..15ac31cbc
--- /dev/null
+++ b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb
@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Emails::ConfirmationsController, type: :controller do
+  let(:confirmed_at) { nil }
+  let(:user)         { Fabricate(:user, confirmed_at: confirmed_at) }
+  let(:app)          { Fabricate(:application) }
+  let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes, application: app) }
+  let(:scopes)       { 'write' }
+
+  describe '#create' do
+    context 'with an oauth token' do
+      before do
+        allow(controller).to receive(:doorkeeper_token) { token }
+      end
+
+      context 'from a random app' do
+        it 'returns http forbidden' do
+          post :create
+          expect(response).to have_http_status(:forbidden)
+        end
+      end
+
+      context 'from an app that created the account' do
+        before do
+          user.update(created_by_application: token.application)
+        end
+
+        context 'when the account is already confirmed' do
+          let(:confirmed_at) { Time.now.utc }
+
+          it 'returns http forbidden' do
+            post :create
+            expect(response).to have_http_status(:forbidden)
+          end
+
+          context 'but user changed e-mail and has not confirmed it' do
+            before do
+              user.update(email: 'foo@bar.com')
+            end
+
+            it 'returns http success' do
+              post :create
+              expect(response).to have_http_status(:success)
+            end
+          end
+        end
+
+        context 'when the account is unconfirmed' do
+          it 'returns http success' do
+            post :create
+            expect(response).to have_http_status(:success)
+          end
+        end
+      end
+    end
+
+    context 'without an oauth token' do
+      it 'returns http unauthorized' do
+        post :create
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 86c2a9c52..217a8f2f8 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -60,9 +60,7 @@ RSpec.configure do |config|
 
   config.after :each do
     Rails.cache.clear
-
-    keys = Redis.current.keys
-    Redis.current.del(keys) if keys.any?
+    Redis.current.del(Redis.current.keys)
   end
 end
 
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 94574aa7f..68816e554 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -3,9 +3,11 @@ require 'rails_helper'
 RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
   include ActionView::Helpers::TextHelper
 
-  let(:sender) { Fabricate(:account) }
-  let(:recipient) { Fabricate(:account) }
-  let(:valid_domain) { Rails.configuration.x.local_domain }
+  let!(:sender) { Fabricate(:account).tap { |account| account.update(uri: ActivityPub::TagManager.instance.uri_for(account)) } }
+  let!(:recipient) { Fabricate(:account) }
+  let!(:valid_domain) { Rails.configuration.x.local_domain }
+
+  let(:existing_status) { nil }
 
   let(:note) do
     {
@@ -19,11 +21,13 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
 
   subject { described_class.new }
 
+  before do
+    stub_request(:head, 'https://example.com/watch?v=12345').to_return(status: 404, body: '')
+  end
+
   describe '#call' do
     before do
-      sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender))
-
-      stub_request(:head, 'https://example.com/watch?v=12345').to_return(status: 404, body: '')
+      existing_status
       subject.call(object[:id], prefetched_body: Oj.dump(object))
     end
 
@@ -186,5 +190,37 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         expect(sender.statuses.first).to be_nil
       end
     end
+
+    context 'when status already exists' do
+      let(:existing_status) { Fabricate(:status, account: sender, text: 'Foo', uri: note[:id]) }
+
+      context 'with a Note object' do
+        let(:object) { note }
+
+        it 'updates status' do
+          existing_status.reload
+          expect(existing_status.text).to eq 'Lorem ipsum'
+          expect(existing_status.edits).to_not be_empty
+        end
+      end
+
+      context 'with a Create activity' do
+        let(:object) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            id: "https://#{valid_domain}/@foo/1234/create",
+            type: 'Create',
+            actor: ActivityPub::TagManager.instance.uri_for(sender),
+            object: note,
+          }
+        end
+
+        it 'updates status' do
+          existing_status.reload
+          expect(existing_status.text).to eq 'Lorem ipsum'
+          expect(existing_status.edits).to_not be_empty
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 40b405217..788c7c9d9 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -46,6 +46,26 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
       expect(status.reload.spoiler_text).to eq 'Show more'
     end
 
+    context 'with no changes and originally with no ordered_media_attachment_ids' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Hello world',
+        }
+      end
+
+      before do
+        status.update(ordered_media_attachment_ids: nil)
+        subject.call(status, json)
+      end
+
+      it 'does not record an update' do
+        expect(status.reload.edited?).to be false
+      end
+    end
+
     context 'originally without tags' do
       before do
         subject.call(status, json)