diff --git a/.nvmrc b/.nvmrc
index 6e77d0a749..403f75d038 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.19
+22.20
diff --git a/Gemfile.lock b/Gemfile.lock
index db436c01be..fa785d6876 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,8 +300,8 @@ GEM
     highline (3.1.2)
       reline
     hiredis (0.6.3)
-    hiredis-client (0.26.0)
-      redis-client (= 0.26.0)
+    hiredis-client (0.26.1)
+      redis-client (= 0.26.1)
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http (5.3.1)
@@ -720,7 +720,7 @@ GEM
       reline
     redcarpet (3.6.1)
     redis (4.8.1)
-    redis-client (0.26.0)
+    redis-client (0.26.1)
       connection_pool
     regexp_parser (2.11.3)
     reline (0.6.2)
@@ -766,7 +766,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.4)
-    rubocop (1.81.0)
+    rubocop (1.81.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -790,7 +790,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rails (2.33.3)
+    rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -812,7 +812,7 @@ GEM
     ruby-vips (2.2.5)
       ffi (~> 1.12)
       logger
-    rubyzip (3.1.0)
+    rubyzip (3.1.1)
     rufus-scheduler (3.9.2)
       fugit (~> 1.1, >= 1.11.1)
     safety_net_attestation (0.5.0)
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 685b02ae6d..990d08ca7f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -71,6 +71,10 @@ class AccountsController < ApplicationController
     params[:username]
   end
 
+  def account_id_param
+    params[:id]
+  end
+
   def skip_temporary_suspension_response?
     request.format == :json
   end
diff --git a/app/controllers/activitypub/likes_controller.rb b/app/controllers/activitypub/likes_controller.rb
index 4aa6a4a771..e875517b02 100644
--- a/app/controllers/activitypub/likes_controller.rb
+++ b/app/controllers/activitypub/likes_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::LikesController < ActivityPub::BaseController
 
   def likes_collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: account_status_likes_url(@account, @status),
+      id: ActivityPub::TagManager.instance.likes_uri_for(@status),
       type: :unordered,
       size: @status.favourites_count
     )
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index a9476b806f..928977768b 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -73,6 +73,8 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   end
 
   def set_account
-    @account = params[:account_username].present? ? Account.find_local!(username_param) : Account.representative
+    return super if params[:account_username].present? || params[:account_id].present?
+
+    @account = Account.representative
   end
 end
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index 0a19275d38..1959f50d67 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -37,7 +37,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
 
   def replies_collection_presenter
     page = ActivityPub::CollectionPresenter.new(
-      id: account_status_replies_url(@account, @status, page_params),
+      id: ActivityPub::TagManager.instance.replies_uri_for(@status, page_params),
       type: :unordered,
       part_of: account_status_replies_url(@account, @status),
       next: next_page,
@@ -47,7 +47,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
     return page if page_requested?
 
     ActivityPub::CollectionPresenter.new(
-      id: account_status_replies_url(@account, @status),
+      id: ActivityPub::TagManager.instance.replies_uri_for(@status),
       type: :unordered,
       first: page
     )
@@ -66,8 +66,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
       # Only consider remote accounts
       return nil if @replies.size < DESCENDANTS_LIMIT
 
-      account_status_replies_url(
-        @account,
+      ActivityPub::TagManager.instance.replies_uri_for(
         @status,
         page: true,
         min_id: @replies&.last&.id,
@@ -77,8 +76,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
       # For now, we're serving only self-replies, but next page might be other accounts
       next_only_other_accounts = @replies&.last&.account_id != @account.id || @replies.size < DESCENDANTS_LIMIT
 
-      account_status_replies_url(
-        @account,
+      ActivityPub::TagManager.instance.replies_uri_for(
         @status,
         page: true,
         min_id: next_only_other_accounts ? nil : @replies&.last&.id,
diff --git a/app/controllers/activitypub/shares_controller.rb b/app/controllers/activitypub/shares_controller.rb
index 65b4a5b383..2d1e389885 100644
--- a/app/controllers/activitypub/shares_controller.rb
+++ b/app/controllers/activitypub/shares_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::SharesController < ActivityPub::BaseController
 
   def shares_collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: account_status_shares_url(@account, @status),
+      id: ActivityPub::TagManager.instance.shares_uri_for(@status),
       type: :unordered,
       size: @status.reblogs_count
     )
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb
index 2b132417f7..7b3cd4d3ea 100644
--- a/app/controllers/concerns/account_owned_concern.rb
+++ b/app/controllers/concerns/account_owned_concern.rb
@@ -18,7 +18,11 @@ module AccountOwnedConcern
   end
 
   def set_account
-    @account = Account.find_local!(username_param)
+    @account = username_param.present? ? Account.find_local!(username_param) : Account.local.find(account_id_param)
+  end
+
+  def account_id_param
+    params[:account_id]
   end
 
   def username_param
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index ab8d77f353..b6f43cb82a 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -58,20 +58,22 @@ class FollowerAccountsController < ApplicationController
   end
 
   def collection_presenter
-    options = { type: :ordered }
+    options = {}
     options[:size] = @account.followers_count unless Setting.hide_followers_count || @account.user&.setting_hide_followers_count
     if page_requested?
       ActivityPub::CollectionPresenter.new(
-        id: account_followers_url(@account, page: params.fetch(:page, 1)),
+        id: page_url(params.fetch(:page, 1)),
+        type: :ordered,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
-        part_of: account_followers_url(@account),
+        part_of: ActivityPub::TagManager.instance.followers_uri_for(@account),
         next: next_page_url,
         prev: prev_page_url,
         **options
       )
     else
       ActivityPub::CollectionPresenter.new(
-        id: account_followers_url(@account),
+        id: ActivityPub::TagManager.instance.followers_uri_for(@account),
+        type: :ordered,
         first: page_url(1),
         **options
       )
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 268fad96d0..803d6e342a 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -49,7 +49,7 @@ class FollowingAccountsController < ApplicationController
   end
 
   def page_url(page)
-    account_following_index_url(@account, page: page) unless page.nil?
+    ActivityPub::TagManager.instance.following_uri_for(@account, page: page) unless page.nil?
   end
 
   def next_page_url
@@ -63,17 +63,17 @@ class FollowingAccountsController < ApplicationController
   def collection_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
-        id: account_following_index_url(@account, page: params.fetch(:page, 1)),
+        id: page_url(params.fetch(:page, 1)),
         type: :ordered,
         size: @account.following_count,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
-        part_of: account_following_index_url(@account),
+        part_of: ActivityPub::TagManager.instance.following_uri_for(@account),
         next: next_page_url,
         prev: prev_page_url
       )
     else
       ActivityPub::CollectionPresenter.new(
-        id: account_following_index_url(@account),
+        id: ActivityPub::TagManager.instance.following_uri_for(@account),
         type: :ordered,
         size: @account.following_count,
         first: page_url(1)
diff --git a/app/javascript/mastodon/features/emoji/emoji_html.tsx b/app/javascript/mastodon/features/emoji/emoji_html.tsx
index 08d62b2c37..b4c352073c 100644
--- a/app/javascript/mastodon/features/emoji/emoji_html.tsx
+++ b/app/javascript/mastodon/features/emoji/emoji_html.tsx
@@ -51,7 +51,14 @@ export const EmojiHTML = <Element extends ElementType>(
   if (isModernEmojiEnabled()) {
     return <ModernEmojiHTML {...props} />;
   }
-  const { as: asElement, htmlString, extraEmojis, className, ...rest } = props;
+  const {
+    as: asElement,
+    htmlString,
+    extraEmojis,
+    className,
+    shallow: _,
+    ...rest
+  } = props;
   const Wrapper = asElement ?? 'div';
   return (
     <Wrapper
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 6df4608528..7ab1d793ed 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -44,7 +44,6 @@
   "account.posts": "Plasings",
   "account.posts_with_replies": "Plasings en antwoorde",
   "account.report": "Rapporteer @{name}",
-  "account.requested": "Wag op goedkeuring. Klik om volgversoek te kanselleer",
   "account.requested_follow": "{name} het versoek om jou te volg",
   "account.share": "Deel @{name} se profiel",
   "account.show_reblogs": "Wys aangestuurde plasings van @{name}",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 661a1bebdb..bd4c061266 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -44,7 +44,6 @@
   "account.posts": "Publicacions",
   "account.posts_with_replies": "Publicacions y respuestas",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando l'aprebación",
   "account.requested_follow": "{name} ha demandau seguir-te",
   "account.share": "Compartir lo perfil de @{name}",
   "account.show_reblogs": "Amostrar retutz de @{name}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index eb4933e188..affadf671f 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "المنشورات والرُدود",
   "account.remove_from_followers": "إزالة {name} من المتابعين",
   "account.report": "الإبلاغ عن @{name}",
-  "account.requested": "في انتظار القبول. اضغط لإلغاء طلب المُتابعة",
   "account.requested_follow": "لقد طلب {name} متابعتك",
   "account.requests_to_follow_you": "طلبات المتابعة",
   "account.share": "شارِك الملف التعريفي لـ @{name}",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index 4c7a61746f..a6b11dd910 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Paylaşım və cavablar",
   "account.remove_from_followers": "{name} - izləyicilərdən çıxart",
   "account.report": "@{name} istifadəçisini şikayət et",
-  "account.requested": "Təsdiq edilməsi gözlənilir. İzləmə sorğusunu ləğv etmək üçün kliklə",
   "account.requested_follow": "{name} sizi izləmək sorğusu göndərib",
   "account.requests_to_follow_you": "Sizi izləmək istəyir",
   "account.share": "@{name} profilini paylaş",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 6086fbf77f..56430cee50 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Не паведамляць мне пра публікацыі @{name}",
   "account.domain_blocking": "Блакіраванне дамена",
   "account.edit_profile": "Рэдагаваць профіль",
+  "account.edit_profile_short": "Рэдагаваць",
   "account.enable_notifications": "Апавяшчаць мяне пра допісы @{name}",
   "account.endorse": "Паказваць у профілі",
   "account.familiar_followers_many": "Мае сярод падпісчыкаў {name1}, {name2}, і {othersCount, plural, one {яшчэ # чалавека, знаёмага вам} few {яшчэ # чалавекі, знаёмыя вам} many {яшчэ # чалавек, знаёмых вам} other {яшчэ # чалавекі, знаёмыя вам}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Няма допісаў",
   "account.follow": "Падпісацца",
   "account.follow_back": "Падпісацца ў адказ",
+  "account.follow_back_short": "Падпісацца ў адказ",
+  "account.follow_request": "Даслаць запыт на падпіску",
+  "account.follow_request_cancel": "Скасаваць запыт",
+  "account.follow_request_cancel_short": "Скасаваць",
+  "account.follow_request_short": "Запыт",
   "account.followers": "Падпісчыкі",
   "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
   "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Допісы і адказы",
   "account.remove_from_followers": "Выдаліць {name} з падпісчыкаў",
   "account.report": "Паскардзіцца на @{name}",
-  "account.requested": "Чакаецца ўхваленне. Націсніце, каб скасаваць запыт на падпіску",
   "account.requested_follow": "{name} адправіў(-ла) запыт на падпіску",
   "account.requests_to_follow_you": "Хоча падпісацца на вас",
   "account.share": "Абагуліць профіль @{name}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b148994b55..259d6e71e0 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Публ. и отговори",
   "account.remove_from_followers": "Премахване на {name} от последователи",
   "account.report": "Докладване на @{name}",
-  "account.requested": "Чака се одобрение. Щракнете за отмяна на заявката за последване",
   "account.requested_follow": "{name} поиска да ви последва",
   "account.requests_to_follow_you": "Заявки да ви последват",
   "account.share": "Споделяне на профила на @{name}",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 4caa8bc395..e6c4ae0e7d 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -53,7 +53,6 @@
   "account.posts": "পোষ্টসমূহ",
   "account.posts_with_replies": "টুট এবং মতামত",
   "account.report": "@{name} কে রিপোর্ট করুন",
-  "account.requested": "অনুমতির অপেক্ষা। অনুসরণ করার অনুরোধ বাতিল করতে এখানে ক্লিক করুন",
   "account.requested_follow": "{name} আপনাকে অনুসরণ করার জন্য অনুরোধ করেছে",
   "account.share": "@{name} র প্রোফাইল অন্যদের দেখান",
   "account.show_reblogs": "@{name} র সমর্থনগুলো দেখান",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 5a4828daf5..b3e9d22027 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -68,7 +68,6 @@
   "account.posts_with_replies": "Embannadurioù ha respontoù",
   "account.remove_from_followers": "Dilemel {name} eus an heulierien·ezed",
   "account.report": "Disklêriañ @{name}",
-  "account.requested": "O c'hortoz an asant. Klikit evit nullañ ar goulenn heuliañ",
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
   "account.requests_to_follow_you": "Rekedoù d'ho heuliañ",
   "account.share": "Skignañ profil @{name}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index ee6e5050a8..712adc59bb 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Tuts i respostes",
   "account.remove_from_followers": "Elimina {name} dels seguidors",
   "account.report": "Informa sobre @{name}",
-  "account.requested": "S'espera l'aprovació. Clica per a cancel·lar la petició de seguiment",
   "account.requested_follow": "{name} ha demanat de seguir-te",
   "account.requests_to_follow_you": "Peticions de seguir-vos",
   "account.share": "Comparteix el perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 0188b67e27..00e9462569 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -52,7 +52,6 @@
   "account.posts": "نووسراوەکان",
   "account.posts_with_replies": "توتس و وەڵامەکان",
   "account.report": "گوزارشت @{name}",
-  "account.requested": "چاوەڕێی ڕەزامەندین. کرتە بکە بۆ هەڵوەشاندنەوەی داواکاری شوێنکەوتن",
   "account.requested_follow": "{name} داوای کردووە شوێنت بکەوێت",
   "account.share": "پرۆفایلی @{name} هاوبەش بکە",
   "account.show_reblogs": "پیشاندانی بەرزکردنەوەکان لە @{name}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 7a0306bc31..c8df1d444c 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -24,7 +24,6 @@
   "account.posts": "Statuti",
   "account.posts_with_replies": "Statuti è risposte",
   "account.report": "Palisà @{name}",
-  "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
   "account.share": "Sparte u prufile di @{name}",
   "account.show_reblogs": "Vede spartere da @{name}",
   "account.unblock": "Sbluccà @{name}",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index d972d4705b..5ec5fa7bb5 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
   "account.domain_blocking": "Blokované domény",
   "account.edit_profile": "Upravit profil",
+  "account.edit_profile_short": "Upravit",
   "account.enable_notifications": "Oznamovat mi příspěvky @{name}",
   "account.endorse": "Zvýraznit na profilu",
   "account.familiar_followers_many": "Sleduje je {name1}, {name2} a {othersCount, plural, one {jeden další, které znáte} few {# další, které znáte} many {# dalších, které znáte} other {# dalších, které znáte}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Žádné příspěvky",
   "account.follow": "Sledovat",
   "account.follow_back": "Také sledovat",
+  "account.follow_back_short": "Také sledovat",
+  "account.follow_request": "Požádat o sledování",
+  "account.follow_request_cancel": "Zrušit požadavek",
+  "account.follow_request_cancel_short": "Zrušit",
+  "account.follow_request_short": "Požádat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
   "account.followers_counter": "{count, plural, one {{counter} sledující} few {{counter} sledující} many {{counter} sledujících} other {{counter} sledujících}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Příspěvky a odpovědi",
   "account.remove_from_followers": "Odebrat {name} ze sledujících",
   "account.report": "Nahlásit @{name}",
-  "account.requested": "Čeká na schválení. Kliknutím žádost o sledování zrušíte",
   "account.requested_follow": "{name} tě požádal o sledování",
   "account.requests_to_follow_you": "Žádosti o sledování",
   "account.share": "Sdílet profil @{name}",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 851ec1d559..941bc016c9 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
   "account.domain_blocking": "Parthau'n cael eu rhwystro",
   "account.edit_profile": "Golygu'r proffil",
+  "account.edit_profile_short": "Golygu",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
   "account.familiar_followers_many": "Yn cael ei ddilyn gan {name1},{name2}, a {othersCount, plural, one {one other you know} other{# others you know}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Dim postiadau",
   "account.follow": "Dilyn",
   "account.follow_back": "Dilyn nôl",
+  "account.follow_back_short": "Dilyn nôl",
+  "account.follow_request": "Cais i ddilyn",
+  "account.follow_request_cancel": "Diddymu cais",
+  "account.follow_request_cancel_short": "Diddymu",
+  "account.follow_request_short": "Gofyn",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwr}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postiadau ac ymatebion",
   "account.remove_from_followers": "Tynnu {name} o'ch dilynwyr",
   "account.report": "Adrodd @{name}",
-  "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.requests_to_follow_you": "Ceisiadau i'ch dilyn",
   "account.share": "Rhannu proffil @{name}",
@@ -865,6 +870,13 @@
   "status.cannot_quote": "Does dim caniatâd i chi ddyfynnu'r postiad hwn",
   "status.cannot_reblog": "Does dim modd hybu'r postiad hwn",
   "status.contains_quote": "Yn cynnwys dyfyniad",
+  "status.context.loading": "Yn llwytho mwy o atebion",
+  "status.context.loading_error": "Wedi methu llwytho atebion newydd",
+  "status.context.loading_more": "Yn llwytho mwy o atebion",
+  "status.context.loading_success": "Wedi llwytho'r holl atebion",
+  "status.context.more_replies_found": "Mwy o atebion wedi'u canfod",
+  "status.context.retry": "Ceisio eto",
+  "status.context.show": "Dangos",
   "status.continued_thread": "Edefyn parhaus",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index b22190881f..0180e2bf7e 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Giv mig ikke længere en notifikation, når @{name} laver indlæg",
   "account.domain_blocking": "Blokerer domæne",
   "account.edit_profile": "Redigér profil",
+  "account.edit_profile_short": "Redigér",
   "account.enable_notifications": "Giv mig besked, når @{name} laver indlæg",
   "account.endorse": "Fremhæv på profil",
   "account.familiar_followers_many": "Følges af {name1}, {name2} og {othersCount, plural, one {# mere, man kender} other {# mere, du kender}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Ingen indlæg",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbage",
+  "account.follow_back_short": "Følg tilbage",
+  "account.follow_request": "Anmod om at følge",
+  "account.follow_request_cancel": "Annuller anmodning",
+  "account.follow_request_cancel_short": "Annullér",
+  "account.follow_request_short": "Anmod",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Indlæg og svar",
   "account.remove_from_followers": "Fjern {name} fra følgere",
   "account.report": "Anmeld @{name}",
-  "account.requested": "Afventer godkendelse. Tryk for at annullere følgeanmodning",
   "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.requests_to_follow_you": "Anmodninger om at følge dig",
   "account.share": "Del @{name}s profil",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index e756b6bab6..80c3820508 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
   "account.domain_blocking": "Domain blockiert",
   "account.edit_profile": "Profil bearbeiten",
+  "account.edit_profile_short": "Bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
   "account.endorse": "Im Profil vorstellen",
   "account.familiar_followers_many": "Gefolgt von {name1}, {name2} und {othersCount, plural, one {einem weiteren Profil, das dir bekannt ist} other {# weiteren Profilen, die dir bekannt sind}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Keine Beiträge",
   "account.follow": "Folgen",
   "account.follow_back": "Ebenfalls folgen",
+  "account.follow_back_short": "Ebenfalls folgen",
+  "account.follow_request": "Anfrage zum Folgen",
+  "account.follow_request_cancel": "Anfrage zurückziehen",
+  "account.follow_request_cancel_short": "Abbrechen",
+  "account.follow_request_short": "Anfragen",
   "account.followers": "Follower",
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Beiträge und Antworten",
   "account.remove_from_followers": "{name} als Follower entfernen",
   "account.report": "@{name} melden",
-  "account.requested": "Die Genehmigung steht noch aus. Klicke hier, um die Follower-Anfrage zurückzuziehen",
   "account.requested_follow": "{name} möchte dir folgen",
   "account.requests_to_follow_you": "Möchte dir folgen",
   "account.share": "Profil von @{name} teilen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 9b5479feeb..f52a480c90 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Σταμάτα να με ειδοποιείς όταν δημοσιεύει ο @{name}",
   "account.domain_blocking": "Αποκλείεται ο τομέας",
   "account.edit_profile": "Επεξεργασία προφίλ",
+  "account.edit_profile_short": "Επεξεργασία",
   "account.enable_notifications": "Ειδοποίησέ με όταν δημοσιεύει ο @{name}",
   "account.endorse": "Προβολή στο προφίλ",
   "account.familiar_followers_many": "Ακολουθείται από {name1}, {name2}, και {othersCount, plural, one {ένας ακόμα που ξέρεις} other {# ακόμα που ξέρεις}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Καμία ανάρτηση",
   "account.follow": "Ακολούθησε",
   "account.follow_back": "Ακολούθησε και εσύ",
+  "account.follow_back_short": "Ακολούθησε και εσύ",
+  "account.follow_request": "Αίτημα για ακολούθηση",
+  "account.follow_request_cancel": "Ακύρωση αιτήματος",
+  "account.follow_request_cancel_short": "Ακύρωση",
+  "account.follow_request_short": "Αίτημα",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.",
   "account.followers_counter": "{count, plural, one {{counter} ακόλουθος} other {{counter} ακόλουθοι}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Τουτ και απαντήσεις",
   "account.remove_from_followers": "Κατάργηση {name} από τους ακόλουθους",
   "account.report": "Κατάγγειλε @{name}",
-  "account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα παρακολούθησης",
   "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει",
   "account.requests_to_follow_you": "Αιτήματα για να σε ακολουθήσουν",
   "account.share": "Κοινοποίηση του προφίλ @{name}",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 60f4e0d8f9..bea3c988af 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Posts and replies",
   "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.requested_follow": "{name} has requested to follow you",
   "account.requests_to_follow_you": "Requests to follow you",
   "account.share": "Share @{name}'s profile",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index c1d650e3a1..a1f2185528 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -69,7 +69,6 @@
   "account.posts_with_replies": "Afiŝoj kaj respondoj",
   "account.remove_from_followers": "Forigi {name}-n de sekvantoj",
   "account.report": "Raporti @{name}",
-  "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
   "account.requested_follow": "{name} petis sekvi vin",
   "account.requests_to_follow_you": "Petoj sekvi vin",
   "account.share": "Diskonigi la profilon de @{name}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 3bd5172e13..8f49351a91 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
   "account.domain_blocking": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} envíe mensajes",
   "account.endorse": "Destacar en el perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural, one {# cuenta más que conocés} other {# cuentas más que conocés}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin mensajes",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir",
+  "account.follow_back_short": "Seguir",
+  "account.follow_request": "Solicitud para seguir",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Mnsjs y resp. públicas",
   "account.remove_from_followers": "Quitar a {name} de tus seguidores",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} solicitó seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 9c37456a3e..d06d67c4d8 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural,one {# más que conoces}other {# más que conoces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
+  "account.follow_back_short": "Seguir también",
+  "account.follow_request": "Solicitud de seguimiento",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nadie sigue a este usuario todavía.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.remove_from_followers": "Eliminar {name} de tus seguidores",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 67eda71cf9..9d1f34c91b 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en el perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural,one {# más que conoces}other {# más que conoces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
+  "account.follow_back_short": "Seguir también",
+  "account.follow_request": "Solicitud de seguimiento",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.remove_from_followers": "Eliminar {name} de tus seguidores",
   "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index b6e02a0ba6..1811f7b939 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
   "account.domain_blocking": "Blokeeritud domeen",
   "account.edit_profile": "Muuda profiili",
+  "account.edit_profile_short": "Muuda",
   "account.enable_notifications": "Teavita mind @{name} postitustest",
   "account.endorse": "Too profiilil esile",
   "account.familiar_followers_many": "Jälgijateks {name1}, {name2} ja veel {othersCount, plural, one {üks kasutaja, keda tead} other {# kasutajat, keda tead}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Postitusi pole",
   "account.follow": "Jälgi",
   "account.follow_back": "Jälgi vastu",
+  "account.follow_back_short": "Jälgi vastu",
+  "account.follow_request": "Jälgimispäring",
+  "account.follow_request_cancel": "Tühista päring",
+  "account.follow_request_cancel_short": "Katkesta",
+  "account.follow_request_short": "Koosta päring",
   "account.followers": "Jälgijad",
   "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.",
   "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postitused ja vastused",
   "account.remove_from_followers": "Eemalda {name} jälgijate seast",
   "account.report": "Raporteeri @{name}",
-  "account.requested": "Ootab kinnitust. Klõpsa jälgimise soovi tühistamiseks",
   "account.requested_follow": "{name} on taodelnud sinu jälgimist",
   "account.requests_to_follow_you": "soovib sind jälgida",
   "account.share": "Jaga @{name} profiili",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 579701a525..f4101a5ba0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Bidalketak eta erantzunak",
   "account.remove_from_followers": "Kendu {name} zure jarraitzaileengandik",
   "account.report": "Salatu @{name}",
-  "account.requested": "Onarpenaren zain. Egin klik jarraipen-eskaera ezeztatzeko",
   "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du",
   "account.requests_to_follow_you": "Zu jarraitzeko eskaera egin du",
   "account.share": "Partekatu @{name} erabiltzailearen profila",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 64e3ec83d1..91afee6e24 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "فرسته‌ها و پاسخ‌ها",
   "account.remove_from_followers": "برداشتن {name} از پی‌گیران",
   "account.report": "گزارش ‎@{name}",
-  "account.requested": "منتظر پذیرش است. برای لغو درخواست پی‌گیری کلیک کنید",
   "account.requested_follow": "{name} درخواست پی‌گیریتان را داد",
   "account.requests_to_follow_you": "درخواست پی‌گیریتان را دارد",
   "account.share": "هم‌رسانی نمایهٔ ‎@{name}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index aad79c9fe9..553727da95 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} julkaisee",
   "account.domain_blocking": "Verkkotunnus estetty",
   "account.edit_profile": "Muokkaa profiilia",
+  "account.edit_profile_short": "Muokkaa",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
   "account.endorse": "Suosittele profiilissa",
   "account.familiar_followers_many": "Seuraajina {name1}, {name2} ja {othersCount, plural, one {1 muu, jonka tunnet} other {# muuta, jotka tunnet}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Ei julkaisuja",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
+  "account.follow_back_short": "Seuraa takaisin",
+  "account.follow_request": "Pyydä lupaa seurata",
+  "account.follow_request_cancel": "Peruuta pyyntö",
+  "account.follow_request_cancel_short": "Peruuta",
+  "account.follow_request_short": "Pyyntö",
   "account.followers": "Seuraajat",
   "account.followers.empty": "Kukaan ei seuraa tätä käyttäjää vielä.",
   "account.followers_counter": "{count, plural, one {{counter} seuraaja} other {{counter} seuraajaa}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Julkaisut ja vastaukset",
   "account.remove_from_followers": "Poista {name} seuraajista",
   "account.report": "Raportoi @{name}",
-  "account.requested": "Odottaa hyväksyntää. Peruuta seurantapyyntö napsauttamalla",
   "account.requested_follow": "{name} on pyytänyt lupaa seurata sinua",
   "account.requests_to_follow_you": "Pyynnöt seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index f8425dd8ef..37db5a1b15 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -60,7 +60,6 @@
   "account.open_original_page": "Buksan ang pinagmulang pahina",
   "account.posts": "Mga post",
   "account.report": "I-ulat si/ang @{name}",
-  "account.requested": "Naghihintay ng pag-apruba. I-click upang ikansela ang hiling sa pagsunod",
   "account.requested_follow": "Hinihiling ni {name} na sundan ka",
   "account.share": "Ibahagi ang profile ni @{name}",
   "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 938db30d7a..7b956dc38a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Ikki boða mær frá, tá @{name} skrivar",
   "account.domain_blocking": "Banni økisnavn",
   "account.edit_profile": "Broyt vanga",
+  "account.edit_profile_short": "Rætta",
   "account.enable_notifications": "Boða mær frá, tá @{name} skrivar",
   "account.endorse": "Víst á vangamyndini",
   "account.familiar_followers_many": "{name1}, {name2} og {othersCount, plural, one {ein annar/onnur tú kennir} other {# onnur tú kennir}} fylgja",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Einki uppslag",
   "account.follow": "Fylg",
   "account.follow_back": "Fylg aftur",
+  "account.follow_back_short": "Fylg aftur",
+  "account.follow_request": "Umbønir um at fylgja tær",
+  "account.follow_request_cancel": "Strika víðaribeining",
+  "account.follow_request_cancel_short": "Ógilda",
+  "account.follow_request_short": "Áheitan",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ongar fylgjarar enn.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjari} other {{counter} fylgjarar}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Uppsløg og svar",
   "account.remove_from_followers": "Strika {name} av fylgjaralista",
   "account.report": "Melda @{name}",
-  "account.requested": "Bíðar eftir góðkenning. Trýst fyri at angra umbønina",
   "account.requested_follow": "{name} hevur biðið um at fylgja tær",
   "account.requests_to_follow_you": "Umbønir um at fylgja tær",
   "account.share": "Deil vanga @{name}'s",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 742d502fd5..81ea95a974 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Publications et réponses",
   "account.remove_from_followers": "Retirer {name} des suiveurs",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.requests_to_follow_you": "Demande a vous suivre",
   "account.share": "Partager le profil de @{name}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 38a1215fd4..4ecfcfab7f 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Messages et réponses",
   "account.remove_from_followers": "Retirer {name} des suiveurs",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.requests_to_follow_you": "Demande a vous suivre",
   "account.share": "Partager le profil de @{name}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index d0da2af6bb..cb68231583 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Berjochten en reaksjes",
   "account.remove_from_followers": "{name} as folger fuortsmite",
   "account.report": "@{name} rapportearje",
-  "account.requested": "Wacht op goedkarring. Klik om it folchfersyk te annulearjen",
   "account.requested_follow": "{name} hat dy in folchfersyk stjoerd",
   "account.requests_to_follow_you": "Fersiken om jo te folgjen",
   "account.share": "Profyl fan @{name} diele",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 88d03ea43c..5a25ef9f47 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
   "account.domain_blocking": "Fearann a bhlocáil",
   "account.edit_profile": "Cuir an phróifíl in eagar",
+  "account.edit_profile_short": "Cuir in Eagar",
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
   "account.familiar_followers_many": "Ina dhiaidh sin ag {name1}, {name2}, agus {othersCount, plural, \n    one {duine eile atá aithnid duit} \n    two {# duine eile atá aithnid duit} \n    few {# dhuine eile atá aithnid duit} \n    many {# nduine eile atá aithnid duit} \n    other {# duine eile atá aithnid duit}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Gan aon phoist",
   "account.follow": "Lean",
   "account.follow_back": "Leanúint ar ais",
+  "account.follow_back_short": "Lean ar ais",
+  "account.follow_request": "Iarratas chun leanúint",
+  "account.follow_request_cancel": "Cealaigh an t-iarratas",
+  "account.follow_request_cancel_short": "Cealaigh",
+  "account.follow_request_short": "Iarratas",
   "account.followers": "Leantóirí",
   "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
   "account.followers_counter": "{count, plural, one {{counter} leantóir} other {{counter} leantóirí}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postálacha agus freagraí",
   "account.remove_from_followers": "Bain {name} de na leantóirí",
   "account.report": "Tuairiscigh @{name}",
-  "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
   "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint",
   "account.requests_to_follow_you": "Iarratais chun tú a leanúint",
   "account.share": "Roinn próifíl @{name}",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 0b582c6fda..4c3ab7d2a5 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Postaichean ’s freagairtean",
   "account.remove_from_followers": "Thoir {name} air falbh on luchd-leantainn",
   "account.report": "Dèan gearan mu @{name}",
-  "account.requested": "A’ feitheamh air aontachadh. Briog airson sgur dhen iarrtas leantainn",
   "account.requested_follow": "Dh’iarr {name} ’gad leantainn",
   "account.requests_to_follow_you": "Iarrtasan leantainn",
   "account.share": "Co-roinn a’ phròifil aig @{name}",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c724e3d9cf..3f20dfb82d 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
   "account.domain_blocking": "Bloqueo do dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
   "account.familiar_followers_many": "Seguida por {name1}, {name2}, e {othersCount, plural, one {outra conta que coñeces} other {outras # contas que coñeces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sen publicacións",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir tamén",
+  "account.follow_back_short": "Seguir tamén",
+  "account.follow_request": "Solicitar seguir",
+  "account.follow_request_cancel": "Desbotar a petición",
+  "account.follow_request_cancel_short": "Desbotar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
   "account.followers_counter": "{count, plural, one {{counter} seguidora} other {{counter} seguidoras}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicacións e respostas",
   "account.remove_from_followers": "Retirar a {name} das seguidoras",
   "account.report": "Informar sobre @{name}",
-  "account.requested": "Agardando aprobación. Preme para desbotar a solicitude",
   "account.requested_follow": "{name} solicitou seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir o perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 6adcc4b406..e7839cdea5 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
   "account.domain_blocking": "רשימת השרתים החסומים",
   "account.edit_profile": "עריכת פרופיל",
+  "account.edit_profile_short": "עריכה",
   "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
   "account.endorse": "קדם את החשבון בפרופיל",
   "account.familiar_followers_many": "החשבון נעקב על ידי {name1}, {name2} ועוד {othersCount, plural,one {אחד נוסף שמוכר לך}other {# נוספים שמוכרים לך}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "אין חצרוצים",
   "account.follow": "לעקוב",
   "account.follow_back": "לעקוב בחזרה",
+  "account.follow_back_short": "לעקוב בחזרה",
+  "account.follow_request": "בקשה לעקוב אחרי",
+  "account.follow_request_cancel": "ביטול בקשה",
+  "account.follow_request_cancel_short": "ביטול",
+  "account.follow_request_short": "בקשה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "הודעות ותגובות",
   "account.remove_from_followers": "הסרת {name} מעוקבי",
   "account.report": "דווח על @{name}",
-  "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
   "account.requests_to_follow_you": "ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index ca56ad484e..bc71c80068 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -52,7 +52,6 @@
   "account.posts": "टूट्स",
   "account.posts_with_replies": "टूट्स एवं जवाब",
   "account.report": "रिपोर्ट @{name}",
-  "account.requested": "मंजूरी का इंतजार। फॉलो रिक्वेस्ट को रद्द करने के लिए क्लिक करें",
   "account.requested_follow": "{name} ने आपको फॉलो करने के लिए अनुरोध किया है",
   "account.share": "@{name} की प्रोफाइल शेयर करे",
   "account.show_reblogs": "@{name} के बूस्ट दिखाए",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index cb3f25de06..0cde3da84b 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -51,7 +51,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekanje na potvrdu. Kliknite za poništavanje zahtjeva za praćenje",
   "account.requested_follow": "{name} zatražio/la je praćenje",
   "account.share": "Podijeli profil @{name}",
   "account.show_reblogs": "Prikaži boostove od @{name}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 80693f586e..1d3764e8e8 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Bejegyzések és válaszok",
   "account.remove_from_followers": "{name} eltávolítása a követők közül",
   "account.report": "@{name} jelentése",
-  "account.requested": "Jóváhagyásra vár. Kattints a követési kérés visszavonásához",
   "account.requested_follow": "{name} kérte, hogy követhessen",
   "account.requests_to_follow_you": "Kéri, hogy követhessen",
   "account.share": "@{name} profiljának megosztása",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 62669eda9b..bd9fd71c23 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -43,7 +43,6 @@
   "account.posts": "Գրառումներ",
   "account.posts_with_replies": "Գրառումներ եւ պատասխաններ",
   "account.report": "Բողոքել @{name}֊ի մասին",
-  "account.requested": "Հաստատման կարիք ունի։ Սեղմիր՝ հետեւելու հայցը չեղարկելու համար։",
   "account.requested_follow": "{name}-ը ցանկանում է հետեւել քեզ",
   "account.share": "Կիսուել @{name}֊ի էջով",
   "account.show_reblogs": "Ցուցադրել @{name}֊ի տարածածները",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9b3c8f8ed4..f9325b623c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Non plus notificar me quando @{name} publica",
   "account.domain_blocking": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
+  "account.edit_profile_short": "Modificar",
   "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
   "account.familiar_followers_many": "Sequite per {name1}, {name2}, e {othersCount, plural, one {un altere que tu cognosce} other {# alteres que tu cognosce}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Necun message",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer in retorno",
+  "account.follow_back_short": "Sequer in retorno",
+  "account.follow_request": "Requestar de sequer",
+  "account.follow_request_cancel": "Cancellar requesta",
+  "account.follow_request_cancel_short": "Cancellar",
+  "account.follow_request_short": "Requesta",
   "account.followers": "Sequitores",
   "account.followers.empty": "Necuno seque ancora iste usator.",
   "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Messages e responsas",
   "account.remove_from_followers": "Remover {name} del sequitores",
   "account.report": "Reportar @{name}",
-  "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
   "account.requests_to_follow_you": "Requestas de sequer te",
   "account.share": "Compartir profilo de @{name}",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 7c5c816c67..253a9d93c4 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -64,7 +64,6 @@
   "account.posts": "Kiriman",
   "account.posts_with_replies": "Kiriman dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
   "account.requested_follow": "{name} ingin mengikuti Anda",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 4a464ef16e..bbb85ee2ad 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -52,7 +52,6 @@
   "account.posts": "Postas",
   "account.posts_with_replies": "Postas e replicas",
   "account.report": "Raportar @{name}",
-  "account.requested": "Atendent aprobation. Cliccar por anullar li petition de sequer",
   "account.requested_follow": "{name} ha petit sequer te",
   "account.share": "Distribuer li profil de @{name}",
   "account.show_reblogs": "Monstrar boosts de @{name}",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index b51d32d05a..15c10af863 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -55,7 +55,6 @@
   "account.posts": "Mesaji",
   "account.posts_with_replies": "Afishi e respondi",
   "account.report": "Denuncar @{name}",
-  "account.requested": "Vartante aprobo",
   "account.requested_follow": "{name} demandis sequar tu",
   "account.share": "Partigez profilo di @{name}",
   "account.show_reblogs": "Montrez repeti de @{name}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 92bae01531..012b3c313e 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Hætta að láta mig vita þegar @{name} sendir inn",
   "account.domain_blocking": "Útiloka lén",
   "account.edit_profile": "Breyta notandasniði",
+  "account.edit_profile_short": "Breyta",
   "account.enable_notifications": "Láta mig vita þegar @{name} sendir inn",
   "account.endorse": "Birta á notandasniði",
   "account.familiar_followers_many": "Fylgt af {name1}, {name2} og {othersCount, plural, one {einum öðrum sem þú þekkir} other {# öðrum sem þú þekkir}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Engar færslur",
   "account.follow": "Fylgjast með",
   "account.follow_back": "Fylgjast með til baka",
+  "account.follow_back_short": "Fylgjast með til baka",
+  "account.follow_request": "Beiðni um að fylgjast með",
+  "account.follow_request_cancel": "Hætta við beiðni",
+  "account.follow_request_cancel_short": "Hætta við",
+  "account.follow_request_short": "Beiðni",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
   "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Færslur og svör",
   "account.remove_from_followers": "Fjarlægja {name} úr fylgjendum",
   "account.report": "Kæra @{name}",
-  "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
   "account.requested_follow": "{name} hefur beðið um að fylgjast með þér",
   "account.requests_to_follow_you": "Bað um að fylgjast með þér",
   "account.share": "Deila notandasniði fyrir @{name}",
@@ -864,6 +869,14 @@
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
   "status.cannot_quote": "Þú hefur ekki heimild til að vitna í þessa færslu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
+  "status.contains_quote": "Inniheldur tilvitnun",
+  "status.context.loading": "Hleð inn fleiri svörum",
+  "status.context.loading_error": "Gat ekki hlaðið inn nýjum svörum",
+  "status.context.loading_more": "Hleð inn fleiri svörum",
+  "status.context.loading_success": "Öllum svörum hlaðið inn",
+  "status.context.more_replies_found": "Fleiri svör fundust",
+  "status.context.retry": "Reyna aftur",
+  "status.context.show": "Sýna",
   "status.continued_thread": "Hélt samtali áfram",
   "status.copy": "Afrita tengil í færslu",
   "status.delete": "Eyða",
@@ -893,12 +906,15 @@
   "status.quote": "Tilvitnun",
   "status.quote.cancel": "Hætta við tilvitnun",
   "status.quote_error.filtered": "Falið vegna einnar síu sem er virk",
+  "status.quote_error.limited_account_hint.action": "Birta samt",
+  "status.quote_error.limited_account_hint.title": "Þessi notandaaðgangur hefur verið falinn af stjórnendum á {domain}.",
   "status.quote_error.not_available": "Færsla ekki tiltæk",
   "status.quote_error.pending_approval": "Færsla í bið",
   "status.quote_error.pending_approval_popout.body": "Á Mastodon geturðu stjórnað því hvort aðrir geti vitnað í þig. Þessi færsla bíður eftir samþykki upprunalegs höfundar.",
   "status.quote_error.revoked": "Færsla fjarlægð af höfundi",
   "status.quote_followers_only": "Einungis fylgjendur geta vitnað í þessa færslu",
   "status.quote_manual_review": "Höfundur mun yfirfara handvirkt",
+  "status.quote_noun": "Tilvitnun",
   "status.quote_policy_change": "Breyttu því hver getur tilvitnað",
   "status.quote_post_author": "Vitnaði í færslu frá @{name}",
   "status.quote_private": "Ekki er hægt að vitna í einkafærslur",
@@ -990,7 +1006,7 @@
   "visibility_modal.helper.privacy_private_self_quote": "Tilvitnanir í sjálfan sig úr einkaspjallfærslum er ekki hægt að gera opinberar.",
   "visibility_modal.helper.private_quoting": "Ekki er hægt að vitna í færslur einungis til fylgjenda sem skrifaðar eru á Mastodon.",
   "visibility_modal.helper.unlisted_quoting": "Þegar fólk vitnar í þig verða færslurnar þeirr einnig faldar á vinsældatímalínum.",
-  "visibility_modal.instructions": ". Stýrðu því hverjir geta átt við þessa færslu. Þú getur líka ákvarðað stillingar fyrir allar færslur í framtíðinni með því að fara í <link>Kjörstillingar > Sjálfgefin gildi við gerð færslna</link>.",
+  "visibility_modal.instructions": "Stýrðu því hverjir geta átt við þessa færslu. Þú getur líka ákvarðað stillingar fyrir allar færslur í framtíðinni með því að fara í <link>Kjörstillingar > Sjálfgefin gildi við gerð færslna</link>.",
   "visibility_modal.privacy_label": "Sýnileiki",
   "visibility_modal.quote_followers": "Einungis fylgjendur",
   "visibility_modal.quote_label": "Hverjir geta gert tilvitnanir",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 3dde3f5775..aa5f47a4c1 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Post e risposte",
   "account.remove_from_followers": "Rimuovi {name} dai seguaci",
   "account.report": "Segnala @{name}",
-  "account.requested": "In attesa d'approvazione. Clicca per annullare la richiesta di seguire",
   "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.requests_to_follow_you": "Richieste di seguirti",
   "account.share": "Condividi il profilo di @{name}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 22377dc786..6acfbac133 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "投稿と返信",
   "account.remove_from_followers": "{name}さんをフォロワーから削除",
   "account.report": "@{name}さんを通報",
-  "account.requested": "フォロー承認待ちです。クリックしてキャンセル",
   "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
   "account.requests_to_follow_you": "フォローリクエスト",
   "account.share": "@{name}さんのプロフィールを共有する",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index ea7375fd00..a6a3758a0b 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -21,7 +21,6 @@
   "account.posts": "პოსტები",
   "account.posts_with_replies": "ტუტები და პასუხები",
   "account.report": "დაარეპორტე @{name}",
-  "account.requested": "დამტკიცების მოლოდინში. დააწკაპუნეთ რომ უარყოთ დადევნების მოთხონვა",
   "account.share": "გააზიარე @{name}-ის პროფილი",
   "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან",
   "account.unblock": "განბლოკე @{name}",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index f14f3b5c70..d508320d3b 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -63,7 +63,6 @@
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.remove_from_followers": "Kkes {name} seg ineḍfaren",
   "account.report": "Cetki ɣef @{name}",
-  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
   "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
@@ -267,6 +266,7 @@
   "explore.trending_links": "Isallen",
   "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
+  "featured_carousel.header": "{count, plural, one {n tsuffeɣt tunṭiḍt} other {n tsuffaɣ tunṭiḍin}}",
   "featured_carousel.next": "Uḍfiṛ",
   "featured_carousel.post": "Tasuffeɣt",
   "featured_carousel.previous": "Uzwir",
@@ -352,6 +352,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+  "keyboard_shortcuts.favourite": "Smenyef tassuɣeft",
   "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
@@ -364,8 +365,9 @@
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaɣnu-ik",
   "keyboard_shortcuts.notifications": "Ad d-yeldi ajgu n yilɣa",
   "keyboard_shortcuts.open_media": "i tiɣwalin yeldin",
-  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tjewwiqin yettwasentḍen",
+  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tsuffaɣ tunṭiḍin",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaɣnu n umeskar",
+  "keyboard_shortcuts.quote": "Tanebdurt n tsuffeɣt",
   "keyboard_shortcuts.reply": "i tririt",
   "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
   "keyboard_shortcuts.search": "to focus search",
@@ -444,6 +446,7 @@
   "navigation_bar.privacy_and_reach": "Tabḍnit akked wagwaḍ",
   "navigation_bar.search": "Nadi",
   "navigation_bar.search_trends": "Anadi / Anezzuɣ",
+  "navigation_panel.collapse_lists": "Sneḍfes umuɣ n tebdart",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "Yemla-t-id {name} {target}",
   "notification.admin.sign_up": "Ijerred {name}",
@@ -464,6 +467,7 @@
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
+  "notification.reblog.name_and_others_with_link": "{name} akked <a>{count, plural, one {# nnayeḍ} other {# nniḍen}}</a> zzuzren tasuffeɣt-ik·im",
   "notification.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
@@ -555,6 +559,8 @@
   "regeneration_indicator.please_stand_by": "Ttxil rǧu.",
   "regeneration_indicator.preparing_your_home_feed": "Ha-tt-an tsuddemt-ik·im tagejdant tettwaheggay…",
   "relative_time.days": "{number}u",
+  "relative_time.full.days": "{number, plural, one {# n wass} other {# n wussan}} aya",
+  "relative_time.full.hours": "{number, plural, one {# n usrag} other {# n yesragen}} aya",
   "relative_time.full.just_now": "tura kan",
   "relative_time.hours": "{number}isr",
   "relative_time.just_now": "tura",
@@ -562,6 +568,7 @@
   "relative_time.seconds": "{number}tas",
   "relative_time.today": "ass-a",
   "remove_quote_hint.button_label": "Gziɣ-t",
+  "remove_quote_hint.title": "D tidet, tebɣiḍ ad tekkseḍ tasuffeɣt-inek·inem i d-yettwabedren?",
   "reply_indicator.attachments": "{count, plural, one {# n umedday} other {# n imeddayen}}",
   "reply_indicator.cancel": "Sefsex",
   "reply_indicator.poll": "Afmiḍi",
@@ -630,6 +637,7 @@
   "search_results.title": "Igemmaḍ n unadi ɣef \"{q}\"",
   "server_banner.active_users": "iseqdacen urmiden",
   "server_banner.administered_by": "Yettwadbel sɣur :",
+  "server_banner.is_one_of_many": "{domain} d yiwen seg seg waṭṭas n iqeddacen imzurag n Mastodon i tzemreḍ ad tsqesdceḍ i wakken ad tettekkiḍ deg fediverse.",
   "server_banner.server_stats": "Tidaddanin n uqeddac:",
   "sign_in_banner.create_account": "Snulfu-d amiḍan",
   "sign_in_banner.sign_in": "Qqen",
@@ -639,6 +647,8 @@
   "status.bookmark": "Creḍ",
   "status.cancel_reblog_private": "Sefsex beṭṭu",
   "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
+  "status.context.retry": "Ɛreḍ tikkelt nniḍen",
+  "status.context.show": "Sken-d",
   "status.continued_thread": "Asqerdec yettkemmil",
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
@@ -667,7 +677,10 @@
   "status.quote": "Tanebdurt",
   "status.quote.cancel": "Semmet tanebdurt",
   "status.quote_error.limited_account_hint.action": "Sken-d akken ibɣu yili",
+  "status.quote_error.not_available": "Tasuffeɣt-a ulac-itt",
   "status.quote_error.revoked": "Tasuffeɣt-a yekkes-itt umeskar-is",
+  "status.quote_noun": "Tanebdurt",
+  "status.quote_policy_change": "Snifel anwa i izemren ad d-yebder",
   "status.quote_post_author": "Yebder-d tasuffeɣt sɣur @{name}",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index b04790d9a1..c549bddd3f 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -65,7 +65,6 @@
   "account.posts_with_replies": "Постар мен жауаптар",
   "account.remove_from_followers": "{name} жазылушылардан жою",
   "account.report": "Шағымдану @{name}",
-  "account.requested": "Растауын күтіңіз. Жазылудан бас тарту үшін басыңыз",
   "account.requested_follow": "{name} сізге жазылуға сұраныс жіберді",
   "account.requests_to_follow_you": "Сізге жазылу сұраныстары",
   "account.share": "@{name} профилін бөлісу\"",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index ae4e4dd7b3..1d383c6b27 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -13,7 +13,6 @@
   "account.followers": "ಹಿಂಬಾಲಕರು",
   "account.posts": "ಟೂಟ್‌ಗಳು",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account.unblock_domain": "Unhide {domain}",
   "account_note.placeholder": "Click to add a note",
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 89137643f3..0a20036907 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "게시물과 답장",
   "account.remove_from_followers": "팔로워에서 {name} 제거",
   "account.report": "@{name} 신고",
-  "account.requested": "승인 대기 중. 클릭해서 취소하기",
   "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.requests_to_follow_you": "팔로우 요청",
   "account.share": "@{name}의 프로필 공유",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 3518959e2b..a6a9a8f1e0 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -58,7 +58,6 @@
   "account.posts": "Şandî",
   "account.posts_with_replies": "Şandî û bersiv",
   "account.report": "@{name} ragihîne",
-  "account.requested": "Li benda erêkirinê ye. Ji bo betal kirina daxwazê pêl bikin",
   "account.requested_follow": "{name} dixwaze te bişopîne",
   "account.share": "Profîla @{name} parve bike",
   "account.show_reblogs": "Bilindkirinên ji @{name} nîşan bike",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index b1116a7a31..6af6652a54 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -25,7 +25,6 @@
   "account.posts": "Postow",
   "account.posts_with_replies": "Postow ha gorthebow",
   "account.report": "Reportya @{name}",
-  "account.requested": "Ow kortos komendyans. Klyckyewgh dhe hedhi govyn holya",
   "account.share": "Kevrenna profil @{name}",
   "account.show_reblogs": "Diskwedhes kenerthow a @{name}",
   "account.unblock": "Anlettya @{name}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 754f6eb3c6..d8d0a06718 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -63,7 +63,6 @@
   "account.posts": "Publikasyones",
   "account.posts_with_replies": "Kon repuestas",
   "account.report": "Raporta @{name}",
-  "account.requested": "Asperando achetasion. Klika para anular la solisitud de segimiento",
   "account.requested_follow": "{name} tiene solisitado segirte",
   "account.requests_to_follow_you": "Solisita segirte",
   "account.share": "Partaja el profil de @{name}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 5f4d357f0d..f02af533fd 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -64,7 +64,6 @@
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.remove_from_followers": "Šalinti {name} iš sekėjų",
   "account.report": "Pranešti apie @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spustelėk, kad atšauktum sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.requests_to_follow_you": "Prašymai sekti jus",
   "account.share": "Bendrinti @{name} profilį",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index ff532bb295..eb0a6cbe8a 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Ieraksti un atbildes",
   "account.remove_from_followers": "Dzēst sekotāju {name}",
   "account.report": "Ziņot par @{name}",
-  "account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
   "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.requests_to_follow_you": "Sekošanas pieprasījumi",
   "account.share": "Dalīties ar @{name} profilu",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 67e561dcee..83153d4d73 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -33,7 +33,6 @@
   "account.posts": "Тутови",
   "account.posts_with_replies": "Тутови и реплики",
   "account.report": "Пријави @{name}",
-  "account.requested": "Се чека одобрување. Кликни за да одкажиш барање за следење",
   "account.share": "Сподели @{name} профил",
   "account.show_reblogs": "Прикажи бустови од @{name}",
   "account.unblock": "Одблокирај @{name}",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 63fc97c8ab..16c183b492 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -44,7 +44,6 @@
   "account.posts": "പോസ്റ്റുകൾ",
   "account.posts_with_replies": "പോസ്റ്റുകളും മറുപടികളും",
   "account.report": "റിപ്പോർട്ട് ചെയ്യുക @{name}",
-  "account.requested": "അനുവാദത്തിനായി കാത്തിരിക്കുന്നു. പിന്തുടരാനുള്ള അപേക്ഷ റദ്ദാക്കുവാൻ ഞെക്കുക",
   "account.share": "@{name} ന്റെ പ്രൊഫൈൽ പങ്കിടുക",
   "account.show_reblogs": "@{name} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക",
   "account.unblock": "@{name} തടഞ്ഞത് മാറ്റുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 28d3ae9ab3..6a762c1527 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -49,7 +49,6 @@
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "@{name} ची तक्रार करा",
-  "account.requested": "Awaiting approval",
   "account.requested_follow": "{name} ने आपल्याला फॉलो करण्याची रिक्वेस्ट केली आहे",
   "account.share": "@{name} चे प्रोफाइल शेअर करा",
   "account.show_reblogs": "{name}चे सर्व बुस्ट्स दाखवा",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 2ffdf6cfd0..da72a2fc14 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -58,7 +58,6 @@
   "account.posts": "Hantaran",
   "account.posts_with_replies": "Hantaran dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikut",
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index a65eab5aa7..66af87dc62 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -51,7 +51,6 @@
   "account.posts": "ပို့စ်များ",
   "account.posts_with_replies": "ပို့စ်နှင့် ရီပလိုင်းများ",
   "account.report": "တိုင်ကြားမည်{name}",
-  "account.requested": "ခွင့်ပြုချက်စောင့်နေသည်။ ဖော်လိုးပယ်ဖျက်ရန်နှိပ်ပါ",
   "account.requested_follow": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
   "account.share": "{name}၏ပရိုဖိုင်ကိုမျှဝေပါ",
   "account.show_reblogs": "@{name} မှ မျှ၀ေမှုများကို ပြပါ\n",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index b070566564..0ee1958d5b 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "停止佇 {name} PO文ê時通知我",
   "account.domain_blocking": "Teh封鎖ê網域",
   "account.edit_profile": "編輯個人資料",
+  "account.edit_profile_short": "編輯",
   "account.enable_notifications": "佇 {name} PO文ê時通知我",
   "account.endorse": "用個人資料推薦對方",
   "account.familiar_followers_many": "Hōo {name1}、{name2}，kap {othersCount, plural, other {其他 lí熟似ê # ê lâng}} 跟tuè",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "無PO文",
   "account.follow": "跟tuè",
   "account.follow_back": "Tuè tńg去",
+  "account.follow_back_short": "Tuè tńg去",
+  "account.follow_request": "請求跟tuè lí",
+  "account.follow_request_cancel": "取消跟tuè",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "請求",
   "account.followers": "跟tuè lí ê",
   "account.followers.empty": "Tsit ê用者iáu bô lâng跟tuè。",
   "account.followers_counter": "Hōo {count, plural, other {{count} ê lâng}}跟tuè",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "PO文kap回應",
   "account.remove_from_followers": "Kā {name} tuì跟tuè lí ê ê內底suá掉",
   "account.report": "檢舉 @{name}",
-  "account.requested": "Teh等待審查。Tshi̍h tsi̍t-ē 通取消跟tuè請求",
   "account.requested_follow": "{name} 請求跟tuè lí",
   "account.requests_to_follow_you": "請求跟tuè lí",
   "account.share": "分享 @{name} ê個人資料",
@@ -864,6 +869,14 @@
   "status.cancel_reblog_private": "取消轉送",
   "status.cannot_quote": "Lí bô允准引用tsit篇PO文。",
   "status.cannot_reblog": "Tsit篇PO文bē當轉送",
+  "status.contains_quote": "包含引用",
+  "status.context.loading": "載入其他回應",
+  "status.context.loading_error": "Bē當載入新回應",
+  "status.context.loading_more": "載入其他回應",
+  "status.context.loading_success": "回應lóng載入ah",
+  "status.context.more_replies_found": "Tshuē-tio̍h其他回應",
+  "status.context.retry": "Koh試",
+  "status.context.show": "顯示",
   "status.continued_thread": "接續ê討論線",
   "status.copy": "Khóo-pih PO文ê連結",
   "status.delete": "Thâi掉",
@@ -900,6 +913,7 @@
   "status.quote_error.revoked": "PO文已經hōo作者thâi掉",
   "status.quote_followers_only": "Kan-ta tuè我ê ē當引用PO文",
   "status.quote_manual_review": "作者ē hōo lâng人工審核",
+  "status.quote_noun": "引用",
   "status.quote_policy_change": "改通引用ê lâng",
   "status.quote_post_author": "引用 @{name} ê PO文ah",
   "status.quote_private": "私人PO文bē當引用",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index a0b99c5973..297feb2ce1 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -57,7 +57,6 @@
   "account.posts_with_replies": "पोस्ट र जवाफहरू",
   "account.remove_from_followers": "{name}लाई फलोअरहरूबाट हटाउनुहोस्",
   "account.report": "@{name}लाई रिपोर्ट गर्नुहोस्",
-  "account.requested": "स्वीकृतिको पर्खाइमा। फलो अनुरोध रद्द गर्न क्लिक गर्नुहोस्",
   "account.requested_follow": "{name} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ",
   "account.share": "@{name} को प्रोफाइल सेयर गर्नुहोस्",
   "account.show_reblogs": "@{name} को बूस्टहरू देखाउनुहोस्",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 4250040040..289b49c39b 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Geen melding meer geven wanneer @{name} een bericht plaatst",
   "account.domain_blocking": "Server geblokkeerd",
   "account.edit_profile": "Profiel bewerken",
+  "account.edit_profile_short": "Bewerken",
   "account.enable_notifications": "Geef een melding wanneer @{name} een bericht plaatst",
   "account.endorse": "Op profiel weergeven",
   "account.familiar_followers_many": "Gevolgd door {name1}, {name2} en {othersCount, plural, one {één ander bekend account} other {# andere bekende accounts}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Geen berichten",
   "account.follow": "Volgen",
   "account.follow_back": "Terugvolgen",
+  "account.follow_back_short": "Terugvolgen",
+  "account.follow_request": "Verzoeken om te volgen",
+  "account.follow_request_cancel": "Verzoek annuleren",
+  "account.follow_request_cancel_short": "Annuleren",
+  "account.follow_request_short": "Verzoek",
   "account.followers": "Volgers",
   "account.followers.empty": "Deze gebruiker heeft nog geen volgers of heeft deze verborgen.",
   "account.followers_counter": "{count, plural, one {{counter} volger} other {{counter} volgers}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Reacties",
   "account.remove_from_followers": "{name} als volger verwijderen",
   "account.report": "@{name} rapporteren",
-  "account.requested": "Wachten op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.requested_follow": "{name} wil jou graag volgen",
   "account.requests_to_follow_you": "Wil jou graag volgen",
   "account.share": "Account van @{name} delen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index fe2c5fc925..4a38a01e78 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Tut og svar",
   "account.remove_from_followers": "Fjern {name} frå fylgjarane dine",
   "account.report": "Rapporter @{name}",
-  "account.requested": "Ventar på aksept. Klikk for å avbryta fylgjeførespurnaden",
   "account.requested_follow": "{name} har bedt om å få fylgja deg",
   "account.requests_to_follow_you": "Folk som vil fylgja deg",
   "account.share": "Del @{name} sin profil",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index fa03560194..7c574e7d8c 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Innlegg med svar",
   "account.remove_from_followers": "Fjern {name} fra følgere",
   "account.report": "Rapporter @{name}",
-  "account.requested": "Venter på godkjennelse. Klikk for å avbryte forespørselen",
   "account.requested_follow": "{name} har bedt om å få følge deg",
   "account.requests_to_follow_you": "Forespørsler om å følge deg",
   "account.share": "Del @{name} sin profil",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 0d87228ea1..87793d14fe 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -50,7 +50,6 @@
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts e responsas",
   "account.report": "Senhalar @{name}",
-  "account.requested": "Invitacion mandada. Clicatz per anullar",
   "account.requested_follow": "{name} a demandat a vos sègre",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index cd20e4bce0..83614973fe 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -56,7 +56,6 @@
   "account.posts": "ਪੋਸਟਾਂ",
   "account.posts_with_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ",
   "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ",
-  "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "account.share": "{name} ਦਾ ਪਰੋਫ਼ਾਇਲ ਸਾਂਝਾ ਕਰੋ",
   "account.statuses_counter": "{count, plural, one {{counter} ਪੋਸਟ} other {{counter} ਪੋਸਟਾਂ}}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2fb0a6f1bd..ef6769d6f7 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Wpisy i odpowiedzi",
   "account.remove_from_followers": "Usuń {name} z obserwujących",
   "account.report": "Zgłoś @{name}",
-  "account.requested": "Oczekująca prośba, kliknij aby anulować",
   "account.requested_follow": "{name} chce cię zaobserwować",
   "account.requests_to_follow_you": "Prośby o obserwowanie",
   "account.share": "Udostępnij profil @{name}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e550b7463a..fb3b403d45 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Com respostas",
   "account.remove_from_followers": "Remover {name} dos seguidores",
   "account.report": "Denunciar @{name}",
-  "account.requested": "Aguardando aprovação. Clique para cancelar a solicitação",
   "account.requested_follow": "{name} quer te seguir",
   "account.requests_to_follow_you": "Pediu para seguir você",
   "account.share": "Compartilhar perfil de @{name}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 8167b9b49e..7646bd226d 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Parar de me notificar das publicações de @{name}",
   "account.domain_blocking": "A bloquear domínio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificar-me das publicações de @{name}",
   "account.endorse": "Destacar no perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} e {othersCount, plural,one {mais uma pessoa que conhece} other {# outras pessoas que conhece}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sem publicações",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir também",
+  "account.follow_back_short": "Seguir de volta",
+  "account.follow_request": "Pedir para seguir",
+  "account.follow_request_cancel": "Cancelar pedido",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Pedido",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicações e respostas",
   "account.remove_from_followers": "Remover {name} dos seguidores",
   "account.report": "Denunciar @{name}",
-  "account.requested": "A aguardar aprovação. Clica para cancelar o pedido para seguir",
   "account.requested_follow": "{name} pediu para seguir-te",
   "account.requests_to_follow_you": "Pediu para seguir-te",
   "account.share": "Partilhar o perfil @{name}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index ce3dde8eea..9259226ee6 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -55,7 +55,6 @@
   "account.posts": "Postări",
   "account.posts_with_replies": "Postări și răspunsuri",
   "account.report": "Raportează pe @{name}",
-  "account.requested": "Se așteaptă aprobarea. Apasă pentru a anula cererea de urmărire",
   "account.requested_follow": "{name} A cerut să vă urmărească",
   "account.share": "Distribuie profilul lui @{name}",
   "account.show_reblogs": "Afișează distribuirile de la @{name}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 1416198a42..e8c96ac25f 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Посты и ответы",
   "account.remove_from_followers": "Убрать {name} из подписчиков",
   "account.report": "Пожаловаться на @{name}",
-  "account.requested": "Ожидает подтверждения. Нажмите для отмены запроса",
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.requests_to_follow_you": "Отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 20cc8e8e4e..9426a9c5c0 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -51,7 +51,6 @@
   "account.posts": "Публикації",
   "account.posts_with_replies": "Публикації тай удповіді",
   "account.report": "Скарговати ся на {name}",
-  "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя",
   "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас",
   "account.share": "Пошырити профіл хосновача {name}",
   "account.show_reblogs": "Указати друленя уд {name}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index b9c13df058..1cd3cdb616 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -46,7 +46,6 @@
   "account.posts": "पत्राणि",
   "account.posts_with_replies": "पत्राणि प्रत्युत्तराणि च",
   "account.report": "आविद्यताम् @{name}",
-  "account.requested": "स्वीकृतिः प्रतीक्ष्यते । नश्यतामित्यस्मिन्नुद्यतां निराकर्तुम् ।",
   "account.requested_follow": "{name} त्वामनुसर्तुमयाचीत्",
   "account.share": "@{name} मित्रस्य विवरणं विभाज्यताम्",
   "account.show_reblogs": "@{name} मित्रस्य प्रकाशनानि दृश्यन्ताम्",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index d126379384..781ea7c014 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -69,7 +69,6 @@
   "account.posts_with_replies": "Publicatziones e rispostas",
   "account.remove_from_followers": "Cantzella a {name} dae is sighiduras",
   "account.report": "Signala @{name}",
-  "account.requested": "Abetende s'aprovatzione. Incarca pro annullare sa rechesta de sighidura",
   "account.requested_follow": "{name} at dimandadu de ti sighire",
   "account.requests_to_follow_you": "Rechestas de sighidura",
   "account.share": "Cumpartzi su profilu de @{name}",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 52445feced..de24b5cdee 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -44,7 +44,6 @@
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts an repones",
   "account.report": "Clype @{name}",
-  "account.requested": "Haudin fir approval. Chap tae cancel follae request",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Shaw heezes frae @{name}",
   "account.unblock": "Undingie @{name}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 107ef3f1cf..92216ed074 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -68,7 +68,6 @@
   "account.posts_with_replies": "ලිපි සහ පිළිතුරු",
   "account.remove_from_followers": "අනුගාමිකයින්ගෙන් {name} ඉවත් කරන්න",
   "account.report": "@{name} වාර්තා කරන්න",
-  "account.requested": "අනුමැතිය බලාපොරොත්තුවෙන්. අනුගමනය කිරීමේ ඉල්ලීම අවලංගු කිරීමට ක්ලික් කරන්න.",
   "account.requested_follow": "{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත.",
   "account.requests_to_follow_you": "ඔබව අනුගමනය කිරීමට ඉල්ලීම්",
   "account.share": "@{name} ගේ පැතිකඩ බෙදාගන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 771f52618c..9a408657b1 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -64,7 +64,6 @@
   "account.posts": "Príspevky",
   "account.posts_with_replies": "Príspevky a odpovede",
   "account.report": "Nahlásiť @{name}",
-  "account.requested": "Čaká na schválenie. Žiadosť zrušíte kliknutím sem",
   "account.requested_follow": "{name} vás chce sledovať",
   "account.share": "Zdieľaj profil @{name}",
   "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 9127605dba..a87648bf7a 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -55,7 +55,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave in odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
   "account.requested_follow": "{name} vam želi slediti",
   "account.share": "Deli profil osebe @{name}",
   "account.show_reblogs": "Pokaži izpostavitve osebe @{name}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 56db9a5ac3..8ad097427b 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Mesazhe dhe përgjigje",
   "account.remove_from_followers": "Hiqe {name} nga ndjekësit",
   "account.report": "Raportojeni @{name}",
-  "account.requested": "Në pritje të miratimit. Që të anuloni kërkesën për ndjekje, klikojeni",
   "account.requested_follow": "{name} ka kërkuar t’ju ndjekë",
   "account.requests_to_follow_you": "Kërkesa për t’ju ndjekur",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 8cb2e30cb5..0db607b12c 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -54,7 +54,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekanje odobrenja. Kliknite za otkazivanje zahteva za praćenje",
   "account.requested_follow": "{name} je zatražio da vas prati",
   "account.share": "Podeli profil korisnika @{name}",
   "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 485109105b..48e6b49968 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -54,7 +54,6 @@
   "account.posts": "Објаве",
   "account.posts_with_replies": "Објаве и одговори",
   "account.report": "Пријави @{name}",
-  "account.requested": "Чекање одобрења. Кликните за отказивање захтева за праћење",
   "account.requested_follow": "{name} је затражио да вас прати",
   "account.share": "Подели профил корисника @{name}",
   "account.show_reblogs": "Прикажи подржавања од корисника @{name}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index e56c9da326..97a4b6fd4f 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Inlägg och svar",
   "account.remove_from_followers": "Ta bort {name} från följare",
   "account.report": "Rapportera @{name}",
-  "account.requested": "Inväntar godkännande. Klicka för att ta tillbaka din begäran om att få följa",
   "account.requested_follow": "{name} har begärt att följa dig",
   "account.requests_to_follow_you": "Fråga om att följa dig",
   "account.share": "Dela @{name}s profil",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 55913be924..709b0f9e89 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -19,7 +19,6 @@
   "account.mute": "Wycisz @{name}",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account_note.placeholder": "Click to add a note",
   "column.pins": "Pinned toot",
   "community.column_settings.media_only": "Media only",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 10d461e9e8..8ebbd17117 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -37,7 +37,6 @@
   "account.posts": "டூட்டுகள்",
   "account.posts_with_replies": "Toots மற்றும் பதில்கள்",
   "account.report": "@{name} -ஐப் புகாரளி",
-  "account.requested": "ஒப்புதலுக்காகக் காத்திருக்கிறது. பின்தொடரும் கோரிக்கையை நீக்க அழுத்தவும்",
   "account.share": "@{name} உடைய விவரத்தை பகிர்",
   "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
   "account.unblock": "@{name} மீது தடை நீக்குக",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 3799455050..507894ba14 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -8,7 +8,6 @@
   "account.mention": "Thê-khí @{name}",
   "account.posts": "Huah-siann",
   "account.posts_with_replies": "Huah-siann kah huê-ìng",
-  "account.requested": "Tán-thāi phue-tsún",
   "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
   "column.pins": "Tah thâu-tsîng ê huah-siann",
   "community.column_settings.media_only": "Kan-na muî-thé",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index cbdea417b7..015fe3f12a 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -24,7 +24,6 @@
   "account.posts": "టూట్లు",
   "account.posts_with_replies": "టూట్లు మరియు ప్రత్యుత్తరములు",
   "account.report": "@{name}పై ఫిర్యాదుచేయు",
-  "account.requested": "ఆమోదం కోసం వేచి ఉంది. అభ్యర్థనను రద్దు చేయడానికి క్లిక్ చేయండి",
   "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి",
   "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు",
   "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a1fade41ca..ed71791f73 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -64,7 +64,6 @@
   "account.posts": "โพสต์",
   "account.posts_with_replies": "โพสต์และการตอบกลับ",
   "account.report": "รายงาน @{name}",
-  "account.requested": "กำลังรอการอนุมัติ คลิกเพื่อยกเลิกคำขอติดตาม",
   "account.requested_follow": "{name} ได้ขอติดตามคุณ",
   "account.share": "แชร์โปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index dbc6b4b871..3eaf22911c 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "toki ale",
   "account.remove_from_followers": "sijelo kute la o weka e sijelo \"{name}\".",
   "account.report": "jan @{name} la o toki e ike tawa lawa",
-  "account.requested": "jan ni o ken e kute sina",
   "account.requested_follow": "jan {name} li wile kute e sina",
   "account.requests_to_follow_you": "jan ni li wile kute e sina",
   "account.share": "o pana e lipu jan @{name}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index cc94d324d7..335fa07d80 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "@{name} kişisinin gönderi bildirimlerini kapat",
   "account.domain_blocking": "Alan adını engelleme",
   "account.edit_profile": "Profili düzenle",
+  "account.edit_profile_short": "Düzenle",
   "account.enable_notifications": "@{name} kişisinin gönderi bildirimlerini aç",
   "account.endorse": "Profilimde öne çıkar",
   "account.familiar_followers_many": "{name1}, {name2}, {othersCount, plural, one {# diğer} other {# diğer}} bildiğiniz kişi tarafından takip ediliyor",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Gönderi yok",
   "account.follow": "Takip et",
   "account.follow_back": "Geri takip et",
+  "account.follow_back_short": "Geri takip et",
+  "account.follow_request": "Takip isteği gönder",
+  "account.follow_request_cancel": "İsteği iptal et",
+  "account.follow_request_cancel_short": "İptal",
+  "account.follow_request_short": "İstek",
   "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}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Gönderiler ve yanıtlar",
   "account.remove_from_followers": "{name} takipçilerinden kaldır",
   "account.report": "@{name} adlı kişiyi bildir",
-  "account.requested": "Onay bekleniyor. Takip isteğini iptal etmek için tıklayın",
   "account.requested_follow": "{name} size takip isteği gönderdi",
   "account.requests_to_follow_you": "Size takip isteği gönderdi",
   "account.share": "@{name} adlı kişinin profilini paylaş",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 4c454c37fb..d1ef3cd3b0 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -49,7 +49,6 @@
   "account.posts": "Язма",
   "account.posts_with_replies": "Язма һәм җавап",
   "account.report": "@{name} кулланучыга шикаять итү",
-  "account.requested": "Awaiting approval",
   "account.requested_follow": "{name} Сезгә язылу соравын җиберде",
   "account.share": "@{name} профиле белән уртаклашу",
   "account.show_reblogs": "Күрсәтергә көчәйтү нче @{name}",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 527457ca37..c87d8ee5dd 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -13,7 +13,6 @@
   "account.posts": "يازما",
   "account.posts_with_replies": "يازما ۋە ئىنكاس",
   "account.report": "@{name} نى پاش قىل",
-  "account.requested": "Awaiting approval",
   "account_note.placeholder": "چېكىلسە ئىزاھات قوشىدۇ",
   "column.pins": "چوققىلانغان يازما",
   "community.column_settings.media_only": "ۋاسىتەلا",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 02370341df..99dd177b2b 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -61,7 +61,6 @@
   "account.posts": "Дописи",
   "account.posts_with_replies": "Дописи й відповіді",
   "account.report": "Поскаржитися на @{name}",
-  "account.requested": "Очікує підтвердження. Натисніть, щоб скасувати запит на підписку",
   "account.requested_follow": "{name} надсилає запит на стеження",
   "account.share": "Поділитися профілем @{name}",
   "account.show_reblogs": "Показати поширення від @{name}",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index b1db5d819f..e06ec34e6e 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -46,7 +46,6 @@
   "account.posts": "ٹوٹ",
   "account.posts_with_replies": "ٹوٹ اور جوابات",
   "account.report": "@{name} اطلاع کریں",
-  "account.requested": "منظوری کا منتظر۔ درخواستِ پیروی منسوخ کرنے کیلئے کلک کریں",
   "account.requested_follow": "{name} آپ کو فالو کرنا چھاتا ہے۔",
   "account.share": "@{name} کے مشخص کو بانٹیں",
   "account.show_reblogs": "@{name} کی افزائشات کو دکھائیں",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index d4b37a32f7..2e4038edd3 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -44,7 +44,6 @@
   "account.posts": "Postlar",
   "account.posts_with_replies": "Xabarlar va javoblar",
   "account.report": "@{name} xabar berish",
-  "account.requested": "Tasdiqlash kutilmoqda. Kuzatuv soʻrovini bekor qilish uchun bosing",
   "account.requested_follow": "{name} sizni kuzatishni soʻradi",
   "account.share": "@{name} profilini ulashing",
   "account.show_reblogs": "@{name} dan bootlarni ko'rsatish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c4e21bbe7e..72a1cd23ae 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Tắt thông báo khi @{name} đăng tút",
   "account.domain_blocking": "Máy chủ đang chủ",
   "account.edit_profile": "Sửa hồ sơ",
+  "account.edit_profile_short": "Sửa",
   "account.enable_notifications": "Nhận thông báo khi @{name} đăng tút",
   "account.endorse": "Nêu bật người này",
   "account.familiar_followers_many": "Theo dõi bởi {name1}, {name2} và {othersCount, plural, other {# người khác mà bạn biết}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Chưa có tút",
   "account.follow": "Theo dõi",
   "account.follow_back": "Theo dõi lại",
+  "account.follow_back_short": "Theo dõi lại",
+  "account.follow_request": "Yêu cầu theo dõi",
+  "account.follow_request_cancel": "Hủy yêu cầu",
+  "account.follow_request_cancel_short": "Hủy bỏ",
+  "account.follow_request_short": "Yêu cầu",
   "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, other {{counter} Người theo dõi}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Trả lời",
   "account.remove_from_followers": "Xóa người theo dõi {name}",
   "account.report": "Báo cáo @{name}",
-  "account.requested": "Đang chờ chấp thuận. Nhấp vào đây để hủy yêu cầu theo dõi",
   "account.requested_follow": "{name} yêu cầu theo dõi bạn",
   "account.requests_to_follow_you": "Yêu cầu theo dõi bạn",
   "account.share": "Chia sẻ @{name}",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index ff37d75a07..0f0be9da42 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -14,7 +14,6 @@
   "account.muted": "ⵉⵜⵜⵓⵥⵉⵥⵏ",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1c52a6334f..a73a218fa5 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "嘟文和回复",
   "account.remove_from_followers": "从关注者中移除 {name}",
   "account.report": "举报 @{name}",
-  "account.requested": "正在等待对方同意。点击取消发送关注请求",
   "account.requested_follow": "{name} 向你发送了关注请求",
   "account.requests_to_follow_you": "请求关注你",
   "account.share": "分享 @{name} 的个人资料",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 1637e1cf58..5a113ae8ae 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -65,7 +65,6 @@
   "account.posts": "帖文",
   "account.posts_with_replies": "帖文與回覆",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等待核准。按一下以取消追蹤請求",
   "account.requested_follow": "{name} 要求追蹤你",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示 @{name} 的轉推",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 02edd5f452..d0da9aa718 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
   "account.domain_blocking": "封鎖中網域",
   "account.edit_profile": "編輯個人檔案",
+  "account.edit_profile_short": "編輯",
   "account.enable_notifications": "當 @{name} 嘟文時通知我",
   "account.endorse": "於個人檔案推薦對方",
   "account.familiar_followers_many": "被 {name1}、{name2}、及 {othersCount, plural, other {其他您認識的 # 人}} 跟隨",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "沒有嘟文",
   "account.follow": "跟隨",
   "account.follow_back": "跟隨回去",
+  "account.follow_back_short": "跟隨回去",
+  "account.follow_request": "要求跟隨您",
+  "account.follow_request_cancel": "取消跟隨請求",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "跟隨請求",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
   "account.followers_counter": "被 {count, plural, other {{count} 人}}跟隨",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "嘟文與回覆",
   "account.remove_from_followers": "自跟隨者中移除 {name}",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等候審核。按一下以取消跟隨請求",
   "account.requested_follow": "{name} 要求跟隨您",
   "account.requests_to_follow_you": "要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 870cbea7e4..43574d3657 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -39,13 +39,25 @@ class ActivityPub::TagManager
 
     case target.object_type
     when :person
-      target.instance_actor? ? instance_actor_url : account_url(target)
+      if target.instance_actor?
+        instance_actor_url
+      elsif target.numeric_ap_id?
+        ap_account_url(target.id)
+      else
+        account_url(target)
+      end
     when :conversation
       context_url(target) unless target.parent_account_id.nil? || target.parent_status_id.nil?
     when :note, :comment, :activity
-      return activity_account_status_url(target.account, target) if target.reblog?
+      if target.account.numeric_ap_id?
+        return activity_ap_account_status_url(target.account, target) if target.reblog?
 
-      account_status_url(target.account, target)
+        ap_account_status_url(target.account.id, target)
+      else
+        return activity_account_status_url(target.account, target) if target.reblog?
+
+        account_status_url(target.account, target)
+      end
     when :emoji
       emoji_url(target)
     when :flag
@@ -57,7 +69,7 @@ class ActivityPub::TagManager
     return quote.approval_uri unless quote.quoted_account&.local?
     return if check_approval && !quote.accepted?
 
-    account_quote_authorization_url(quote.quoted_account, quote)
+    quote.quoted_account.numeric_ap_id? ? ap_account_quote_authorization_url(quote.quoted_account_id, quote) : account_quote_authorization_url(quote.quoted_account, quote)
   end
 
   def key_uri_for(target)
@@ -68,6 +80,10 @@ class ActivityPub::TagManager
     account_url(username: username)
   end
 
+  def uri_for_account_id(id)
+    ap_account_url(id: id)
+  end
+
   def generate_uri_for(_target)
     URI.join(root_url, 'payloads', SecureRandom.uuid)
   end
@@ -75,7 +91,7 @@ class ActivityPub::TagManager
   def activity_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    activity_account_status_url(target.account, target)
+    target.account.numeric_ap_id? ? activity_ap_account_status_url(target.account.id, target) : activity_account_status_url(target.account, target)
   end
 
   def context_uri_for(target, page_params = nil)
@@ -87,49 +103,61 @@ class ActivityPub::TagManager
   def replies_uri_for(target, page_params = nil)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_replies_url(target.account, target, page_params)
+    target.account.numeric_ap_id? ? ap_account_status_replies_url(target.account.id, target, page_params) : account_status_replies_url(target.account, target, page_params)
   end
 
   def likes_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_likes_url(target.account, target)
+    target.account.numeric_ap_id? ? ap_account_status_likes_url(target.account.id, target) : account_status_likes_url(target.account, target)
   end
 
   def shares_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_shares_url(target.account, target)
+    target.account.numeric_ap_id? ? ap_account_status_shares_url(target.account.id, target) : account_status_shares_url(target.account, target)
   end
 
   def following_uri_for(target, ...)
     raise ArgumentError, 'target must be a local account' unless target.local?
 
-    account_following_index_url(target, ...)
+    target.numeric_ap_id? ? ap_account_following_index_url(target.id, ...) : account_following_index_url(target, ...)
   end
 
   def followers_uri_for(target, ...)
     return target.followers_url.presence unless target.local?
 
-    account_followers_url(target, ...)
+    target.numeric_ap_id? ? ap_account_followers_url(target.id, ...) : account_followers_url(target, ...)
   end
 
   def collection_uri_for(target, ...)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    account_collection_url(target, ...)
+    target.numeric_ap_id? ? ap_account_collection_url(target.id, ...) : account_collection_url(target, ...)
   end
 
   def inbox_uri_for(target)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    target.instance_actor? ? instance_actor_inbox_url : account_inbox_url(target)
+    if target.instance_actor?
+      instance_actor_inbox_url
+    elsif target.numeric_ap_id?
+      ap_account_inbox_url(target.id)
+    else
+      account_inbox_url(target)
+    end
   end
 
   def outbox_uri_for(target, ...)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    target.instance_actor? ? instance_actor_outbox_url(...) : account_outbox_url(target, ...)
+    if target.instance_actor?
+      instance_actor_outbox_url(...)
+    elsif target.numeric_ap_id?
+      ap_account_outbox_url(target.id, ...)
+    else
+      account_outbox_url(target, ...)
+    end
   end
 
   # Primary audience of a status
@@ -262,10 +290,9 @@ class ActivityPub::TagManager
 
     path_params = Rails.application.routes.recognize_path(uri)
 
-    # TODO: handle numeric IDs
     case path_params[:controller]
     when 'accounts'
-      [:username, path_params[:username]]
+      path_params.key?(:username) ? [:username, path_params[:username]] : [:id, path_params[:id]]
     when 'instance_actors'
       [:id, -99]
     end
diff --git a/app/models/account.rb b/app/models/account.rb
index 3594128f14..8490e99da1 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -52,6 +52,7 @@
 #  requested_review_at           :datetime
 #  indexable                     :boolean          default(FALSE), not null
 #  attribution_domains           :string           default([]), is an Array
+#  id_scheme                     :integer          default("username_ap_id")
 #
 
 class Account < ApplicationRecord
@@ -105,6 +106,7 @@ class Account < ApplicationRecord
 
   enum :protocol, { ostatus: 0, activitypub: 1 }
   enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
+  enum :id_scheme, { username_ap_id: 0, numeric_ap_id: 1 }
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 4eab55ca3e..7f1d91a160 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -215,8 +215,9 @@ module Account::Interactions
   def local_followers_hash
     Rails.cache.fetch("followers_hash:#{id}:local") do
       digest = "\x00" * 32
-      followers.where(domain: nil).pluck_each(:username) do |username|
-        Xorcist.xor!(digest, Digest::SHA256.digest(ActivityPub::TagManager.instance.uri_for_username(username)))
+      followers.where(domain: nil).pluck_each(:id_scheme, :id, :username) do |id_scheme, id, username|
+        uri = id_scheme == 'numeric_ap_id' ? ActivityPub::TagManager.instance.uri_for_account_id(id) : ActivityPub::TagManager.instance.uri_for_username(username)
+        Xorcist.xor!(digest, Digest::SHA256.digest(uri))
       end
       digest.unpack1('H*')
     end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 40b5c42404..ade7175c9d 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -55,7 +55,7 @@ class ActivityPub::DeliveryWorker
   end
 
   def synchronization_header
-    "collectionId=\"#{account_followers_url(@source_account)}\", digest=\"#{@source_account.remote_followers_hash(@inbox_url)}\", url=\"#{account_followers_synchronization_url(@source_account)}\""
+    "collectionId=\"#{ActivityPub::TagManager.instance.followers_uri_for(@source_account)}\", digest=\"#{@source_account.remote_followers_hash(@inbox_url)}\", url=\"#{account_followers_synchronization_url(@source_account)}\""
   end
 
   def perform_request
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 9ec00b897a..61fb800301 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -33,6 +33,11 @@ kab:
         new_email: Imayl amaynut
         submit: Beddel imayl
         title: Beddel imayl-ik s %{username}
+      change_role:
+        edit_roles: Sefrek timlilin n usqdac
+        label: Snifel tamlilt
+        no_role: War tamlilt
+        title: Snifel tamlilt n %{username}
       confirm: Sentem
       confirmed: Yettwasentem
       confirming: Asentem
@@ -95,6 +100,7 @@ kab:
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
+      role: Tamlilt
       search: Nadi
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
       security: Taɣellist
@@ -121,6 +127,7 @@ kab:
       whitelisted: Deg tebdert tamellalt
     action_logs:
       action_types:
+        change_role_user: Snifel tamlilt n useqdac
         confirm_user: Sentem aseqdac
         create_announcement: Rnu-d ulɣu
         create_custom_emoji: Rnu imujit udmawan
@@ -128,6 +135,7 @@ kab:
         create_domain_block: Rnu-d asewḥel n taɣult
         create_ip_block: Rnu alugen n IP
         create_unavailable_domain: Rnu-d taɣult ur nelli ara
+        create_user_role: Snulfu-d tamlilt
         destroy_announcement: Kkes ulɣu
         destroy_custom_emoji: Kkes imujit udmawan
         destroy_domain_allow: Kkes taɣult yettusirgen
@@ -135,6 +143,7 @@ kab:
         destroy_ip_block: Kkes alugen n IP
         destroy_status: Kkes tasufeɣt
         destroy_unavailable_domain: Kkes taɣult ur nelli ara
+        destroy_user_role: Senger tamlilt
         disable_2fa_user: Gdel 2FA
         disable_custom_emoji: Sens imujit udmawan
         disable_user: Sens aseqdac
@@ -150,6 +159,7 @@ kab:
         update_custom_emoji: Leqqem imuji udmawan
         update_domain_block: Leqqem iḥder n taɣult
         update_status: Leqqem tasufeɣt
+        update_user_role: Leqqem tamlilt
       actions:
         assigned_to_self_report_html: "%{name} imudd aneqqis %{target} i yiman-nsen"
         create_account_warning_html: "%{name} yuzen alɣu i %{target}"
@@ -400,7 +410,10 @@ kab:
       privileges:
         administrator: Anedbal
         manage_federation: Sefrek Tafidiralit
+        manage_roles: Sefrek ilugan
+        manage_rules: Sefrek ilugan
         manage_settings: Asefrek n iɣewwaṛen
+        manage_users: Sefrek iqeddacen
         view_dashboard: Timẓriwt n tfelwit
     rules:
       add_new: Rnu alugen
@@ -566,10 +579,10 @@ kab:
     migrate_account: Gujj ɣer umiḍan nniḍen
     or_log_in_with: Neɣ eqqen s
     progress:
-      confirm: Sentem imayl
-      details: Isalli-inek
+      confirm: Asentem n imayl
+      details: Isalli-inek·inem
       review: Tamuɣli-nneɣ
-      rules: Qbel ilugan
+      rules: Abal n ilugan
     providers:
       cas: CAS
       saml: SAML
@@ -599,6 +612,8 @@ kab:
       account_status: Addad n umiḍan
       functional: Amiḍan-inek·inem yetteddu s lekmal-is.
     use_security_key: Seqdec tasarut n teɣlist
+    user_agreement_html: Ɣriɣ yerna qebleɣ <a href="<a href="%{terms_of_service_path}" target="_blank">" target="_blank">tiwtilin ne useqdec</a> akked <a href="%{privacy_policy_path}" target="_blank">tsertit n tbaḍnit</a>
+    user_privacy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
   author_attribution:
     example_title: Amedya n weḍris
     more_from_html: Ugar s ɣur %{name}
@@ -887,6 +902,8 @@ kab:
         one: "%{count} n tbidyutt"
         other: "%{count} n tbidyutin"
     edited_at_html: Tettwaẓreg ass n %{date}
+    pin_errors:
+      reblog: Azuzer ur yezmir ara ad yili d unṭiḍ
     quote_policies:
       followers: Imeḍfaṛen kan
       nobody: Nekki kan
@@ -900,6 +917,7 @@ kab:
       unlisted: Azayez asusam
   statuses_cleanup:
     enabled: Tukksa n tsuffaɣ tiqburin s wudem awurman
+    keep_pinned: Eǧǧ tisuffaɣ tunṭiḍin
     min_age:
       '1209600': 2 n yimalasen
       '15778476': 6 n wayyuren
diff --git a/config/locales/nan.yml b/config/locales/nan.yml
index 21474c6d70..20e53b4a86 100644
--- a/config/locales/nan.yml
+++ b/config/locales/nan.yml
@@ -213,7 +213,7 @@ nan:
         enable_user: 啟用口座
         memorialize_account: 設做故人ê口座
         promote_user: Kā用者升級
-        publish_terms_of_service: 公佈服務ê使用規則
+        publish_terms_of_service: 公佈服務規定
         reject_appeal: 拒絕申訴
         reject_user: 拒絕用者
         remove_avatar_user: Thâi掉標頭
@@ -281,7 +281,7 @@ nan:
         enable_user_html: "%{name} kā 用者 %{target} 設做允准登入"
         memorialize_account_html: "%{name} kā %{target} 設做故人口座"
         promote_user_html: "%{name} kā 用者 %{target} 升級"
-        publish_terms_of_service_html: "%{name} 公佈服務規則ê更新"
+        publish_terms_of_service_html: "%{name} 公佈服務規定ê更新"
         reject_appeal_html: "%{name} 拒絕 %{target} 所寫ê tuì管理決定ê投訴"
         reject_user_html: "%{name} 拒絕 %{target} ê 註冊"
         remove_avatar_user_html: "%{name} thâi掉 %{target} ê標頭"
@@ -787,7 +787,7 @@ nan:
       add_new: 加添規則
       add_translation: 加添翻譯
       delete: Thâi掉
-      description_html: 雖bóng大部份ê lóng講有讀kap同意使用規則，m̄-koh攏無讀了，直到發生問題ê時。<strong>提供in列單ē當hōo tsi̍t kái看服侍器ê規則khah快。</strong>請試kā個別ê規則寫kah短koh簡單，m̄-kú m̄通kā in拆做tsē-tsē分開ê項目。
+      description_html: 雖bóng大部份ê lóng講有讀kap同意服務規定，m̄-koh攏無讀了，直到發生問題ê時。<strong>提供in列單ē當hōo tsi̍t kái看服侍器ê規則khah快。</strong>請試kā個別ê規則寫kah短koh簡單，m̄-kú m̄通kā in拆做tsē-tsē分開ê項目。
       edit: 編輯規則
       empty: Iáu bē定義服侍器ê規則。
       move_down: Suá khah落來
@@ -972,7 +972,36 @@ nan:
       search: Tshiau-tshuē
       title: Hashtag
       updated_msg: Hashtag設定更新成功ah
+    terms_of_service:
+      back: 轉去服務規定
+      changelog: Siánn物有改
+      create: 用lí家tī ê
+      current: 目前ê
+      draft: 草稿
+      generate: 用枋模
+      generates:
+        action: 生成
+        chance_to_review_html: "<strong>所生成ê服務規定bē自動發布。</strong>Lí ē有機會來看結果。請添必要ê詳細來繼續。"
+        explanation_html: 提供ê服務規定kan-ta做參考用，bē當成做任何法律建議。請照lí ê情形kap有ê特別ê法律問題諮詢lí ê法律顧問。
+        title: 設定服務規定
+      going_live_on_html: 目前規定，tuì %{date} 施行
+      history: 歷史
+      live: 目前ê
+      no_history: Iáu無半項服務規定ê改變記錄。
+      no_terms_of_service_html: Lí目前iáu無設定任何服務規定。服務規定是beh提供明確性，兼保護lí佇kap用者ê爭議中毋免承受可能ê責任。
+      notified_on_html: 佇 %{date} 通知ê用者
+      notify_users: 通知用者
     trends:
+      preview_card_providers:
+        title: 發布者
+      rejected: 拒絕ê
+      statuses:
+        allow: 允准PO文
+        allow_account: 允准作者
+        confirm_allow: Lí kám確定beh允准所揀ê狀態？
+        confirm_allow_account: Lí kám確定beh允准所揀ê口座？
+        confirm_disallow: Lí kám確定無愛允准所揀ê狀態？
+        confirm_disallow_account: Lí kám確定無愛允准所揀ê口座？
       tags:
         dashboard:
           tag_languages_dimension: Tsia̍p用ê語言
diff --git a/config/routes.rb b/config/routes.rb
index 227b229a5b..0a6178399e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,7 +95,20 @@ Rails.application.routes.draw do
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 
-  resources :accounts, path: 'users', only: [:show], param: :username do
+  concern :account_resources do
+    resources :followers, only: [:index], controller: :follower_accounts
+    resources :following, only: [:index], controller: :following_accounts
+
+    scope module: :activitypub do
+      resource :outbox, only: [:show]
+      resource :inbox, only: [:create]
+      resources :collections, only: [:show]
+      resource :followers_synchronization, only: [:show]
+      resources :quote_authorizations, only: [:show]
+    end
+  end
+
+  resources :accounts, path: 'users', only: [:show], param: :username, concerns: :account_resources do
     resources :statuses, only: [:show] do
       member do
         get :activity
@@ -106,16 +119,19 @@ Rails.application.routes.draw do
       resources :likes, only: [:index], module: :activitypub
       resources :shares, only: [:index], module: :activitypub
     end
+  end
 
-    resources :followers, only: [:index], controller: :follower_accounts
-    resources :following, only: [:index], controller: :following_accounts
+  scope path: 'ap', as: 'ap' do
+    resources :accounts, path: 'users', only: [:show], param: :id, concerns: :account_resources do
+      resources :statuses, module: :activitypub, only: [:show] do
+        member do
+          get :activity
+        end
 
-    scope module: :activitypub do
-      resource :outbox, only: [:show]
-      resource :inbox, only: [:create]
-      resources :collections, only: [:show]
-      resource :followers_synchronization, only: [:show]
-      resources :quote_authorizations, only: [:show]
+        resources :replies, only: [:index]
+        resources :likes, only: [:index]
+        resources :shares, only: [:index]
+      end
     end
   end
 
diff --git a/db/migrate/20250924170259_add_id_scheme_to_accounts.rb b/db/migrate/20250924170259_add_id_scheme_to_accounts.rb
new file mode 100644
index 0000000000..7dd987dcc0
--- /dev/null
+++ b/db/migrate/20250924170259_add_id_scheme_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIdSchemeToAccounts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :accounts, :id_scheme, :integer, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fd1a4c88ab..ec6f9d64a7 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[8.0].define(version: 2025_09_12_082651) do
+ActiveRecord::Schema[8.0].define(version: 2025_09_24_170259) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -199,6 +199,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_12_082651) do
     t.boolean "indexable", default: false, null: false
     t.string "attribution_domains", default: [], array: true
     t.string "following_url", default: "", null: false
+    t.integer "id_scheme", default: 0
     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 ["domain", "id"], name: "index_accounts_on_domain_and_id"
diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index e536883a55..70e084a9c9 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -29,6 +29,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.url_for(account))
           .to eq("#{host_prefix}/@#{account.username}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.url_for(account))
+            .to eq("#{host_prefix}/@#{account.username}")
+        end
+      end
     end
 
     context 'with a remote account' do
@@ -46,6 +55,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.url_for(status))
           .to eq("#{host_prefix}/@#{status.account.username}/#{status.id}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.url_for(status))
+            .to eq("#{host_prefix}/@#{status.account.username}/#{status.id}")
+        end
+      end
     end
 
     context 'with a remote status' do
@@ -73,6 +92,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}")
+        end
+      end
     end
 
     context 'with a remote account' do
@@ -90,6 +118,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.uri_for(status))
           .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}")
+        end
+      end
     end
 
     context 'with a remote status' do
@@ -108,6 +146,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.uri_for(status.conversation))
           .to eq("#{host_prefix}/contexts/#{status.account.id}-#{status.id}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(status.conversation))
+            .to eq("#{host_prefix}/contexts/#{status.account.id}-#{status.id}")
+        end
+      end
     end
 
     context 'with a remote conversation' do
@@ -139,6 +187,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.key_uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}#main-key")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.key_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}#main-key")
+        end
+      end
     end
   end
 
@@ -167,6 +224,17 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.approval_uri_for(quote))
           .to eq("#{host_prefix}/users/#{quote.quoted_account.username}/quote_authorizations/#{quote.id}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+        let(:quote) { Fabricate(:quote, state: :accepted, quoted_status: quoted_status) }
+
+        it 'returns a string with the web domain and expected path' do
+          expect(subject.approval_uri_for(quote))
+            .to eq("#{host_prefix}/ap/users/#{quote.quoted_account_id}/quote_authorizations/#{quote.id}")
+        end
+      end
     end
 
     context 'with an unapproved local quote' do
@@ -176,6 +244,17 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.approval_uri_for(quote))
           .to be_nil
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+        let(:quote) { Fabricate(:quote, state: :rejected, quoted_status: quoted_status) }
+
+        it 'returns nil' do
+          expect(subject.approval_uri_for(quote))
+            .to be_nil
+        end
+      end
     end
 
     context 'with a valid remote approval' do
@@ -195,6 +274,17 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.approval_uri_for(quote, check_approval: false))
           .to eq("#{host_prefix}/users/#{quote.quoted_account.username}/quote_authorizations/#{quote.id}")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+        let(:quote) { Fabricate(:quote, state: :rejected, quoted_status: quoted_status) }
+
+        it 'returns a string with the web domain and expected path' do
+          expect(subject.approval_uri_for(quote, check_approval: false))
+            .to eq("#{host_prefix}/ap/users/#{quote.quoted_account_id}/quote_authorizations/#{quote.id}")
+        end
+      end
     end
   end
 
@@ -206,6 +296,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.replies_uri_for(status))
           .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/replies")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.replies_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/replies")
+        end
+      end
     end
   end
 
@@ -217,6 +317,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.likes_uri_for(status))
           .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/likes")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.likes_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/likes")
+        end
+      end
     end
   end
 
@@ -228,6 +338,16 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.shares_uri_for(status))
           .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/shares")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+        let(:status) { Fabricate(:status, account: account) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.shares_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/shares")
+        end
+      end
     end
   end
 
@@ -239,6 +359,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.following_uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}/following")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.following_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/following")
+        end
+      end
     end
   end
 
@@ -250,6 +379,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.followers_uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}/followers")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.followers_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/followers")
+        end
+      end
     end
   end
 
@@ -268,6 +406,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.inbox_uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}/inbox")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.inbox_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/inbox")
+        end
+      end
     end
   end
 
@@ -286,6 +433,15 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.outbox_uri_for(account))
           .to eq("#{host_prefix}/users/#{account.username}/outbox")
       end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.outbox_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/outbox")
+        end
+      end
     end
   end
 
@@ -300,16 +456,28 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.to(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for unlisted status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :unlisted, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.to(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns followers collection for private status' do
       status = Fabricate(:status, visibility: :private)
       expect(subject.to(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for private status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :private, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.to(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns URIs of mentions for direct status' do
       status    = Fabricate(:status, visibility: :direct)
       mentioned = Fabricate(:account)
+      mentioned_numeric = Fabricate(:account, id_scheme: :numeric_ap_id)
       status.mentions.create(account: mentioned)
-      expect(subject.to(status)).to eq [subject.uri_for(mentioned)]
+      status.mentions.create(account: mentioned_numeric)
+      expect(subject.to(status)).to eq [subject.uri_for(mentioned), subject.uri_for(mentioned_numeric)]
     end
 
     it "returns URIs of mentioned group's followers for direct statuses to groups" do
@@ -350,6 +518,11 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.cc(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for public status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :public, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.cc(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns public collection for unlisted status' do
       status = Fabricate(:status, visibility: :unlisted)
       expect(subject.cc(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
@@ -368,8 +541,10 @@ RSpec.describe ActivityPub::TagManager do
     it 'returns URIs of mentions for non-direct status' do
       status    = Fabricate(:status, visibility: :public)
       mentioned = Fabricate(:account)
+      mentioned_numeric = Fabricate(:account, id_scheme: :numeric_ap_id)
       status.mentions.create(account: mentioned)
-      expect(subject.cc(status)).to include(subject.uri_for(mentioned))
+      status.mentions.create(account: mentioned_numeric)
+      expect(subject.cc(status)).to include(subject.uri_for(mentioned), subject.uri_for(mentioned_numeric))
     end
 
     context 'with followers and requested followers' do
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index e6e9076edb..b683259c8c 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -563,6 +563,22 @@ RSpec.describe Account::Interactions do
       me.follow!(remote_alice)
       expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
     end
+
+    context 'when using numeric ID based scheme' do
+      let(:me) { Fabricate(:account, username: 'Me', id_scheme: :numeric_ap_id) }
+
+      it 'returns correct hash for local users' do
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+
+      it 'invalidates cache as needed when removing or adding followers' do
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+        me.unfollow!(remote_alice)
+        expect(remote_alice.local_followers_hash).to eq '0000000000000000000000000000000000000000000000000000000000000000'
+        me.follow!(remote_alice)
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+    end
   end
 
   describe 'muting an account' do
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index 72913ebf22..cc2a5be7c5 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -5,6 +5,14 @@ require 'rails_helper'
 RSpec.describe 'Accounts show response' do
   let(:account) { Fabricate(:account) }
 
+  context 'with numeric-based identifiers' do
+    it 'returns http success' do
+      get "/ap/users/#{account.id}"
+
+      expect(response).to have_http_status(200)
+    end
+  end
+
   context 'with an unapproved account' do
     before { account.user.update(approved: false) }
 
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index b0bd02dac8..813658d149 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account', inbox_url: 'http://example.com/inbox') }
-  let(:alice)          { Fabricate(:account, username: 'alice') }
+  let(:alice)          { Fabricate(:account, username: 'alice', id_scheme: :numeric_ap_id) }
   let(:bob)            { Fabricate(:account, username: 'bob') }
   let(:eve)            { Fabricate(:account, username: 'eve') }
   let(:mallory)        { Fabricate(:account, username: 'mallory') }
diff --git a/spec/workers/activitypub/delivery_worker_spec.rb b/spec/workers/activitypub/delivery_worker_spec.rb
index 9e6805c68b..a1eb7ebfa9 100644
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
@@ -25,12 +25,23 @@ RSpec.describe ActivityPub::DeliveryWorker do
           .to have_been_made.once
       end
 
+      context 'when using a numeric ID based scheme' do
+        let(:sender) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'performs a request to synchronize collection' do
+          subject.perform(payload, sender.id, url, { synchronize_followers: true })
+
+          expect(request_to_url)
+            .to have_been_made.once
+        end
+      end
+
       def request_to_url
         a_request(:post, url)
           .with(
             headers: {
               'Collection-Synchronization' => <<~VALUES.squish,
-                collectionId="#{account_followers_url(sender)}", digest="somehash", url="#{account_followers_synchronization_url(sender)}"
+                collectionId="#{ActivityPub::TagManager.instance.followers_uri_for(sender)}", digest="somehash", url="#{account_followers_synchronization_url(sender)}"
               VALUES
             }
           )
diff --git a/yarn.lock b/yarn.lock
index 4ef1097d40..2f327a2e37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3331,10 +3331,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/pluginutils@npm:1.0.0-beta.35":
-  version: 1.0.0-beta.35
-  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.35"
-  checksum: 10c0/feb6ab8f77ef2bde675099409c3ccd6a168f35a3c3e88482df3ca42494260fd42befe36e8e90ce358847a12aaab94cd8fe7069cf1e905edf91eb411d933906d9
+"@rolldown/pluginutils@npm:1.0.0-beta.38":
+  version: 1.0.0-beta.38
+  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.38"
+  checksum: 10c0/8353ec2528349f79e27d1a3193806725b85830da334e935cbb606d88c1177c58ea6519c578e4e93e5f677f5b22aecb8738894dbed14603e14b6bffe3facf1002
   languageName: node
   linkType: hard
 
@@ -4819,18 +4819,18 @@ __metadata:
   linkType: hard
 
 "@vitejs/plugin-react@npm:^5.0.0":
-  version: 5.0.3
-  resolution: "@vitejs/plugin-react@npm:5.0.3"
+  version: 5.0.4
+  resolution: "@vitejs/plugin-react@npm:5.0.4"
   dependencies:
     "@babel/core": "npm:^7.28.4"
     "@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
     "@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
-    "@rolldown/pluginutils": "npm:1.0.0-beta.35"
+    "@rolldown/pluginutils": "npm:1.0.0-beta.38"
     "@types/babel__core": "npm:^7.20.5"
     react-refresh: "npm:^0.17.0"
   peerDependencies:
     vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-  checksum: 10c0/3fc071455630a0584c170c544d20fc3edaccfb60a1e03ea14ca76f049f2657eb645aba9c216db016b8d70e4f894285a78fcd92ef63a2fcfa7864da378ac52761
+  checksum: 10c0/bb9360a4b4c0abf064d22211756b999faf23889ac150de490590ca7bd029b0ef7f4cd8ba3a32b86682a62d46fb7bebd75b3fa9835c57c78123f4a646de2e0136
   languageName: node
   linkType: hard
 
@@ -7445,13 +7445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-redact@npm:^3.1.1":
-  version: 3.3.0
-  resolution: "fast-redact@npm:3.3.0"
-  checksum: 10c0/d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
-  languageName: node
-  linkType: hard
-
 "fast-safe-stringify@npm:^2.1.1":
   version: 2.1.1
   resolution: "fast-safe-stringify@npm:2.1.1"
@@ -10362,11 +10355,10 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.11.0
-  resolution: "pino@npm:9.11.0"
+  version: 9.12.0
+  resolution: "pino@npm:9.12.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
-    fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^2.0.0"
     pino-std-serializers: "npm:^7.0.0"
@@ -10374,11 +10366,12 @@ __metadata:
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
+    slow-redact: "npm:^0.3.0"
     sonic-boom: "npm:^4.0.1"
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/ba908f95b61fa2c2d6c432e1f39a4394cc0dbf356c4f8837bd9c07538d749699b78204a5557e6050870f2988c25c3f0b6a88693d4bd185ebeef57d75a3b25e38
+  checksum: 10c0/5cfe093e972a8471a90f7f380c01379eed3fd937038acb97d1de9180f097c044855ca89a2e70baa699aec3e8dcaec037d03e2c90dde235102a3e17b40f54cc1f
   languageName: node
   linkType: hard
 
@@ -12303,6 +12296,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slow-redact@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "slow-redact@npm:0.3.0"
+  checksum: 10c0/bb2f77830f64fb01079849e0c6433c15e782b88cccb82d4b0d62ce216307cf514ea3f92e9b2c6ae1b1d613ac7743305d5f0324e94c9dc8e41908939456248f9a
+  languageName: node
+  linkType: hard
+
 "smart-buffer@npm:^4.2.0":
   version: 4.2.0
   resolution: "smart-buffer@npm:4.2.0"